diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo index b97496e..ea675bc 100644 Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ diff --git a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj index 8d121ad..3ba4040 100644 --- a/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj +++ b/GBAPokemonGameEditor/GBAPokemonGameEditor.vbproj @@ -31,7 +31,7 @@ true publish.htm 0 - 3.0.0.0 + 3.1.0.0 false true true diff --git a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb index d9e10c8..9aa1be0 100644 --- a/GBAPokemonGameEditor/My Project/AssemblyInfo.vb +++ b/GBAPokemonGameEditor/My Project/AssemblyInfo.vb @@ -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 0178de4..0733ae5 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - ZZ6LzY9dJb3a34C2asv2Qkum844= + iO+gTkzBbYndZvrlLV45EgRbGm4= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe index 41b261f..237dcd6 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 9d08c35..52e2d41 100644 --- a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.exe.manifest @@ -1,10 +1,10 @@  - + - + @@ -43,14 +43,14 @@ - - + + - UOfDHKW1DvT8r/hqEJenX1+hHjY= + vhpOo2zSI5pIT1e8M3ZUQuDa+YM= diff --git a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb index 7f1ee4b..57b8e6d 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/GBAPokemonGameEditor.pdb differ diff --git a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini index eb3353a..15a5da7 100644 --- a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini +++ b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini @@ -482,7 +482,7 @@ IconPals=3D3740 JamboLearnableMovesTerm=0000FF StartSearchingForSpaceOffset=800000 FreeSpaceSearchInterval=100 -CryConversionTable=0 +CryConversionTable=2539D4 NumberOfEvolutionsPerPokemon=5 NumberOfEvolutionTypes=15 EvolutionName0=None diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.JamboHackEvos.resources b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.JamboHackEvos.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.JamboHackEvos.resources and /dev/null differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application index 0178de4..0733ae5 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.application @@ -1,6 +1,6 @@  - + @@ -10,13 +10,13 @@ - + - ZZ6LzY9dJb3a34C2asv2Qkum844= + iO+gTkzBbYndZvrlLV45EgRbGm4= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.exe index 41b261f..237dcd6 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 9d08c35..52e2d41 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 @@ - - + + - UOfDHKW1DvT8r/hqEJenX1+hHjY= + vhpOo2zSI5pIT1e8M3ZUQuDa+YM= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.pdb index 7f1ee4b..57b8e6d 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.FileListAbsolute.txt b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt index c337304..a9ec768 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt +++ b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.FileListAbsolute.txt @@ -131,7 +131,6 @@ C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x8 C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.AttackEditor.resources C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.BattleFrontierEditor.resources C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.InputAttacks.resources -C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.JamboHackEvos.resources C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.MainFrm.resources C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.movetutor2.resources C:\Users\JOSEWORK\Documents\GitHub\PokemonGameEditor\GBAPokemonGameEditor\obj\x86\Debug\GBAPokemonGameEditor.Resources.resources diff --git a/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache b/GBAPokemonGameEditor/obj/x86/Debug/GBAPokemonGameEditor.vbproj.GenerateResource.Cache index 51d7b6f..2ea22c6 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 13949d7..15a5da7 100644 --- a/roms.ini +++ b/roms.ini @@ -167,6 +167,40 @@ 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 +Evolution0Param=none +Evolution1Param=evolvesbutnoparms +Evolution2Param=evolvesbutnoparms +Evolution3Param=evolvesbutnoparms +Evolution4Param=level +Evolution5Param=evolvesbutnoparms +Evolution6Param=item +Evolution7Param=item +Evolution8Param=level +Evolution9Param=level +Evolution10Param=level +Evolution11Param=level +Evolution12Param=level +Evolution13Param=evolvesbutnoparms +Evolution14Param=level +Evolution15Param=evolvesbutnoparms [AXPE] ROMName=Pokémon Sapphire (English) @@ -283,6 +317,40 @@ 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 +Evolution0Param=none +Evolution1Param=evolvesbutnoparms +Evolution2Param=evolvesbutnoparms +Evolution3Param=evolvesbutnoparms +Evolution4Param=level +Evolution5Param=evolvesbutnoparms +Evolution6Param=item +Evolution7Param=item +Evolution8Param=level +Evolution9Param=level +Evolution10Param=level +Evolution11Param=level +Evolution12Param=level +Evolution13Param=evolvesbutnoparms +Evolution14Param=level +Evolution15Param=evolvesbutnoparms [BPRE] ROMName=Pokémon Fire Red (English) @@ -414,7 +482,41 @@ IconPals=3D3740 JamboLearnableMovesTerm=0000FF StartSearchingForSpaceOffset=800000 FreeSpaceSearchInterval=100 -CryConversionTable=0 +CryConversionTable=2539D4 +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 +Evolution0Param=none +Evolution1Param=evolvesbutnoparms +Evolution2Param=evolvesbutnoparms +Evolution3Param=evolvesbutnoparms +Evolution4Param=level +Evolution5Param=evolvesbutnoparms +Evolution6Param=item +Evolution7Param=item +Evolution8Param=level +Evolution9Param=level +Evolution10Param=level +Evolution11Param=level +Evolution12Param=level +Evolution13Param=evolvesbutnoparms +Evolution14Param=level +Evolution15Param=evolvesbutnoparms [BPGE] ROMName=Pokémon Leaf Green (English) ItemData=3DAE64 @@ -544,6 +646,40 @@ 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 +Evolution0Param=none +Evolution1Param=evolvesbutnoparms +Evolution2Param=evolvesbutnoparms +Evolution3Param=evolvesbutnoparms +Evolution4Param=level +Evolution5Param=evolvesbutnoparms +Evolution6Param=item +Evolution7Param=item +Evolution8Param=level +Evolution9Param=level +Evolution10Param=level +Evolution11Param=level +Evolution12Param=level +Evolution13Param=evolvesbutnoparms +Evolution14Param=level +Evolution15Param=evolvesbutnoparms [BPEE] ROMName=Pokémon Emerald (English) @@ -760,6 +896,40 @@ 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 +Evolution0Param=none +Evolution1Param=evolvesbutnoparms +Evolution2Param=evolvesbutnoparms +Evolution3Param=evolvesbutnoparms +Evolution4Param=level +Evolution5Param=evolvesbutnoparms +Evolution6Param=item +Evolution7Param=item +Evolution8Param=level +Evolution9Param=level +Evolution10Param=level +Evolution11Param=level +Evolution12Param=level +Evolution13Param=evolvesbutnoparms +Evolution14Param=level +Evolution15Param=evolvesbutnoparms [AXVF] ROMName=Pokémon Rubis (Français)