diff --git a/2.5DHero/2.5DHero/2.5DHero.vbproj b/2.5DHero/2.5DHero/2.5DHero.vbproj index 8d41fe89f..dd7252a10 100644 --- a/2.5DHero/2.5DHero/2.5DHero.vbproj +++ b/2.5DHero/2.5DHero/2.5DHero.vbproj @@ -1854,9 +1854,21 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + PreserveNewest + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -1871,6 +1883,15 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest diff --git a/2.5DHero/2.5DHero/Content/Pokemon/Data/666.dat b/2.5DHero/2.5DHero/Content/Pokemon/Data/666.dat index 8012ffca6..db43efd21 100644 --- a/2.5DHero/2.5DHero/Content/Pokemon/Data/666.dat +++ b/2.5DHero/2.5DHero/Content/Pokemon/Data/666.dat @@ -1,4 +1,4 @@ -Name|Scatterbug +Name|Vivillon Number|666 ExperienceType|1 BaseExperience|185 diff --git a/2.5DHero/2.5DHero/Content/Pokemon/Data/689.dat b/2.5DHero/2.5DHero/Content/Pokemon/Data/689.dat index c1fe096b3..921a60519 100644 --- a/2.5DHero/2.5DHero/Content/Pokemon/Data/689.dat +++ b/2.5DHero/2.5DHero/Content/Pokemon/Data/689.dat @@ -56,4 +56,4 @@ Move|55,238 Move|60,444 Move|65,130 TradeValue|50 -EvolutionCondition|689,level,39,level + diff --git a/2.5DHero/2.5DHero/Content/Pokemon/Data/690.dat b/2.5DHero/2.5DHero/Content/Pokemon/Data/690.dat new file mode 100644 index 000000000..85daf64db --- /dev/null +++ b/2.5DHero/2.5DHero/Content/Pokemon/Data/690.dat @@ -0,0 +1,56 @@ +Name|Skrelp +Number|690 +ExperienceType|1 +BaseExperience|64 +Type1|Poison +Type2|Water +CatchRate|225 +BaseFriendship|70 +EggGroup1|Water1 +EggGroup2|Dragon +BaseEggSteps|5525 +EggPokemon|690 +IsGenderLess|0 +CanBreed|1 +Devolution|0 +IsMale|50 +Ability1|38 +Ability2|143 +HiddenAbility|91 +EggMoves|151,390,114,583,599 +Machines|92,237,182,240,258,474,85,218,216,247,104,482,188,156,263,213,496,503,207,214,164,290,590,57,127,291,401,340,406,441,196,231,200,351,173 +TutorMoves|401,340,406,441,196,231,200,351,173 +BaseHP|50 +BaseAttack|60 +BaseDefense|60 +BaseSpAttack|60 +BaseSpDefense|60 +BaseSpeed|30 +FPHP|0 +FPAttack|0 +FPDefense|0 +FPSpAttack|0 +FPSpDefense|1 +FPSpeed|0 +CanFly|0 +CanSwim|1 +Pokedex|Camouflaged as rotten kelp, they spray liquid poison on prey that approaches unawares and then finish it off.\Mock Kelp Pokémon\7.3\0.5\0,148,0 +Scale|1.0 +Move|1,33 +Move|1,108 +Move|1,55 +Move|5,185 +Move|9,39 +Move|12,145 +Move|15,51 +Move|19,293 +Move|23,342 +Move|25,352 +Move|28,104 +Move|32,92 +Move|35,401 +Move|38,188 +Move|42,56 +Move|49,406 +TradeValue|45 +EvolutionCondition|691,level,48,level diff --git a/2.5DHero/2.5DHero/Content/Pokemon/Data/691.dat b/2.5DHero/2.5DHero/Content/Pokemon/Data/691.dat new file mode 100644 index 000000000..e6b58ae76 --- /dev/null +++ b/2.5DHero/2.5DHero/Content/Pokemon/Data/691.dat @@ -0,0 +1,59 @@ +Name|Dragalge +Number|691 +ExperienceType|1 +BaseExperience|173 +Type1|Poison +Type2|Dragon +CatchRate|55 +BaseFriendship|70 +EggGroup1|Water1 +EggGroup2|Dragon +BaseEggSteps|5525 +EggPokemon|690 +IsGenderLess|0 +CanBreed|1 +Devolution|690 +IsMale|50 +Ability1|38 +Ability2|143 +HiddenAbility|91 +EggMoves|151,390,114,583,599 +Machines|63,87,411,525,416,92,237,182,240,258,474,85,218,216,247,104,482,188,156,263,213,496,503,207,214,164,290,590,57,127,291,401,340,434,406,441,196,231,200,351,173,352 +TutorMoves|401,340,434,406,441,196,231,200,351,173,352 +BaseHP|65 +BaseAttack|75 +BaseDefense|90 +BaseSpAttack|97 +BaseSpDefense|123 +BaseSpeed|44 +FPHP|0 +FPAttack|0 +FPDefense|0 +FPSpAttack|0 +FPSpDefense|2 +FPSpeed|0 +CanFly|0 +CanSwim|1 +Pokedex|Tales are told of ships that wander into seas where Dragalge live, never to return.\Mock Kelp Pokémon\81.5\1.8\0,148,0 +Scale|1.1 +Move|1,525 +Move|1,239 +Move|1,33 +Move|1,108 +Move|1,55 +Move|5,185 +Move|9,39 +Move|12,145 +Move|15,51 +Move|19,293 +Move|23,342 +Move|25,352 +Move|28,104 +Move|32,92 +Move|35,401 +Move|38,188 +Move|42,56 +Move|53,406 +Move|59,525 +Move|67,239 +TradeValue|65 diff --git a/2.5DHero/2.5DHero/Content/Pokemon/Data/692.dat b/2.5DHero/2.5DHero/Content/Pokemon/Data/692.dat new file mode 100644 index 000000000..c74166b42 --- /dev/null +++ b/2.5DHero/2.5DHero/Content/Pokemon/Data/692.dat @@ -0,0 +1,53 @@ +Name|Clauncher +Number|692 +ExperienceType|3 +BaseExperience|66 +Type1|Water +Type2| +CatchRate|225 +BaseFriendship|70 +EggGroup1|Water1 +EggGroup2|Water3 +BaseEggSteps|4240 +EggPokemon|692 +IsGenderLess|0 +CanBreed|1 +Devolution|0 +IsMale|50 +Ability1|178 +Ability2|Nothing +HiddenAbility|Nothing +EggMoves|453,152,203,494 +Machines|92,474,237,58,182,240,218,479,216,247,104,482,188,263,156,213,496,411,503,416,14,157,207,214,369,164,430,399,290,590,15,57,127,291,401,340,406,270,196,231,173,352 +TutorMoves|401,340,406,270,196,231,173,352 +BaseHP|50 +BaseAttack|53 +BaseDefense|62 +BaseSpAttack|58 +BaseSpDefense|63 +BaseSpeed|44 +FPHP|0 +FPAttack|0 +FPDefense|0 +FPSpAttack|1 +FPSpDefense|0 +FPSpeed|0 +CanFly|0 +CanSwim|1 +Pokedex|Through controlled expulsions of internal gas, it can expel water like a pistol shot. At close distances, it can shatter rock.\Water Gun Pokémon\8.3\0.5\0,148,0 +Scale|0.9 +Move|1,150 +Move|1,55 +Move|7,346 +Move|9,11 +Move|12,145 +Move|16,175 +Move|20,61 +Move|25,14 +Move|30,152 +Move|34,352 +Move|39,479 +Move|43,453 +Move|48,330 +TradeValue|25 +EvolutionCondition|693,Level,37,Level diff --git a/2.5DHero/2.5DHero/Content/Pokemon/Data/693.dat b/2.5DHero/2.5DHero/Content/Pokemon/Data/693.dat new file mode 100644 index 000000000..c3926ecb1 --- /dev/null +++ b/2.5DHero/2.5DHero/Content/Pokemon/Data/693.dat @@ -0,0 +1,59 @@ +Name|Clawitzer +Number|693 +ExperienceType|3 +BaseExperience|100 +Type1|Water +Type2| +CatchRate|55 +BaseFriendship|70 +EggGroup1|Water1 +EggGroup2|Water3 +BaseEggSteps|4240 +EggPokemon|692 +IsGenderLess|0 +CanBreed|1 +Devolution|692 +IsMale|50 +Ability1|178 +Ability2|Nothing +HiddenAbility|Nothing +EggMoves|453,152,203,494 +Machines|92,474,237,58,182,240,218,479,216,104,482,188,263,156,213,496,503,14,157,207,214,369,164,430,290,590,15,57,127,291,401,340,406,270,196,231,173,352 +TutorMoves|401,340,406,270,196,231,173,352 +BaseHP|71 +BaseAttack|73 +BaseDefense|88 +BaseSpAttack|120 +BaseSpDefense|89 +BaseSpeed|59 +FPHP|0 +FPAttack|0 +FPDefense|0 +FPSpAttack|2 +FPSpDefense|0 +FPSpeed|0 +CanFly|0 +CanSwim|1 +Pokedex|By expelling water from the nozzle in the back of its claw, it can move at a speed of 60 knots.\Howitzer Pokémon\35.3\1.3\0,148,0 +Scale|1 +Move|1,505 +Move|1,399 +Move|1,406 +Move|1,396 +Move|1,150 +Move|1,55 +Move|7,346 +Move|9,11 +Move|12,145 +Move|16,175 +Move|20,61 +Move|25,14 +Move|30,152 +Move|34,352 +Move|42,479 +Move|47,453 +Move|53,330 +Move|57,399 +Move|63,406 +Move|67,396 +TradeValue|50 diff --git a/2.5DHero/2.5DHero/Content/Pokemon/Data/704.dat b/2.5DHero/2.5DHero/Content/Pokemon/Data/704.dat new file mode 100644 index 000000000..5026e6c74 --- /dev/null +++ b/2.5DHero/2.5DHero/Content/Pokemon/Data/704.dat @@ -0,0 +1,51 @@ +Name|Goomy +Number|704 +ExperienceType|3 +BaseExperience|60 +Type1|Dragon +Type2| +CatchRate|45 +BaseFriendship|35 +EggGroup1|Dragon +EggGroup2|None +BaseEggSteps|10665 +EggPokemon|704 +IsGenderLess|0 +CanBreed|1 +Devolution|0 +IsMale|50 +Ability1|157 +Ability2|93 +HiddenAbility|183 +EggMoves|151,68,174,203,231,342 +Machines|92,237,241,182,240,218,85,216,104,188,482,263,156,213,496,157,611,214,207,164,290,590,434,406,231,200,351,173,352 +TutorMoves|434,406,231,200,351,173,352 +BaseHP|45 +BaseAttack|50 +BaseDefense|35 +BaseSpAttack|55 +BaseSpDefense|75 +BaseSpeed|40 +FPHP|0 +FPAttack|0 +FPDefense|0 +FPSpAttack|0 +FPSpDefense|1 +FPSpeed|0 +CanFly|0 +CanSwim|0 +Pokedex|It's covered in a slimy membrane that makes any punches or kicks slide off it harmlessly.\Soft Tissue Pokémon\2.8\0.3\0,148,0 +Scale|0.9 +Move|1,33 +Move|1,145 +Move|5,71 +Move|9,182 +Move|13,117 +Move|18,225 +Move|25,240 +Move|28,175 +Move|32,34 +Move|38,330 +Move|42,406 +TradeValue|40 +EvolutionCondition|705,Level,40,Level diff --git a/2.5DHero/2.5DHero/Content/Pokemon/Data/705.dat b/2.5DHero/2.5DHero/Content/Pokemon/Data/705.dat new file mode 100644 index 000000000..442f84a7c --- /dev/null +++ b/2.5DHero/2.5DHero/Content/Pokemon/Data/705.dat @@ -0,0 +1,51 @@ +Name|Sliggoo +Number|705 +ExperienceType|3 +BaseExperience|158 +Type1|Dragon +Type2| +CatchRate|45 +BaseFriendship|35 +EggGroup1|Dragon +EggGroup2|None +BaseEggSteps|10665 +EggPokemon|704 +IsGenderLess|0 +CanBreed|1 +Devolution|704 +IsMale|50 +Ability1|157 +Ability2|93 +HiddenAbility|183 +EggMoves|151,68,174,203,231,342 +Machines|92,237,241,182,240,218,85,216,104,188,482,263,156,213,496,157,611,214,207,164,290,590,434,406,231,200,351,173,352 +TutorMoves|434,406,231,200,351,173,352 +BaseHP|68 +BaseAttack|75 +BaseDefense|53 +BaseSpAttack|83 +BaseSpDefense|113 +BaseSpeed|60 +FPHP|0 +FPAttack|0 +FPDefense|0 +FPSpAttack|0 +FPSpDefense|2 +FPSpeed|0 +CanFly|0 +CanSwim|0 +Pokedex|Its four horns are a high-performance radar system. It uses them to sense sounds and smells, rather than using ears or a nose.\Soft Tissue Pokémon\17.5\0.8\0,148,0 +Scale|1 +Move|1,33 +Move|1,145 +Move|5,71 +Move|9,182 +Move|13,117 +Move|18,225 +Move|25,240 +Move|28,175 +Move|32,34 +Move|38,330 +Move|47,406 +TradeValue|60 +EvolutionCondition|706,Level,50,Level \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Content/Pokemon/Data/706.dat b/2.5DHero/2.5DHero/Content/Pokemon/Data/706.dat new file mode 100644 index 000000000..aaa995ec4 --- /dev/null +++ b/2.5DHero/2.5DHero/Content/Pokemon/Data/706.dat @@ -0,0 +1,55 @@ +Name|Goodra +Number|706 +ExperienceType|3 +BaseExperience|270 +Type1|Dragon +Type2|None +CatchRate|45 +BaseFriendship|35 +EggGroup1|Dragon +EggGroup2| +BaseEggSteps|10665 +EggPokemon|704 +IsGenderLess|0 +CanBreed|1 +Devolution|705 +IsMale|50 +Ability1|157 +Ability2|93 +HiddenAbility|183 +EggMoves|151,68,174,203,231,342 +Machines|92,258,237,241,58,59,63,182,240,218,85,87,89,216,104,188,482,53,126,263,156,213,496,411,510,416,523,157,525,249,70,611,214,207,164,290,590,401,434,406,7,264,276,9,231,200,351,173,352 +TutorMoves|401,434,406,7,264,276,9,231,200,351,173,352 +BaseHP|90 +BaseAttack|100 +BaseDefense|70 +BaseSpAttack|110 +BaseSpDefense|150 +BaseSpeed|80 +FPHP|0 +FPAttack|0 +FPDefense|0 +FPSpAttack|0 +FPSpDefense|3 +FPSpeed|0 +CanFly|0 +CanSwim|0 +Pokedex|It attacks with retractable horns. It throws a punch that's the equivalent of the force of a hundred pro boxers.\Dragon Pokémon\150.5\2.0\0,148,0 +Scale|1.2 +Move|1,200 +Move|1,364 +Move|1,33 +Move|1,145 +Move|5,71 +Move|9,182 +Move|13,117 +Move|18,225 +Move|25,240 +Move|28,175 +Move|32,34 +Move|38,330 +Move|47,401 +Move|50,406 +Move|55,438 +Move|63,200 +TradeValue|75