Re-Reorganized Controls

This commit is contained in:
Regnum 2018-10-23 21:30:43 -05:00
parent 3d40499b97
commit 0665bd4c4c
16 changed files with 110 additions and 68 deletions

View File

@ -52,16 +52,18 @@ Partial Class Form1
Me.Button3 = New System.Windows.Forms.Button()
Me.Label5 = New System.Windows.Forms.Label()
Me.Button4 = New System.Windows.Forms.Button()
Me.TextBox1 = New System.Windows.Forms.TextBox()
Me.Label6 = New System.Windows.Forms.Label()
Me.Label7 = New System.Windows.Forms.Label()
Me.Button5 = New System.Windows.Forms.Button()
Me.Button6 = New System.Windows.Forms.Button()
Me.MainMenu1 = New System.Windows.Forms.MainMenu(Me.components)
Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
Me.GroupBox4 = New System.Windows.Forms.GroupBox()
Me.Label6 = New System.Windows.Forms.Label()
Me.TextBox1 = New System.Windows.Forms.TextBox()
Me.Label7 = New System.Windows.Forms.Label()
Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout()
Me.GroupBox3.SuspendLayout()
Me.GroupBox4.SuspendLayout()
Me.SuspendLayout()
'
'RichTextBox1
@ -163,7 +165,7 @@ Partial Class Form1
'
'RichTextBox2
'
Me.RichTextBox2.Location = New System.Drawing.Point(13, 207)
Me.RichTextBox2.Location = New System.Drawing.Point(197, 205)
Me.RichTextBox2.MaxLength = 252
Me.RichTextBox2.Name = "RichTextBox2"
Me.RichTextBox2.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None
@ -330,7 +332,7 @@ Partial Class Form1
'Button3
'
Me.Button3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Button3.Location = New System.Drawing.Point(59, 358)
Me.Button3.Location = New System.Drawing.Point(244, 357)
Me.Button3.Name = "Button3"
Me.Button3.Size = New System.Drawing.Size(128, 46)
Me.Button3.TabIndex = 9
@ -340,7 +342,7 @@ Partial Class Form1
'Label5
'
Me.Label5.AutoSize = True
Me.Label5.Location = New System.Drawing.Point(13, 194)
Me.Label5.Location = New System.Drawing.Point(197, 192)
Me.Label5.Name = "Label5"
Me.Label5.Size = New System.Drawing.Size(62, 13)
Me.Label5.TabIndex = 10
@ -349,41 +351,13 @@ Partial Class Form1
'Button4
'
Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Button4.Location = New System.Drawing.Point(169, 305)
Me.Button4.Location = New System.Drawing.Point(197, 303)
Me.Button4.Name = "Button4"
Me.Button4.Size = New System.Drawing.Size(67, 21)
Me.Button4.Size = New System.Drawing.Size(223, 21)
Me.Button4.TabIndex = 11
Me.Button4.Text = "Reset Text"
Me.Button4.UseVisualStyleBackColor = True
'
'TextBox1
'
Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TextBox1.Location = New System.Drawing.Point(243, 208)
Me.TextBox1.Name = "TextBox1"
Me.TextBox1.Size = New System.Drawing.Size(148, 21)
Me.TextBox1.TabIndex = 12
Me.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'Label6
'
Me.Label6.AutoSize = True
Me.Label6.Location = New System.Drawing.Point(242, 195)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(66, 13)
Me.Label6.TabIndex = 13
Me.Label6.Text = "ROM Name:"
'
'Label7
'
Me.Label7.AutoSize = True
Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label7.Location = New System.Drawing.Point(391, 210)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(30, 15)
Me.Label7.TabIndex = 14
Me.Label7.Text = ".nds"
'
'Button5
'
Me.Button5.Location = New System.Drawing.Point(0, 427)
@ -412,17 +386,55 @@ Partial Class Form1
Me.LinkLabel1.TabStop = True
Me.LinkLabel1.Text = "LinkLabel1"
'
'GroupBox4
'
Me.GroupBox4.Controls.Add(Me.Label6)
Me.GroupBox4.Controls.Add(Me.TextBox1)
Me.GroupBox4.Controls.Add(Me.Label7)
Me.GroupBox4.Location = New System.Drawing.Point(13, 195)
Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.Size = New System.Drawing.Size(180, 226)
Me.GroupBox4.TabIndex = 19
Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "ROM Details"
'
'Label6
'
Me.Label6.AutoSize = True
Me.Label6.Location = New System.Drawing.Point(6, 16)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(57, 13)
Me.Label6.TabIndex = 13
Me.Label6.Text = "File Name:"
'
'TextBox1
'
Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TextBox1.Location = New System.Drawing.Point(7, 29)
Me.TextBox1.Name = "TextBox1"
Me.TextBox1.Size = New System.Drawing.Size(142, 21)
Me.TextBox1.TabIndex = 12
Me.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
'
'Label7
'
Me.Label7.AutoSize = True
Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label7.Location = New System.Drawing.Point(147, 31)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(30, 15)
Me.Label7.TabIndex = 14
Me.Label7.Text = ".nds"
'
'Form1
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(834, 451)
Me.Controls.Add(Me.GroupBox4)
Me.Controls.Add(Me.LinkLabel1)
Me.Controls.Add(Me.Button6)
Me.Controls.Add(Me.Button5)
Me.Controls.Add(Me.Label7)
Me.Controls.Add(Me.Label6)
Me.Controls.Add(Me.TextBox1)
Me.Controls.Add(Me.Button4)
Me.Controls.Add(Me.Label5)
Me.Controls.Add(Me.Button3)
@ -444,6 +456,8 @@ Partial Class Form1
Me.GroupBox2.PerformLayout()
Me.GroupBox3.ResumeLayout(False)
Me.GroupBox3.PerformLayout()
Me.GroupBox4.ResumeLayout(False)
Me.GroupBox4.PerformLayout()
Me.ResumeLayout(False)
Me.PerformLayout()
@ -477,11 +491,12 @@ Partial Class Form1
Friend WithEvents Button3 As Button
Friend WithEvents Label5 As Label
Friend WithEvents Button4 As Button
Friend WithEvents TextBox1 As TextBox
Friend WithEvents Label6 As Label
Friend WithEvents Label7 As Label
Friend WithEvents Button5 As Button
Friend WithEvents Button6 As Button
Friend WithEvents MainMenu1 As MainMenu
Friend WithEvents LinkLabel1 As LinkLabel
Friend WithEvents GroupBox4 As GroupBox
Friend WithEvents Label6 As Label
Friend WithEvents TextBox1 As TextBox
Friend WithEvents Label7 As Label
End Class

View File

@ -589,13 +589,13 @@ Make sure you put the new lines(ENTER key)"
RichTextBox1.Text = RichTextBox1.Text.Insert(424, ft)
RichTextBox2.ForeColor = Color.Black
End Sub
Private Sub TextBox1_LostFocus(ByVal sender As Object, ByVal e As EventArgs) Handles TextBox1.Leave
Private Sub TextBox1_LostFocus(ByVal sender As Object, ByVal e As EventArgs)
If TextBox1.Text = Nothing Then
TextBox1.Text = "compiled"
TextBox1.ForeColor = Color.Gray
End If
End Sub
Private Sub TextBox1_GotFocus(ByVal sender As Object, ByVal e As EventArgs) Handles TextBox1.Enter
Private Sub TextBox1_GotFocus(ByVal sender As Object, ByVal e As EventArgs)
If TextBox1.Text = "compiled" Then
TextBox1.Text = Nothing
TextBox1.ForeColor = Color.Black

View File

@ -1,7 +1,7 @@
// Pokémon Duodecuple Distribution
// by Prof. 9
// Version 1.4.1 "Skinless"
//
// With Edits by Regnum for PKMG5DC
// Thanks to Yellow Wood Goblin for the slot-1 read fix.
.include options.asm
@ -316,39 +316,54 @@ languagepool:
dcw 8B9Fh
.org 240h
dcw 50h,6Fh,6Bh,0E9h,6Dh,6Fh,6Eh,0Ah,47h,65h,6Eh,65h
dcw 72h,61h,74h,69h,6Fh,6Eh,20h,35h,0Ah,44h,75h,6Fh
dcw 64h,65h,63h,75h,70h,6Ch,65h,20h,44h,69h,73h,74h
dcw 72h,69h,62h,75h,74h,69h,6Fh,6Eh,0h
dcw 0E3h,83h,9Dh,0E3h,82h,0B1h,0E3h,83h,83h,0E3h,83h,88h
dcw 0E3h,83h,0A2h,0E3h,83h,0B3h,0E3h,82h,0B9h,0E3h,82h,0BFh
dcw 0E3h,83h,0BCh,0Ah,0E7h,0ACh,0ACh,35h,0E4h,0B8h,96h,0E4h
dcw 0BBh,0A3h,0Ah,0E3h,82h,0ABh,0E3h,82h,0B9h,0E3h,82h,0BFh
dcw 0E3h,83h,0A0h,0E3h,83h,0A1h,0E3h,82h,0A4h,0E3h,83h,89h
dcw 0E6h,0B5h,81h,0E9h,80h,9Ah,0Ah,50h,4Bh,4Dh,47h,35h
dcw 44h,43h,0h
.org 340h
dcw 50h,6Fh,6Bh,0E9h,6Dh,6Fh,6Eh,0Ah,47h,65h,6Eh,65h
dcw 72h,61h,74h,69h,6Fh,6Eh,20h,35h,0Ah,44h,75h,6Fh
dcw 64h,65h,63h,75h,70h,6Ch,65h,20h,44h,69h,73h,74h
dcw 72h,69h,62h,75h,74h,69h,6Fh,6Eh,0h
dcw 72h,61h,74h,69h,6Fh,6Eh,20h,35h,0Ah,43h,75h,73h
dcw 74h,6Fh,6Dh,20h,4Dh,61h,64h,65h,20h,44h,69h,73h
dcw 74h,72h,69h,62h,75h,74h,69h,6Fh,6Eh,0Ah,50h,4Bh
dcw 4Dh,47h,35h,44h,43h,0h
.org 440h
dcw 50h,6Fh,6Bh,0E9h,6Dh,6Fh,6Eh,0Ah,47h,65h,6Eh,65h
dcw 72h,61h,74h,69h,6Fh,6Eh,20h,35h,0Ah,44h,75h,6Fh
dcw 64h,65h,63h,75h,70h,6Ch,65h,20h,44h,69h,73h,74h
dcw 72h,69h,62h,75h,74h,69h,6Fh,6Eh,0h
dcw 50h,6fh,6bh,0e9h,6dh,6fh,6eh,0ah,47h,0e9h,6eh,0e9h
dcw 72h,61h,74h,69h,6fh,6eh,20h,35h,0ah,44h,69h,73h
dcw 74h,72h,69h,62h,75h,74h,69h,6fh,6eh,20h,50h,65h
dcw 72h,73h,6fh,6eh,6eh,61h,6ch,69h,73h,0e9h,65h,0ah
dcw 50h,4bh,4dh,47h,35h,44h,43h,0h
.org 540h
dcw 50h,6Fh,6Bh,0E9h,6Dh,6Fh,6Eh,0Ah,47h,65h,6Eh,65h
dcw 72h,61h,74h,69h,6Fh,6Eh,20h,35h,0Ah,44h,75h,6Fh
dcw 64h,65h,63h,75h,70h,6Ch,65h,20h,44h,69h,73h,74h
dcw 72h,69h,62h,75h,74h,69h,6Fh,6Eh,0h
dcw 50h,6fh,6bh,0e9h,6dh,6fh,6eh,0ah,47h,65h,6eh,65h
dcw 72h,61h,74h,69h,6fh,6eh,20h,35h,0ah,42h,65h,6eh
dcw 75h,74h,7ah,65h,72h,64h,65h,66h,69h,6eh,69h,65h
dcw 72h,74h,65h,20h,56h,65h,72h,74h,65h,69h,6ch,75h
dcw 6eh,67h,0ah,50h,4bh,4dh,47h,35h,44h,43h,0h
.org 640h
dcw 50h,6Fh,6Bh,0E9h,6Dh,6Fh,6Eh,0Ah,47h,65h,6Eh,65h
dcw 72h,61h,74h,69h,6Fh,6Eh,20h,35h,0Ah,44h,75h,6Fh
dcw 64h,65h,63h,75h,70h,6Ch,65h,20h,44h,69h,73h,74h
dcw 72h,69h,62h,75h,74h,69h,6Fh,6Eh,0h
dcw 50h,6fh,6bh,0e9h,6dh,6fh,6eh,0ah,47h,65h,6eh,65h
dcw 72h,61h,7ah,69h,6fh,6eh,65h,20h,35h,0ah,44h,69h
dcw 73h,74h,72h,69h,62h,75h,7ah,69h,6fh,6eh,65h,20h
dcw 50h,65h,72h,73h,6fh,6eh,61h,6ch,69h,7ah,7ah,61h
dcw 74h,61h,0ah,50h,4bh,4dh,47h,35h,44h,43h,0h
.org 740h
dcw 50h,6Fh,6Bh,0E9h,6Dh,6Fh,6Eh,0Ah,47h,65h,6Eh,65h
dcw 72h,61h,74h,69h,6Fh,6Eh,20h,35h,0Ah,44h,75h,6Fh
dcw 64h,65h,63h,75h,70h,6Ch,65h,20h,44h,69h,73h,74h
dcw 72h,69h,62h,75h,74h,69h,6Fh,6Eh,0h
dcw 50h,6fh,6bh,0e9h,6dh,6fh,6eh,0ah,47h,65h,6eh,65h
dcw 72h,61h,63h,69h,0f3h,6eh,20h,35h,0ah,44h,69h,73h
dcw 74h,72h,69h,62h,75h,63h,69h,0f3h,6eh,20h,50h,65h
dcw 72h,73h,6fh,6eh,61h,6ch,69h,7ah,61h,64h,61h,0ah
dcw 50h,4bh,4dh,47h,35h,44h,43h,0h
.close
.open header.bin,0h
.org 0h
dcb 50h,4Bh,4Dh,43h,55h,53h,54h,4Fh,4Dh,52h,4Fh,4Dh
dcb 47h,35h,44h,43h
.close

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1 @@
afbd2969ea66bac038b3d9f055bd4493ea283b5d

View File

@ -14,3 +14,12 @@ C:\Users\Nick\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen5 Di
C:\Users\Nick\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen5 Distribution Creator.vbproj.CoreCompileInputs.cache
C:\Users\Nick\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen 5 Pokémon Distribution ROM Creator.exe
C:\Users\Nick\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen 5 Pokémon Distribution ROM Creator.pdb
C:\Users\Kochen Family\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen5_Distribution_Creator.CustomMessageBox.resources
C:\Users\Kochen Family\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen5_Distribution_Creator.Form1.resources
C:\Users\Kochen Family\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen5_Distribution_Creator.Form2.resources
C:\Users\Kochen Family\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen5_Distribution_Creator.Form3.resources
C:\Users\Kochen Family\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen5_Distribution_Creator.Resources.resources
C:\Users\Kochen Family\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen5 Distribution Creator.vbproj.GenerateResource.cache
C:\Users\Kochen Family\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\Gen5 Distribution Creator.vbproj.CoreCompileInputs.cache
C:\Users\Kochen Family\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\PKMG5DC.exe
C:\Users\Kochen Family\source\repos\PKMG5DC\Gen5 Distribution Creator\obj\Release\PKMG5DC.pdb

Binary file not shown.

View File

@ -0,0 +1,2 @@
PKMG5DC.exe
MSBuild.AutoILMerge.Task.dll

Binary file not shown.