diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo index 5048a14..9059424 100644 Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ diff --git a/GBAPokemonGameEditor/CryFunctions.vb b/GBAPokemonGameEditor/CryFunctions.vb index 1478f70..7c77f64 100644 --- a/GBAPokemonGameEditor/CryFunctions.vb +++ b/GBAPokemonGameEditor/CryFunctions.vb @@ -131,14 +131,20 @@ Module CryFunctions Dim cryImage As Bitmap + If GetString(AppPath & "GBAPGESettings.ini", "Settings", "DisableCryImage", "0") = "1" Then + cryImage = New Bitmap(128, 128) + Else - cryImage = New Bitmap(cry.Data.Length, 128) + cryImage = New Bitmap(cry.Data.Length, 128) - Using g = Graphics.FromImage(cryImage) - For i As Integer = 1 To cry.Data.Length - 1 - g.DrawLine(Pens.Green, i - 1, 64 + cry.Data(i - 1), i, 64 + cry.Data(i)) - Next - End Using + Using g = Graphics.FromImage(cryImage) + For i As Integer = 1 To cry.Data.Length - 1 + g.DrawLine(Pens.Green, i - 1, 64 + cry.Data(i - 1), i, 64 + cry.Data(i)) + Next + End Using + + + End If Return cryImage diff --git a/GBAPokemonGameEditor/MainFrm.Designer.vb b/GBAPokemonGameEditor/MainFrm.Designer.vb index c025e9c..a014c74 100644 --- a/GBAPokemonGameEditor/MainFrm.Designer.vb +++ b/GBAPokemonGameEditor/MainFrm.Designer.vb @@ -86,6 +86,7 @@ Partial Class MainFrm Me.Button1 = New System.Windows.Forms.Button() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.Label1 = New System.Windows.Forms.Label() + Me.DisableCryImageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MenuStrip1.SuspendLayout() Me.GroupBox4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -132,7 +133,7 @@ Partial Class MainFrm ' 'SettingsToolStripMenuItem ' - Me.SettingsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AddOrRemoveProgramsToolStripMenuItem, Me.TransparentBackgroundsToolStripMenuItem, Me.DisablePokemonImageLoadingToolStripMenuItem, Me.LinuxToolStripMenuItem}) + Me.SettingsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AddOrRemoveProgramsToolStripMenuItem, Me.TransparentBackgroundsToolStripMenuItem, Me.DisablePokemonImageLoadingToolStripMenuItem, Me.LinuxToolStripMenuItem, Me.DisableCryImageToolStripMenuItem}) Me.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem" Me.SettingsToolStripMenuItem.Size = New System.Drawing.Size(74, 24) Me.SettingsToolStripMenuItem.Text = "&Settings" @@ -758,6 +759,12 @@ Partial Class MainFrm Me.Label1.TabIndex = 0 Me.Label1.Text = "Copyright © 2017 Gamer2020 All Rights Reserved. " ' + 'DisableCryImageToolStripMenuItem + ' + Me.DisableCryImageToolStripMenuItem.Name = "DisableCryImageToolStripMenuItem" + Me.DisableCryImageToolStripMenuItem.Size = New System.Drawing.Size(313, 26) + Me.DisableCryImageToolStripMenuItem.Text = "Disable Cry Image" + ' 'MainFrm ' Me.AllowDrop = True @@ -853,4 +860,5 @@ Partial Class MainFrm Friend WithEvents Button10 As Button Friend WithEvents Button11 As Button Friend WithEvents Button12 As System.Windows.Forms.Button + Friend WithEvents DisableCryImageToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem End Class diff --git a/GBAPokemonGameEditor/MainFrm.vb b/GBAPokemonGameEditor/MainFrm.vb index 3624f93..b99e298 100644 --- a/GBAPokemonGameEditor/MainFrm.vb +++ b/GBAPokemonGameEditor/MainFrm.vb @@ -29,6 +29,12 @@ Public Class MainFrm End If + If GetString(AppPath & "GBAPGESettings.ini", "Settings", "DisableCryImage", "0") = "1" Then + + DisableCryImageToolStripMenuItem.CheckState = CheckState.Checked + + End If + If GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramPath0", "") <> "" Then Button27.Text = GetString(AppPath & "GBAPGESettings.ini", "Settings", "ProgramName0", "") @@ -837,4 +843,21 @@ Public Class MainFrm Me.Cursor = Cursors.Arrow End Sub + + Private Sub DisableCryImageToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DisableCryImageToolStripMenuItem.Click + + If DisableCryImageToolStripMenuItem.CheckState = CheckState.Checked Then + + DisableCryImageToolStripMenuItem.CheckState = CheckState.Unchecked + + WriteString(AppPath & "GBAPGESettings.ini", "Settings", "DisableCryImage", "0") + + ElseIf DisableCryImageToolStripMenuItem.CheckState = CheckState.Unchecked Then + + DisableCryImageToolStripMenuItem.CheckState = CheckState.Checked + + WriteString(AppPath & "GBAPGESettings.ini", "Settings", "DisableCryImage", "1") + + End If + End Sub End Class diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index f869e24..3a83b2c 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - VFX7xJ5KwWsmGh0TmpFLBrt65Rmoczq5RbIXAZFBXCI= + ePsi7lbCowGiut+RnQE8yURMlq0/O0EwRDrs34tnDuI= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index f878de0..75c82d7 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest index 7c6b328..28e22d8 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - y1ehzWILPkuzpYO/YXFiyEejhx9RUCpD1ZTJYhF3DLk= + jPuFML2kTRbKTgFNhQMldMcH4p9QyjJAG7cE3zSY4qU= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index 092354b..3c2208e 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb differ diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application index f869e24..3a83b2c 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -16,7 +16,7 @@ - VFX7xJ5KwWsmGh0TmpFLBrt65Rmoczq5RbIXAZFBXCI= + ePsi7lbCowGiut+RnQE8yURMlq0/O0EwRDrs34tnDuI= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest index 7c6b328..28e22d8 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest @@ -43,14 +43,14 @@ - + - y1ehzWILPkuzpYO/YXFiyEejhx9RUCpD1ZTJYhF3DLk= + jPuFML2kTRbKTgFNhQMldMcH4p9QyjJAG7cE3zSY4qU= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index e58b3bb..1af070e 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index f869e24..3a83b2c 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - VFX7xJ5KwWsmGh0TmpFLBrt65Rmoczq5RbIXAZFBXCI= + ePsi7lbCowGiut+RnQE8yURMlq0/O0EwRDrs34tnDuI= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index f878de0..75c82d7 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest index 7c6b328..28e22d8 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - y1ehzWILPkuzpYO/YXFiyEejhx9RUCpD1ZTJYhF3DLk= + jPuFML2kTRbKTgFNhQMldMcH4p9QyjJAG7cE3zSY4qU= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index 092354b..3c2208e 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ