diff --git a/.gitignore b/.gitignore
index 5fd51c129..bb0e3d8cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -313,6 +313,7 @@ p3d/**/*.xnb
 p3d/ContentPacks/
 p3d/GameModes/
 p3d/save/
+p3d/screenshots/
 p3d/log.dat
 
 # include lib/build
diff --git a/P3D/Content/Data/Scripts/ecruteak/suicune_encounter.dat b/P3D/Content/Data/Scripts/ecruteak/suicune_encounter.dat
index 55d71ea8c..07cc98f66 100644
Binary files a/P3D/Content/Data/Scripts/ecruteak/suicune_encounter.dat and b/P3D/Content/Data/Scripts/ecruteak/suicune_encounter.dat differ
diff --git a/P3D/Content/Data/Scripts/quest/sdance.dat b/P3D/Content/Data/Scripts/quest/sdance.dat
index 231f99792..75f495042 100644
Binary files a/P3D/Content/Data/Scripts/quest/sdance.dat and b/P3D/Content/Data/Scripts/quest/sdance.dat differ
diff --git a/P3D/Content/Data/Scripts/rival/rival_azalea/startscript.dat b/P3D/Content/Data/Scripts/rival/rival_azalea/startscript.dat
index 846681777..24b53ff90 100644
Binary files a/P3D/Content/Data/Scripts/rival/rival_azalea/startscript.dat and b/P3D/Content/Data/Scripts/rival/rival_azalea/startscript.dat differ
diff --git a/P3D/Content/Data/Scripts/speedboatscene.dat b/P3D/Content/Data/Scripts/speedboatscene.dat
index eac0d156a..827bfb2bd 100644
Binary files a/P3D/Content/Data/Scripts/speedboatscene.dat and b/P3D/Content/Data/Scripts/speedboatscene.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/league/lance.dat b/P3D/Content/Data/Scripts/trainer/league/lance.dat
index c880ded19..87ab87f4a 100644
Binary files a/P3D/Content/Data/Scripts/trainer/league/lance.dat and b/P3D/Content/Data/Scripts/trainer/league/lance.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/route25/000.dat b/P3D/Content/Data/Scripts/trainer/route25/000.dat
index a902d9a2d..565d1df51 100644
Binary files a/P3D/Content/Data/Scripts/trainer/route25/000.dat and b/P3D/Content/Data/Scripts/trainer/route25/000.dat differ
diff --git a/P3D/Content/Data/maps/quest/dock.dat b/P3D/Content/Data/maps/quest/dock.dat
index 2e201c8a4..4d00769c5 100644
--- a/P3D/Content/Data/maps/quest/dock.dat
+++ b/P3D/Content/Data/maps/quest/dock.dat
@@ -11,7 +11,7 @@ Water:
 {"EntityField"{ENT[{"EntityID"{str[Water]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,16,16,16][144,16,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[3]}}{"Position"{sngArr[0,-0.25,3]}}{"Size"{intArr[15,12]}}]}}
 
 Warp:
-{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[5,0,-1]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[80,64,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[sevii\knot\main.dat,13,0.1,19,0]}}{"Rotation"{int[0]}}]}}
+{"Entity"{ENT[{"EntityID"{str[WarpBlock]}}{"Position"{sngArr[5,0,-1]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[80,64,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[quest\town.dat,16,0.1,15,0]}}{"Rotation"{int[0]}}]}}
 
 Walls:
 {"EntityField"{ENT[{"Fill"{bool[0]}}{"Size"{intArr[17,13]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[-1,0,-2]}}{"TexturePath"{str[Gym]}}{"Textures"{recArr[[0,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
@@ -29,8 +29,5 @@ Fences:
 {"EntityField"{ENT[{"Size"{intArr[9,1]}}{"Scale"{sngArr[0.2,0.5,0.2]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[6.25,-0.25,2]}}{"TexturePath"{str[Lavender]}}{"Textures"{recArr[[48,32,4,10][52,32,4,4]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
 NPCs:
-{"NPC"{NPC[{"Position"{sngArr[5,0,0]}}{"TextureID"{str[darkfire]}}{"ID"{int[10]}}{"Name"{str[GymGuy]}}{"Action"{int[0]}}{"AdditionalValue"{str[Soon...]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[6,0,0]}}{"TextureID"{str[[POKEMON|S]6]}}{"ID"{int[11]}}{"Name"{str[GymGuy]}}{"Action"{int[0]}}{"AdditionalValue"{str[Char!]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-
 {"NPC"{NPC[{"Position"{sngArr[5,0,2]}}{"TextureID"{str[32]}}{"ID"{int[0]}}{"Name"{str[GymGuy]}}{"Action"{int[1]}}{"AdditionalValue"{str[sevii\quest\dockguy]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"ID"{int[0]}}{"Scale"{sngArr[1,1,1]}}{"EntityID"{str[ModelEntity]}}{"Position"{sngArr[6,-0.6,5.2]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[96,0,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[models\boat2\boat]}}{"Rotation"{int[2]}}]}}
diff --git a/P3D/Content/Data/maps/quest/tanoby/key.dat b/P3D/Content/Data/maps/quest/tanoby/key.dat
index 54e58da89..c8afb22c4 100644
--- a/P3D/Content/Data/maps/quest/tanoby/key.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/key.dat
@@ -78,13 +78,13 @@ Boulders:
 {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Scale"{sngArr[0.8,0.8,0.8]}}{"EntityID"{str[WallBill]}}{"Position"{sngArr[5,-0.15,5]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[48,48,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[3]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
 StrengthTriggers:
-{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[3,0,0]}}{"ID"{int[10]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
-{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[0,0,2]}}{"ID"{int[11]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
-{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[6,0,2]}}{"ID"{int[12]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
-{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[1,0,4]}}{"ID"{int[13]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
-{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[1,0,6]}}{"ID"{int[14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
-{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[5,0,4]}}{"ID"{int[15]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
-{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[5,0,6]}}{"ID"{int[16]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
+{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[3,0,0]}}{"ID"{int[10]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
+{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[0,0,2]}}{"ID"{int[11]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
+{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[6,0,2]}}{"ID"{int[12]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
+{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[1,0,4]}}{"ID"{int[13]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
+{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[1,0,6]}}{"ID"{int[14]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
+{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[5,0,4]}}{"ID"{int[15]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
+{"Entity"{ENT[{"EntityID"{str[StrengthTrigger]}}{"Position"{sngArr[5,0,6]}}{"ID"{int[16]}}{"TexturePath"{str[sevii]}}{"Textures"{recArr[[112,0,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[0,0,quest\tanoby\rock]}}{"Rotation"{int[0]}}{"Visible"{bool[1]}}]}}
 
 StrengthRocks:
 {"Entity"{ENT[{"Scale"{sngArr[0.7,0.4,0.7]}}{"ID"{int[0]}}{"EntityID"{str[StrengthRock]}}{"Position"{sngArr[2,-0.3,4]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[224,77,13,7][224,64,13,13]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/main.dat b/P3D/Content/Data/maps/quest/trainertower/main.dat
index 3761aabf3..d3ddbb9ea 100644
--- a/P3D/Content/Data/maps/quest/trainertower/main.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/main.dat
@@ -442,6 +442,9 @@ Corners:
 NPC:
 {"NPC"{NPC[{"Position"{sngArr[12,0,30]}}{"TextureID"{str[29]}}{"ID"{int[0]}}{"Name"{str[IDlotto]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\outside\002]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
 {"NPC"{NPC[{"Position"{sngArr[12,1,33]}}{"TextureID"{str[29]}}{"ID"{int[1]}}{"Name"{str[IDlotto]}}{"Action"{int[2]}}{"AdditionalValue"{str[2|trainer\quest\tower\outside\001]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[16,10,3,2]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[14,0,10]}}{"TextureID"{str[darkfire]}}{"ID"{int[10]}}{"Name"{str[GymGuy]}}{"Action"{int[0]}}{"AdditionalValue"{str[Soon...]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[15,0,10]}}{"TextureID"{str[[POKEMON|S]6]}}{"ID"{int[11]}}{"Name"{str[GymGuy]}}{"Action"{int[0]}}{"AdditionalValue"{str[Char!]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+
 
 Signs:
 {"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[12,0,10]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[16,32,16,16][32,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[Trainer Tower Ahead]}}{"Rotation"{int[0]}}]}}