Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

P3D/Content/Data/Scripts/trainer/quest/tanoby/002.trainer

@@ -4,7 +4,7 @@ TrainerClass|Gentleman
 Money|3888
 IntroMessage|Today, in addition to our~lesson, we came to see~the chamber.
 OutroMessage|My, how extraordinary.
-DefeatMessage|Ah, so you are studying~Pokémon on your own...*Yes, you certainly are quite the~extraordinary person, indeed.
+DefeatMessage|Ah, so you are studying~Pokémon on your own...*Yes, you certainly are quite~the extraordinary person,~indeed.
 TextureID|oldhatman
 Region|Sevii Islands
 IniMusic|johto_trainer_intro

P3D/Content/Data/maps/poke/fortune/patternbush/main.poke

@@ -7,5 +7,5 @@ type=Grassland
 {0|165|30|1,2,3|15,18}
 {0|167|30|0|15,18}
 {0|214|20|-1|22,25}
-(0|588|5|-1|17,19)
+{0|588|5|-1|17,19}
-(0|616|5|-1|17,19)
+{0|616|5|-1|17,19}

P3D/Content/Data/maps/quest/sevault.dat

@@ -857,7 +857,7 @@ Items:
 {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[17,1.625,22]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,36]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}}
 {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[7,1.625,38]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[1,21]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}}
 {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[18,3.625,45]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[2,82]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}}
-{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[125,1.625,62]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[3,2000]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}}
+{"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[15,1.625,66]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[1]}}{"AdditionalValue"{str[3,2000]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.25,0.25,0.25]}}]}}
 
 Mega Stone:
 {"Entity"{ENT[{"EntityID"{str[ItemObject]}}{"Position"{sngArr[16,3.8,44]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[192,16,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[2]}}{"AdditionalValue"{str[4,509]}}{"Rotation"{int[0]}}{"Scale"{sngArr[0.3,0.3,0.3]}}]}}

P3D/Content/Pokemon/Data/511.dat

@@ -52,6 +52,6 @@ Move|37,278
 Move|40,363
 Move|43,242
 TradeValue|15
-Item|5,20035
+Item|5,2035
 Item|50,2006
 EvolutionCondition|512,item,34,item

P3D/P3D.vbproj

@@ -13642,6 +13642,9 @@
     <Content Include="Content\Textures\NPC\Kratos.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\NPC\Green.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\NPC\Segis.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>