diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo
index 905b7f0..69beecf 100644
Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ
diff --git a/GBAPokemonGameEditor/Pokemonedit.Designer.vb b/GBAPokemonGameEditor/Pokemonedit.Designer.vb
index 98bd98e..507f5ef 100644
--- a/GBAPokemonGameEditor/Pokemonedit.Designer.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.Designer.vb
@@ -26,6 +26,10 @@ Partial Class Pokemonedit
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.GroupBox21 = New System.Windows.Forms.GroupBox()
+ Me.Button13 = New System.Windows.Forms.Button()
+ Me.CryConver = New System.Windows.Forms.TextBox()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.Label17 = New System.Windows.Forms.Label()
Me.Button6 = New System.Windows.Forms.Button()
Me.CryPointer = New System.Windows.Forms.TextBox()
Me.GroupBox20 = New System.Windows.Forms.GroupBox()
@@ -157,10 +161,6 @@ Partial Class Pokemonedit
Me.Button9 = New System.Windows.Forms.Button()
Me.FolderBrowserDialog = New System.Windows.Forms.FolderBrowserDialog()
Me.ProgressBar = New System.Windows.Forms.ProgressBar()
- Me.Label17 = New System.Windows.Forms.Label()
- Me.Label18 = New System.Windows.Forms.Label()
- Me.CryConver = New System.Windows.Forms.TextBox()
- Me.Button13 = New System.Windows.Forms.Button()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
Me.GroupBox21.SuspendLayout()
@@ -246,6 +246,40 @@ Partial Class Pokemonedit
Me.GroupBox21.TabStop = False
Me.GroupBox21.Text = "Cry"
'
+ 'Button13
+ '
+ Me.Button13.Location = New System.Drawing.Point(9, 77)
+ Me.Button13.Name = "Button13"
+ Me.Button13.Size = New System.Drawing.Size(68, 21)
+ Me.Button13.TabIndex = 16
+ Me.Button13.Text = "Save"
+ Me.Button13.UseVisualStyleBackColor = True
+ '
+ 'CryConver
+ '
+ Me.CryConver.Location = New System.Drawing.Point(10, 51)
+ Me.CryConver.Name = "CryConver"
+ Me.CryConver.Size = New System.Drawing.Size(67, 20)
+ Me.CryConver.TabIndex = 15
+ '
+ 'Label18
+ '
+ Me.Label18.AutoSize = True
+ Me.Label18.Location = New System.Drawing.Point(7, 24)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(60, 13)
+ Me.Label18.TabIndex = 14
+ Me.Label18.Text = "Conversion"
+ '
+ 'Label17
+ '
+ Me.Label17.AutoSize = True
+ Me.Label17.Location = New System.Drawing.Point(80, 24)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(40, 13)
+ Me.Label17.TabIndex = 13
+ Me.Label17.Text = "Pointer"
+ '
'Button6
'
Me.Button6.Location = New System.Drawing.Point(83, 77)
@@ -1020,7 +1054,7 @@ Partial Class Pokemonedit
Me.GroupBox17.Controls.Add(Me.EvoPKMNames)
Me.GroupBox17.Location = New System.Drawing.Point(15, 96)
Me.GroupBox17.Name = "GroupBox17"
- Me.GroupBox17.Size = New System.Drawing.Size(571, 189)
+ Me.GroupBox17.Size = New System.Drawing.Size(571, 277)
Me.GroupBox17.TabIndex = 2
Me.GroupBox17.TabStop = False
Me.GroupBox17.Text = "Evolutions"
@@ -1482,40 +1516,6 @@ Partial Class Pokemonedit
Me.ProgressBar.TabIndex = 12
Me.ProgressBar.Visible = False
'
- 'Label17
- '
- Me.Label17.AutoSize = True
- Me.Label17.Location = New System.Drawing.Point(80, 24)
- Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(40, 13)
- Me.Label17.TabIndex = 13
- Me.Label17.Text = "Pointer"
- '
- 'Label18
- '
- Me.Label18.AutoSize = True
- Me.Label18.Location = New System.Drawing.Point(7, 24)
- Me.Label18.Name = "Label18"
- Me.Label18.Size = New System.Drawing.Size(60, 13)
- Me.Label18.TabIndex = 14
- Me.Label18.Text = "Conversion"
- '
- 'CryConver
- '
- Me.CryConver.Location = New System.Drawing.Point(10, 51)
- Me.CryConver.Name = "CryConver"
- Me.CryConver.Size = New System.Drawing.Size(67, 20)
- Me.CryConver.TabIndex = 15
- '
- 'Button13
- '
- Me.Button13.Location = New System.Drawing.Point(9, 77)
- Me.Button13.Name = "Button13"
- Me.Button13.Size = New System.Drawing.Size(68, 21)
- Me.Button13.TabIndex = 16
- Me.Button13.Text = "Save"
- Me.Button13.UseVisualStyleBackColor = True
- '
'Pokemonedit
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb
index cdb30f9..4514808 100644
--- a/GBAPokemonGameEditor/Pokemonedit.vb
+++ b/GBAPokemonGameEditor/Pokemonedit.vb
@@ -37,6 +37,30 @@ Public Class Pokemonedit
LoopVar = 0
+ EvoTypes.Items.Clear()
+
+ While LoopVar < (GetString(AppPath & "ini\roms.ini", header, "NumberOfEvolutionTypes", "") + 1) = True
+
+ EvoTypes.Items.Add(GetString(AppPath & "ini\roms.ini", header, "EvolutionName" & LoopVar, ""))
+
+ LoopVar = LoopVar + 1
+
+ End While
+
+ LoopVar = 0
+
+ EvoSlots.Items.Clear()
+
+ While LoopVar < (GetString(AppPath & "ini\roms.ini", header, "NumberOfEvolutionsPerPokemon", "")) = True
+
+ LoopVar = LoopVar + 1
+
+ EvoSlots.Items.Add("Evolution " & (LoopVar))
+
+ End While
+
+ LoopVar = 0
+
NewAt.Items.Clear()
While LoopVar < (GetString(AppPath & "ini\roms.ini", header, "NumberOfAttacks", "")) + 1 = True
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application
new file mode 100644
index 0000000..bcd31ee
--- /dev/null
+++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.application
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RDLRFVbbfh2hWkNukdzk13eKRss=
+
+
+
+
\ No newline at end of file
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe
new file mode 100644
index 0000000..f443805
Binary files /dev/null and b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe differ
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.config b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.config
new file mode 100644
index 0000000..3a327fa
--- /dev/null
+++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.config
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest
new file mode 100644
index 0000000..5129ddd
--- /dev/null
+++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.vshost.exe.manifest
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ERRn81naYSzZFeI/iJzK5j9PKZ0=
+
+
+
+
+
+
+
+
+
+ zmtMKrAEuvsQh2jJFtlCNruBIWE=
+
+
+
+
+
+
+
+
+ rPjxYWyVTxOTFNPtQSvhQ6KPzKY=
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini
index 13949d7..9904c75 100644
--- a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini
+++ b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini
@@ -167,6 +167,24 @@ IconPals=E966D8
JamboLearnableMovesTerm=0000FF
StartSearchingForSpaceOffset=800000
FreeSpaceSearchInterval=100
+NumberOfEvolutionsPerPokemon=5
+NumberOfEvolutionTypes=15
+EvolutionName0=None
+EvolutionName1=Happiness
+EvolutionName2=Happiness (Day)
+EvolutionName3=Happiness (Night)
+EvolutionName4=Level
+EvolutionName5=Trade
+EvolutionName6=Trade w/ Item
+EvolutionName7=Item
+EvolutionName8=Atk > Def
+EvolutionName9=Atk = Def
+EvolutionName10=Atk < Def
+EvolutionName11=High Personality
+EvolutionName12=Low Personality
+EvolutionName13=Allow Pokemon Creation
+EvolutionName14=Create Extra Pokemon
+EvolutionName15=Max Beauty
[AXPE]
ROMName=Pokémon Sapphire (English)
@@ -283,6 +301,24 @@ IconPals=E966D8
JamboLearnableMovesTerm=0000FF
StartSearchingForSpaceOffset=800000
FreeSpaceSearchInterval=100
+NumberOfEvolutionsPerPokemon=5
+NumberOfEvolutionTypes=15
+EvolutionName0=None
+EvolutionName1=Happiness
+EvolutionName2=Happiness (Day)
+EvolutionName3=Happiness (Night)
+EvolutionName4=Level
+EvolutionName5=Trade
+EvolutionName6=Trade w/ Item
+EvolutionName7=Item
+EvolutionName8=Atk > Def
+EvolutionName9=Atk = Def
+EvolutionName10=Atk < Def
+EvolutionName11=High Personality
+EvolutionName12=Low Personality
+EvolutionName13=Allow Pokemon Creation
+EvolutionName14=Create Extra Pokemon
+EvolutionName15=Max Beauty
[BPRE]
ROMName=Pokémon Fire Red (English)
@@ -415,6 +451,24 @@ JamboLearnableMovesTerm=0000FF
StartSearchingForSpaceOffset=800000
FreeSpaceSearchInterval=100
CryConversionTable=0
+NumberOfEvolutionsPerPokemon=5
+NumberOfEvolutionTypes=15
+EvolutionName0=None
+EvolutionName1=Happiness
+EvolutionName2=Happiness (Day)
+EvolutionName3=Happiness (Night)
+EvolutionName4=Level
+EvolutionName5=Trade
+EvolutionName6=Trade w/ Item
+EvolutionName7=Item
+EvolutionName8=Atk > Def
+EvolutionName9=Atk = Def
+EvolutionName10=Atk < Def
+EvolutionName11=High Personality
+EvolutionName12=Low Personality
+EvolutionName13=Allow Pokemon Creation
+EvolutionName14=Create Extra Pokemon
+EvolutionName15=Max Beauty
[BPGE]
ROMName=Pokémon Leaf Green (English)
ItemData=3DAE64
@@ -544,6 +598,24 @@ AttackAnimationTable=
JamboLearnableMovesTerm=0000FF
StartSearchingForSpaceOffset=800000
FreeSpaceSearchInterval=100
+NumberOfEvolutionsPerPokemon=5
+NumberOfEvolutionTypes=15
+EvolutionName0=None
+EvolutionName1=Happiness
+EvolutionName2=Happiness (Day)
+EvolutionName3=Happiness (Night)
+EvolutionName4=Level
+EvolutionName5=Trade
+EvolutionName6=Trade w/ Item
+EvolutionName7=Item
+EvolutionName8=Atk > Def
+EvolutionName9=Atk = Def
+EvolutionName10=Atk < Def
+EvolutionName11=High Personality
+EvolutionName12=Low Personality
+EvolutionName13=Allow Pokemon Creation
+EvolutionName14=Create Extra Pokemon
+EvolutionName15=Max Beauty
[BPEE]
ROMName=Pokémon Emerald (English)
@@ -760,6 +832,24 @@ ShadowBacks=1007320
JamboLearnableMovesTerm=0000FF
StartSearchingForSpaceOffset=E3CF64
FreeSpaceSearchInterval=100
+NumberOfEvolutionsPerPokemon=5
+NumberOfEvolutionTypes=15
+EvolutionName0=None
+EvolutionName1=Happiness
+EvolutionName2=Happiness (Day)
+EvolutionName3=Happiness (Night)
+EvolutionName4=Level
+EvolutionName5=Trade
+EvolutionName6=Trade w/ Item
+EvolutionName7=Item
+EvolutionName8=Atk > Def
+EvolutionName9=Atk = Def
+EvolutionName10=Atk < Def
+EvolutionName11=High Personality
+EvolutionName12=Low Personality
+EvolutionName13=Allow Pokemon Creation
+EvolutionName14=Create Extra Pokemon
+EvolutionName15=Max Beauty
[AXVF]
ROMName=Pokémon Rubis (Français)
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe
deleted file mode 100644
index a9e5564..0000000
Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe and /dev/null differ
diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
index 9add495..ebed2ea 100644
--- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
+++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt
@@ -119,6 +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\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\GBAPokemonGameEditor.exe
-C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\bin\Debug\GBAPokemonGameEditor.pdb
-C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.exe
diff --git a/README.md b/README.md
index 77fb015..1faa18c 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,10 @@ Windows XP support
Battle Frontier Editor
+Pokedex Editor
+
+Support for more than 5 evolutions per Pokemon
+
Planned Features
=================
@@ -37,14 +41,10 @@ Ability to add more Pokemon.
Add item editor.
-Add Pokedex Editor
-
Ability to add more attacks.
Support for more types
-support for more than 5 evolutions
-
Ability to define types.
Ability to define evolutions.
@@ -64,7 +64,7 @@ Windows RT: Have Jailbreak installed that allows unsigned programs.
Linux: Run with "Wine Windows Program Loader" and let it install the Mono runtime.
-Other opperating system may work if mono works on them.
+Other operating system may work if mono works on them.
Recommended Programs
====================
@@ -87,12 +87,6 @@ Developers
=================
Gamer2020
-diegoisawesome
-
-KurapikaET
-
-LocksmithArmy
-
Issues
=================
Running added programs on Linux not implemented yet.