diff --git a/.vs/GBAPokemonGameEditor/v14/.suo b/.vs/GBAPokemonGameEditor/v14/.suo index ce6c524..4c295ce 100644 Binary files a/.vs/GBAPokemonGameEditor/v14/.suo and b/.vs/GBAPokemonGameEditor/v14/.suo differ diff --git a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj index a0e1496..49baab4 100644 --- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj +++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj @@ -31,7 +31,7 @@ true publish.htm 0 - 3.1.0.0 + 3.2.0.0 false true true diff --git a/GBAPokemonGameEditor/ItemEditor.Designer.vb b/GBAPokemonGameEditor/ItemEditor.Designer.vb index 30aa3df..a2078ef 100644 --- a/GBAPokemonGameEditor/ItemEditor.Designer.vb +++ b/GBAPokemonGameEditor/ItemEditor.Designer.vb @@ -54,6 +54,12 @@ Partial Class ItemEditor Me.TypeTextBox = New System.Windows.Forms.TextBox() Me.Label9 = New System.Windows.Forms.Label() Me.Label11 = New System.Windows.Forms.Label() + Me.FieldUsagePTTextBox = New System.Windows.Forms.TextBox() + Me.Label12 = New System.Windows.Forms.Label() + Me.Label13 = New System.Windows.Forms.Label() + Me.BattleUsagePTTextBox = New System.Windows.Forms.TextBox() + Me.Label14 = New System.Windows.Forms.Label() + Me.BUTextBox = New System.Windows.Forms.TextBox() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() CType(Me.ItemImagePictureBox, System.ComponentModel.ISupportInitialize).BeginInit() @@ -339,11 +345,65 @@ Partial Class ItemEditor Me.Label11.TabIndex = 44 Me.Label11.Text = "Bag Keyitem:" ' + 'FieldUsagePTTextBox + ' + Me.FieldUsagePTTextBox.Location = New System.Drawing.Point(372, 58) + Me.FieldUsagePTTextBox.Name = "FieldUsagePTTextBox" + Me.FieldUsagePTTextBox.Size = New System.Drawing.Size(83, 20) + Me.FieldUsagePTTextBox.TabIndex = 45 + ' + 'Label12 + ' + Me.Label12.AutoSize = True + Me.Label12.Location = New System.Drawing.Point(369, 35) + Me.Label12.Name = "Label12" + Me.Label12.Size = New System.Drawing.Size(102, 13) + Me.Label12.TabIndex = 46 + Me.Label12.Text = "Field Usage Pointer:" + ' + 'Label13 + ' + Me.Label13.AutoSize = True + Me.Label13.Location = New System.Drawing.Point(369, 87) + Me.Label13.Name = "Label13" + Me.Label13.Size = New System.Drawing.Size(107, 13) + Me.Label13.TabIndex = 48 + Me.Label13.Text = "Battle Usage Pointer:" + ' + 'BattleUsagePTTextBox + ' + Me.BattleUsagePTTextBox.Location = New System.Drawing.Point(372, 115) + Me.BattleUsagePTTextBox.Name = "BattleUsagePTTextBox" + Me.BattleUsagePTTextBox.Size = New System.Drawing.Size(83, 20) + Me.BattleUsagePTTextBox.TabIndex = 47 + ' + 'Label14 + ' + Me.Label14.AutoSize = True + Me.Label14.Location = New System.Drawing.Point(369, 144) + Me.Label14.Name = "Label14" + Me.Label14.Size = New System.Drawing.Size(71, 13) + Me.Label14.TabIndex = 49 + Me.Label14.Text = "Battle Usage:" + ' + 'BUTextBox + ' + Me.BUTextBox.Location = New System.Drawing.Point(446, 141) + Me.BUTextBox.Name = "BUTextBox" + Me.BUTextBox.Size = New System.Drawing.Size(25, 20) + Me.BUTextBox.TabIndex = 50 + ' 'ItemEditor ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(496, 318) + Me.Controls.Add(Me.BUTextBox) + Me.Controls.Add(Me.Label14) + Me.Controls.Add(Me.Label13) + Me.Controls.Add(Me.BattleUsagePTTextBox) + Me.Controls.Add(Me.Label12) + Me.Controls.Add(Me.FieldUsagePTTextBox) Me.Controls.Add(Me.Label11) Me.Controls.Add(Me.TypeTextBox) Me.Controls.Add(Me.Label9) @@ -413,4 +473,10 @@ Partial Class ItemEditor Friend WithEvents TypeTextBox As TextBox Friend WithEvents Label9 As Label Friend WithEvents Label11 As Label + Friend WithEvents FieldUsagePTTextBox As TextBox + Friend WithEvents Label12 As Label + Friend WithEvents Label13 As Label + Friend WithEvents BattleUsagePTTextBox As TextBox + Friend WithEvents Label14 As Label + Friend WithEvents BUTextBox As TextBox End Class diff --git a/GBAPokemonGameEditor/ItemEditor.vb b/GBAPokemonGameEditor/ItemEditor.vb index 6552861..74d9677 100644 --- a/GBAPokemonGameEditor/ItemEditor.vb +++ b/GBAPokemonGameEditor/ItemEditor.vb @@ -62,6 +62,11 @@ Public Class ItemEditor PocketComboBox.SelectedIndex = Int32.Parse((((ReadHEX(LoadedROM, ((ItemBaseOff) + 26) + (ItemListComboBox.SelectedIndex * 44), 1)))), System.Globalization.NumberStyles.HexNumber) TypeTextBox.Text = Int32.Parse((((ReadHEX(LoadedROM, ((ItemBaseOff) + 27) + (ItemListComboBox.SelectedIndex * 44), 1)))), System.Globalization.NumberStyles.HexNumber) + FieldUsagePTTextBox.Text = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((ItemBaseOff) + 28) + (ItemListComboBox.SelectedIndex * 44), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) + BattleUsagePTTextBox.Text = Hex(Int32.Parse((ReverseHEX(ReadHEX(LoadedROM, ((ItemBaseOff) + 36) + (ItemListComboBox.SelectedIndex * 44), 4))), System.Globalization.NumberStyles.HexNumber) - &H8000000) + BUTextBox.Text = Int32.Parse((((ReadHEX(LoadedROM, ((ItemBaseOff) + 32) + (ItemListComboBox.SelectedIndex * 44), 1)))), System.Globalization.NumberStyles.HexNumber) + + FileNum = FreeFile() FileOpen(FileNum, LoadedROM, OpenMode.Binary) Dim ItemDescp As String = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" @@ -109,6 +114,9 @@ Public Class ItemEditor WriteHEX(LoadedROM, ((ItemBaseOff) + 26) + (listvar * 44), Hex(PocketComboBox.SelectedIndex)) WriteHEX(LoadedROM, ((ItemBaseOff) + 27) + (listvar * 44), Hex(TypeTextBox.Text)) + WriteHEX(LoadedROM, ((ItemBaseOff) + 28) + (ItemListComboBox.SelectedIndex * 44), ReverseHEX(Hex(Int32.Parse(((FieldUsagePTTextBox.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) + WriteHEX(LoadedROM, ((ItemBaseOff) + 36) + (ItemListComboBox.SelectedIndex * 44), ReverseHEX(Hex(Int32.Parse(((BattleUsagePTTextBox.Text)), System.Globalization.NumberStyles.HexNumber) + &H8000000))) + WriteHEX(LoadedROM, ((ItemBaseOff) + 32) + (listvar * 44), Hex(BUTextBox.Text)) If header2 = "BPR" Or header2 = "BPG" Or header2 = "BPE" Then diff --git a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb index 9aa1be0..668b649 100644 --- a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb +++ b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb @@ -18,7 +18,7 @@ Imports System.Runtime.InteropServices 'The following GUID is for the ID of the typelib if this project is exposed to COM - + ' Version information for an assembly consists of the following four values: ' @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application index 0c0970b..a5bd63e 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - 8x4DI+swmrSbqwT6O0NdnKqq5qw= + 5TxnICaOFfgSHmALtBWl9BC25Gg= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe index 3249b67..dc25af4 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 c6abaf4..9e9a371 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -43,14 +43,14 @@ - - + + - L1pq5zFbkVS0Fu7tgnZpNH5YNaQ= + GkFsejm9lK/NhbVqXk84eEH2ZjA= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb index cb038c5..3ee5ab7 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 0c0970b..a5bd63e 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - 8x4DI+swmrSbqwT6O0NdnKqq5qw= + 5TxnICaOFfgSHmALtBWl9BC25Gg= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest index c6abaf4..9e9a371 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -43,14 +43,14 @@ - - + + - L1pq5zFbkVS0Fu7tgnZpNH5YNaQ= + GkFsejm9lK/NhbVqXk84eEH2ZjA= diff --git a/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/app.publish/GBAPokemonGameEditor.exe index 3249b67..dc25af4 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/obj/x86/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application index 0c0970b..a5bd63e 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - 8x4DI+swmrSbqwT6O0NdnKqq5qw= + 5TxnICaOFfgSHmALtBWl9BC25Gg= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe index 3249b67..dc25af4 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 c6abaf4..9e9a371 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -43,14 +43,14 @@ - - + + - L1pq5zFbkVS0Fu7tgnZpNH5YNaQ= + GkFsejm9lK/NhbVqXk84eEH2ZjA= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb index cb038c5..3ee5ab7 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb differ diff --git a/README.md b/README.md index 84f914b..f7d7eb2 100644 --- a/README.md +++ b/README.md @@ -41,22 +41,22 @@ Support for more types Ability to define evolutions. +Item editor + +TM/HM Editor + Planned Features ================= Ability to add more Pokemon. -Add item editor. - Ability to add more attacks. -Ability to define types. - -Implement a way to tag ROMs without actually writing to the ROM in order to use separate inis. Tag should only be applied if needed. +Implement a way to tag ROMs without actually writing to the ROM in order to use separate inis. Tag should only be applied if needed. Some way of using seperate inis. Ability to add more items. -Attack effect and animation database. +Attack effect and animation database? Program Requirements ==================== @@ -65,7 +65,7 @@ Windows: Install 4.0 .Net Framework Windows RT: Have Jailbreak installed that allows unsigned programs. -Linux: Run with "Wine Windows Program Loader" and let it install the Mono runtime. +Linux: Run with "Wine Windows Program Loader" and let it install the Mono runtime. *The program has not been tested under linux in a long time. Let me know if something doesn't work under Linux.* Other operating systems may work if mono works on them.