diff --git a/.vs/GBAPokemonGameEditor/v14/.suo b/.vs/GBAPokemonGameEditor/v14/.suo index 4c65e2e..9dfeb42 100644 Binary files a/.vs/GBAPokemonGameEditor/v14/.suo and b/.vs/GBAPokemonGameEditor/v14/.suo differ diff --git a/GBAPokemonGameEditor/BattleFrontierEditor.Designer.vb b/GBAPokemonGameEditor/BattleFrontierEditor.Designer.vb index 204fc40..d1e051e 100644 --- a/GBAPokemonGameEditor/BattleFrontierEditor.Designer.vb +++ b/GBAPokemonGameEditor/BattleFrontierEditor.Designer.vb @@ -167,6 +167,11 @@ Partial Class BattleFrontierEditor Me.TextBox12 = New System.Windows.Forms.TextBox() Me.GroupBox16 = New System.Windows.Forms.GroupBox() Me.ListBox12 = New System.Windows.Forms.ListBox() + Me.TabPage5 = New System.Windows.Forms.TabPage() + Me.ListBox13 = New System.Windows.Forms.ListBox() + Me.PictureBox9 = New System.Windows.Forms.PictureBox() + Me.ComboBox37 = New System.Windows.Forms.ComboBox() + Me.Button21 = New System.Windows.Forms.Button() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.GroupBox4.SuspendLayout() @@ -196,6 +201,8 @@ Partial Class BattleFrontierEditor CType(Me.PictureBox8, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox15.SuspendLayout() Me.GroupBox16.SuspendLayout() + Me.TabPage5.SuspendLayout() + CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TabControl1 @@ -204,6 +211,7 @@ Partial Class BattleFrontierEditor Me.TabControl1.Controls.Add(Me.TabPage2) Me.TabControl1.Controls.Add(Me.TabPage3) Me.TabControl1.Controls.Add(Me.TabPage4) + Me.TabControl1.Controls.Add(Me.TabPage5) Me.TabControl1.Location = New System.Drawing.Point(7, 7) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 @@ -1608,6 +1616,53 @@ Partial Class BattleFrontierEditor Me.ListBox12.Size = New System.Drawing.Size(97, 134) Me.ListBox12.TabIndex = 0 ' + 'TabPage5 + ' + Me.TabPage5.Controls.Add(Me.Button21) + Me.TabPage5.Controls.Add(Me.PictureBox9) + Me.TabPage5.Controls.Add(Me.ComboBox37) + Me.TabPage5.Controls.Add(Me.ListBox13) + Me.TabPage5.Location = New System.Drawing.Point(4, 22) + Me.TabPage5.Name = "TabPage5" + Me.TabPage5.Size = New System.Drawing.Size(556, 480) + Me.TabPage5.TabIndex = 4 + Me.TabPage5.Text = "Ban List" + Me.TabPage5.UseVisualStyleBackColor = True + ' + 'ListBox13 + ' + Me.ListBox13.FormattingEnabled = True + Me.ListBox13.Location = New System.Drawing.Point(16, 17) + Me.ListBox13.Name = "ListBox13" + Me.ListBox13.Size = New System.Drawing.Size(121, 173) + Me.ListBox13.TabIndex = 0 + ' + 'PictureBox9 + ' + Me.PictureBox9.Location = New System.Drawing.Point(185, 44) + Me.PictureBox9.Name = "PictureBox9" + Me.PictureBox9.Size = New System.Drawing.Size(64, 64) + Me.PictureBox9.TabIndex = 13 + Me.PictureBox9.TabStop = False + ' + 'ComboBox37 + ' + Me.ComboBox37.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.ComboBox37.FormattingEnabled = True + Me.ComboBox37.Location = New System.Drawing.Point(152, 17) + Me.ComboBox37.Name = "ComboBox37" + Me.ComboBox37.Size = New System.Drawing.Size(121, 21) + Me.ComboBox37.TabIndex = 12 + ' + 'Button21 + ' + Me.Button21.Location = New System.Drawing.Point(316, 17) + Me.Button21.Name = "Button21" + Me.Button21.Size = New System.Drawing.Size(75, 23) + Me.Button21.TabIndex = 14 + Me.Button21.Text = "Save" + Me.Button21.UseVisualStyleBackColor = True + ' 'BattleFrontierEditor ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1660,6 +1715,8 @@ Partial Class BattleFrontierEditor Me.GroupBox15.ResumeLayout(False) Me.GroupBox15.PerformLayout() Me.GroupBox16.ResumeLayout(False) + Me.TabPage5.ResumeLayout(False) + CType(Me.PictureBox9, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -1808,4 +1865,9 @@ Partial Class BattleFrontierEditor Friend WithEvents TextBox12 As TextBox Friend WithEvents GroupBox16 As GroupBox Friend WithEvents ListBox12 As ListBox + Friend WithEvents TabPage5 As TabPage + Friend WithEvents PictureBox9 As PictureBox + Friend WithEvents ComboBox37 As ComboBox + Friend WithEvents ListBox13 As ListBox + Friend WithEvents Button21 As Button End Class diff --git a/GBAPokemonGameEditor/BattleFrontierEditor.vb b/GBAPokemonGameEditor/BattleFrontierEditor.vb index 2ef8f39..b3b3144 100644 --- a/GBAPokemonGameEditor/BattleFrontierEditor.vb +++ b/GBAPokemonGameEditor/BattleFrontierEditor.vb @@ -195,6 +195,7 @@ Public Class BattleFrontierEditor ComboBox16.Items.Clear() ComboBox25.Items.Clear() ComboBox34.Items.Clear() + ComboBox37.Items.Clear() While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfPokemon", "")) - 1 = True @@ -205,6 +206,7 @@ Public Class BattleFrontierEditor ComboBox16.Items.Add(GetPokemonName(LoopVar)) ComboBox25.Items.Add(GetPokemonName(LoopVar)) ComboBox34.Items.Add(GetPokemonName(LoopVar)) + ComboBox37.Items.Add(GetPokemonName(LoopVar)) End While @@ -279,6 +281,25 @@ Public Class BattleFrontierEditor End While + Dim curbytes As String + Dim counter As Integer = 0 + + ListBox13.Items.Clear() + + curbytes = ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "BattleFrontierBanList", "")), System.Globalization.NumberStyles.HexNumber), 2)) + + While curbytes <> "FFFF" + + ListBox13.Items.Add(GetPokemonName(Int32.Parse((curbytes), System.Globalization.NumberStyles.HexNumber))) + + counter = counter + 1 + + curbytes = ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "BattleFrontierBanList", "")), System.Globalization.NumberStyles.HexNumber) + (counter * 2), 2)) + + End While + + ListBox13.SelectedIndex = 0 + 'Tab 1 ListBox1.SelectedIndex = 0 ListBox2.SelectedIndex = 0 @@ -1605,4 +1626,41 @@ Public Class BattleFrontierEditor ComboBox35.SelectedIndex = indexmemory2 ListBox11.SelectedIndex = indexmemory3 End Sub + + Private Sub ComboBox37_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox37.SelectedIndexChanged + GetAndDrawAnimationPokemonPic(PictureBox9, ComboBox37.SelectedIndex + 1) + End Sub + + Private Sub ListBox13_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBox13.SelectedIndexChanged + ComboBox37.SelectedIndex = Int32.Parse(ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "BattleFrontierBanList", "")), System.Globalization.NumberStyles.HexNumber) + (ListBox13.SelectedIndex * 2), 2)), System.Globalization.NumberStyles.HexNumber) - 1 + End Sub + + Private Sub Button21_Click(sender As Object, e As EventArgs) Handles Button21.Click + + Dim indexmem As Integer + + + Dim curbytes As String + Dim counter As Integer = 0 + + indexmem = ListBox13.SelectedIndex + + WriteHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "BattleFrontierBanList", "")), System.Globalization.NumberStyles.HexNumber) + (ListBox13.SelectedIndex * 2), ReverseHEX(VB.Right("0000" & Hex(ComboBox37.SelectedIndex + 1), 4))) + + ListBox13.Items.Clear() + + curbytes = ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "BattleFrontierBanList", "")), System.Globalization.NumberStyles.HexNumber), 2)) + + While curbytes <> "FFFF" + + ListBox13.Items.Add(GetPokemonName(Int32.Parse((curbytes), System.Globalization.NumberStyles.HexNumber))) + + counter = counter + 1 + + curbytes = ReverseHEX(ReadHEX(LoadedROM, Int32.Parse((GetString(GetINIFileLocation(), header, "BattleFrontierBanList", "")), System.Globalization.NumberStyles.HexNumber) + (counter * 2), 2)) + + End While + + ListBox13.SelectedIndex = indexmem + End Sub End Class \ No newline at end of file diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application index 99cb1a4..23a42ce 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application @@ -16,7 +16,7 @@ - /rX4zE0fVoY+ztFUUlWne/Yk1SE= + OcmMlmCxN6OTUxfYuKENu34gy3w= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe index 63a0949..a645cb7 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest index eb75391..032f0d2 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - Uox+rVA2MM8qHL9VopX54YJd3kA= + FW5g1XyITeDjwZmYT0Bpw4aissY= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb index 4f59dfa..213c26f 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb differ diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application index 99cb1a4..23a42ce 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application @@ -16,7 +16,7 @@ - /rX4zE0fVoY+ztFUUlWne/Yk1SE= + OcmMlmCxN6OTUxfYuKENu34gy3w= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest index eb75391..032f0d2 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest @@ -43,14 +43,14 @@ - + - Uox+rVA2MM8qHL9VopX54YJd3kA= + FW5g1XyITeDjwZmYT0Bpw4aissY= diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe index 63a0949..a645cb7 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini index 0f5bd14..85dead3 100644 --- a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini +++ b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini @@ -819,6 +819,7 @@ NumberOfSlateportBattleTentPokemon=70 NumberOfVerdanturfBattleTentPokemon=45 NumberOfFallarborBattleTentPokemon=45 BattleFrontierHeldItems=5CECB0 +BattleFrontierBanList=611C9A NumberOfBattlefrontierHeldItems=62 NumberOfTilesInTilset3DF71C=8F NumberOfTilesInTilset3DF734=15D diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application index 99cb1a4..23a42ce 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application @@ -16,7 +16,7 @@ - /rX4zE0fVoY+ztFUUlWne/Yk1SE= + OcmMlmCxN6OTUxfYuKENu34gy3w= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe index 63a0949..a645cb7 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest index eb75391..032f0d2 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest @@ -43,14 +43,14 @@ - + - Uox+rVA2MM8qHL9VopX54YJd3kA= + FW5g1XyITeDjwZmYT0Bpw4aissY= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb index 4f59dfa..213c26f 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index 6bea392..e100b7d 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/roms.ini b/roms.ini index 0f5bd14..85dead3 100644 --- a/roms.ini +++ b/roms.ini @@ -819,6 +819,7 @@ NumberOfSlateportBattleTentPokemon=70 NumberOfVerdanturfBattleTentPokemon=45 NumberOfFallarborBattleTentPokemon=45 BattleFrontierHeldItems=5CECB0 +BattleFrontierBanList=611C9A NumberOfBattlefrontierHeldItems=62 NumberOfTilesInTilset3DF71C=8F NumberOfTilesInTilset3DF734=15D