diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo index 2f6a513..c980cc7 100644 Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ diff --git a/GBAPokemonGameEditor/MainFrm.Designer.vb b/GBAPokemonGameEditor/MainFrm.Designer.vb index d92bd21..9e44a6e 100644 --- a/GBAPokemonGameEditor/MainFrm.Designer.vb +++ b/GBAPokemonGameEditor/MainFrm.Designer.vb @@ -34,6 +34,7 @@ Partial Class MainFrm Me.DisablePokemonImageLoadingToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.Jambo51MoveTableHackToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.LinuxToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HelpToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EditRomsiniToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem6 = New System.Windows.Forms.ToolStripSeparator() @@ -122,7 +123,7 @@ Partial Class MainFrm ' 'SettingsToolStripMenuItem ' - Me.SettingsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AddOrRemoveProgramsToolStripMenuItem, Me.TransparentBackgroundsToolStripMenuItem, Me.DisablePokemonImageLoadingToolStripMenuItem, Me.Jambo51MoveTableHackToolStripMenuItem, Me.UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem}) + Me.SettingsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AddOrRemoveProgramsToolStripMenuItem, Me.TransparentBackgroundsToolStripMenuItem, Me.DisablePokemonImageLoadingToolStripMenuItem, Me.Jambo51MoveTableHackToolStripMenuItem, Me.UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem, Me.LinuxToolStripMenuItem}) Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem" Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(61, 20) Me.SettingsToolStripMenuItem.Text = "&Settings" @@ -158,6 +159,12 @@ Partial Class MainFrm Me.UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem.Size = New System.Drawing.Size(654, 22) Me.UseJambo51sTMHMExtensionHackIfYouDontKnowWhatThisIsDontUseItToolStripMenuItem.Text = "Use Jambo51's TM/HM extension hack. (If you don't know what this is don't use it." & _ ")" + ' + 'LinuxToolStripMenuItem + ' + Me.LinuxToolStripMenuItem.Name = "LinuxToolStripMenuItem" + Me.LinuxToolStripMenuItem.Size = New System.Drawing.Size(654, 22) + Me.LinuxToolStripMenuItem.Text = "Linux Operating System" ' 'HelpToolStripMenuItem ' @@ -701,5 +708,6 @@ Partial Class MainFrm Friend WithEvents Button39 As System.Windows.Forms.Button Friend WithEvents Button40 As System.Windows.Forms.Button Friend WithEvents Button41 As System.Windows.Forms.Button + Friend WithEvents LinuxToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem End Class diff --git a/GBAPokemonGameEditor/MainFrm.vb b/GBAPokemonGameEditor/MainFrm.vb index d71f739..7ddd7dc 100644 --- a/GBAPokemonGameEditor/MainFrm.vb +++ b/GBAPokemonGameEditor/MainFrm.vb @@ -37,6 +37,12 @@ Public Class MainFrm End If + If GetString(AppPath & "GBAPGESettings.ini", "Settings", "OsisLinux", "0") = "1" Then + + LinuxToolStripMenuItem.CheckState = CheckState.Checked + + End If + If GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramPath0", "") <> "" Then Button27.Text = GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramName0", "") @@ -488,6 +494,25 @@ Public Class MainFrm End Sub Private Sub Button27_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button27.Click + 'If GetString(AppPath & "GBAPGESettings.ini", "Settings", "OSisLinux", "0") = "1" Then + + ' If (IO.Path.GetExtension(GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramPath0", "")) = ".jar") Then + + + ' If LoadedROM = "" Then + 'Shell(" java -jar " & """" & GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramPath0", "") & """", vbNormalFocus) + 'Else + + + ' If System.IO.File.Exists(LoadedROM) = True Then + ' Shell(" java -jar " & """" & GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramPath0", "") & """" & " " & """" & LoadedROM & """", vbNormalFocus) + ' End If + ' End If + + ' Else + + ' End If + ' Else If LoadedROM = "" Then Shell("""" & GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramPath0", "") & """", vbNormalFocus) Else @@ -497,6 +522,8 @@ Public Class MainFrm Shell("""" & GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramPath0", "") & """" & " " & """" & LoadedROM & """", vbNormalFocus) End If End If + ' End If + End Sub Private Sub Button28_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button28.Click @@ -753,4 +780,20 @@ Public Class MainFrm End If End If End Sub + + Private Sub LinuxToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LinuxToolStripMenuItem.Click + If LinuxToolStripMenuItem.CheckState = CheckState.Checked Then + + LinuxToolStripMenuItem.CheckState = CheckState.Unchecked + + WriteString(AppPath & "GBAPGESettings.ini", "Settings", "OSisLinux", "0") + + ElseIf LinuxToolStripMenuItem.CheckState = CheckState.Unchecked Then + + LinuxToolStripMenuItem.CheckState = CheckState.Checked + + WriteString(AppPath & "GBAPGESettings.ini", "Settings", "OSisLinux", "1") + + End If + End Sub End Class diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPGESettings.ini b/GBAPokemonGameEditor/bin/Debug/GBAPGESettings.ini index d8df591..b55db7e 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPGESettings.ini +++ b/GBAPokemonGameEditor/bin/Debug/GBAPGESettings.ini @@ -3,3 +3,4 @@ TransparentImages=0 MoveTableHack=0 DisablePKMImages=0 jamboTMextensionHack=0 +OSisLinux=0 diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.config b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.config deleted file mode 100644 index 3a327fa..0000000 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application new file mode 100644 index 0000000..6c6b625 --- /dev/null +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + PBVdztOSBacTyAIthjD8ZDnzmKg= + + + + \ No newline at end of file diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest new file mode 100644 index 0000000..c97f25a --- /dev/null +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BYLz4nuObwJqzCKwHT/R9xu0fiE= + + + + + + + + + + zmtMKrAEuvsQh2jJFtlCNruBIWE= + + + + + + + + + rPjxYWyVTxOTFNPtQSvhQ6KPzKY= + + + + + + + + + + \ No newline at end of file diff --git a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 47e5fc7..68b40d5 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache and b/GBAPokemonGameEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt index 8366269..ebed2ea 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt @@ -119,4 +119,3 @@ C:\Users\Gamer2020\sources\PokemonGameEditor\GBAPokemonGameEditor\GBAPokemonGame C:\Users\Gamer2020\sources\PokemonGameEditor\GBAPokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.application C:\Users\Gamer2020\sources\PokemonGameEditor\GBAPokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbprojResolveAssemblyReference.cache C:\Users\Gamer2020\sources\PokemonGameEditor\GBAPokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.vbproj.GenerateResource.Cache -C:\Users\Gamer2020\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\GBAPokemonGameEditor.exe.config