diff --git a/GBAPokemonGameEditor.v12.suo b/GBAPokemonGameEditor.v12.suo index 11ff174..4574efd 100644 Binary files a/GBAPokemonGameEditor.v12.suo and b/GBAPokemonGameEditor.v12.suo differ diff --git a/GBAPokemonGameEditor/Pokemonedit.vb b/GBAPokemonGameEditor/Pokemonedit.vb index 919d7f0..2a99f17 100644 --- a/GBAPokemonGameEditor/Pokemonedit.vb +++ b/GBAPokemonGameEditor/Pokemonedit.vb @@ -73,6 +73,16 @@ Public Class Pokemonedit End While + + LoopVar = 0 + + While LoopVar < (GetString(GetINIFileLocation(), header, "NumberOfMapLabels", "")) + + ComboBox2.Items.Add(GetMapLabelName(LoopVar)) + + LoopVar = LoopVar + 1 + End While + LoopVar = 0 NewAt.Items.Clear() diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application index c260746..b9c169d 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - HRcq8rOzbSIVhHvapYVkF0nBNPzACTmvIs+9eh14z54= + rO+iiZR0DLnOusrOWO/lvyGiewUNoZwa3wggdBO/bdo= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe index b120bd1..a645c42 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest index 8b9e471..c1062ea 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.exe.manifest @@ -50,7 +50,7 @@ - MXFTcbu1bYgl0HPPg8JqiFNP/3iv6Fh+X1yt7V4vmFU= + RwSbCMu//gorFOFWqaU2hjZ/714CFkT4XB2CGm9v7LQ= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb index b4d78b6..34b3e15 100644 Binary files a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.pdb differ diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application index c260746..b9c169d 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.application @@ -16,7 +16,7 @@ - HRcq8rOzbSIVhHvapYVkF0nBNPzACTmvIs+9eh14z54= + rO+iiZR0DLnOusrOWO/lvyGiewUNoZwa3wggdBO/bdo= diff --git a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest index 8b9e471..c1062ea 100644 --- a/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest +++ b/GBAPokemonGameEditor/bin/Debug/PokemonGameEditor.vshost.exe.manifest @@ -50,7 +50,7 @@ - MXFTcbu1bYgl0HPPg8JqiFNP/3iv6Fh+X1yt7V4vmFU= + RwSbCMu//gorFOFWqaU2hjZ/714CFkT4XB2CGm9v7LQ= diff --git a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini index b245f4f..bdcaffc 100644 --- a/GBAPokemonGameEditor/bin/Debug/ini/roms.ini +++ b/GBAPokemonGameEditor/bin/Debug/ini/roms.ini @@ -1009,12 +1009,40 @@ Evolution12Param=level Evolution13Param=evolvesbutnoparms Evolution14Param=level Evolution15Param=evolvesbasedonvalue +EvolutionName16=Knows Move +Evolution16Param=attack +EvolutionName17=In certain map +Evolution17Param=mapname +EvolutionName18=Level-up at day +Evolution18Param=level +EvolutionName19=Level-up at night +Evolution19Param=level +EvolutionName20=Holding item at day +Evolution20Param=item +EvolutionName21=Holding item at night +Evolution21Param=item +EvolutionName22=Level-up if male +Evolution22Param=level +EvolutionName23=Level-up if female +Evolution23Param=level +EvolutionName24=Level-up if raining +Evolution24Param=level +EvolutionName25=Specific Pokemon in party +Evolution25Param=species +EvolutionName26=Level-up if pokemon with type in party +Evolution26Param=bankandmap +EvolutionName27=Using item if male +Evolution27Param=item +EvolutionName28=Using item if female +Evolution28Param=item EvolutionName252=Wish Mega Evolution Evolution252Param=attack EvolutionName251=Mega Evolution Evolution251Param=item EvolutionName255=Revert Megas Evolution255Param=evolvesbutnoparms +EvolutionName253=Primal Reversion +Evolution253Param=evolvesbasedonvalue EggMoveTable=32ADD8 EggMoveTableLimiter=70464 TrainerTable=310030 diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application index c260746..b9c169d 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.application @@ -16,7 +16,7 @@ - HRcq8rOzbSIVhHvapYVkF0nBNPzACTmvIs+9eh14z54= + rO+iiZR0DLnOusrOWO/lvyGiewUNoZwa3wggdBO/bdo= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe index b120bd1..a645c42 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe differ diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest index 8b9e471..c1062ea 100644 --- a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest +++ b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.exe.manifest @@ -50,7 +50,7 @@ - MXFTcbu1bYgl0HPPg8JqiFNP/3iv6Fh+X1yt7V4vmFU= + RwSbCMu//gorFOFWqaU2hjZ/714CFkT4XB2CGm9v7LQ= diff --git a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb index b4d78b6..34b3e15 100644 Binary files a/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb and b/GBAPokemonGameEditor/obj/x86/Debug/PokemonGameEditor.pdb differ