diff --git a/P3D/Content/Data/Scripts/dungeon/blue.dat b/P3D/Content/Data/Scripts/dungeon/blue.dat
index b366637dc..cf251bf78 100644
Binary files a/P3D/Content/Data/Scripts/dungeon/blue.dat and b/P3D/Content/Data/Scripts/dungeon/blue.dat differ
diff --git a/P3D/Content/Data/Scripts/dungeon/robotwarpout.dat b/P3D/Content/Data/Scripts/dungeon/robotwarpout.dat
index 265df18d9..06dafd22a 100644
Binary files a/P3D/Content/Data/Scripts/dungeon/robotwarpout.dat and b/P3D/Content/Data/Scripts/dungeon/robotwarpout.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/001.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/001.trainer
index 7624ca699..c1c88b0ea 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/001.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/001.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/002.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/002.trainer
index 51a7e1b9e..ac5610b9b 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/002.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/002.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/003.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/003.trainer
index b5809961c..f2fef2385 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/003.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/003.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/004.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/004.trainer
index 4a24617cc..f3ecc8ca5 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/004.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/004.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/005.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/005.trainer
index f1db0f6cc..972b3ba2d 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/005.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/005.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/006.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/006.trainer
index ff87f6c47..905e74911 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/006.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/006.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/007.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/007.trainer
index 604bce074..615f8f771 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/007.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/007.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/lazysailor.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/lazysailor.trainer
index 892a55751..fde85d746 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/lazysailor.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/first trip/lazysailor.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/olivine/006.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/olivine/006.trainer
index 850ce43c2..6b44efec3 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/olivine/006.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/olivine/006.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/olivine/009.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/olivine/009.trainer
index 34387f745..c0d487c5a 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/olivine/009.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/olivine/009.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/001.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/001.trainer
index ae8041065..ea4ca43cb 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/001.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/001.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/002.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/002.trainer
index 690ce3834..e4a7c6810 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/002.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/002.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/007.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/007.trainer
index 46e4be09c..7271e75d3 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/007.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/007.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/009.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/009.trainer
index 8bd2f36b7..54691923f 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/009.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/009.trainer differ
diff --git a/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/010.trainer b/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/010.trainer
index 14cd1816a..0d75fcad5 100644
Binary files a/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/010.trainer and b/P3D/Content/Data/Scripts/trainer/ssaqua/vermilion/010.trainer differ
diff --git a/P3D/Content/Data/maps/dungeon/2/4.dat b/P3D/Content/Data/maps/dungeon/2/4.dat
index a67831b4c..d4c2abd3a 100644
Binary files a/P3D/Content/Data/maps/dungeon/2/4.dat and b/P3D/Content/Data/maps/dungeon/2/4.dat differ
diff --git a/P3D/Content/Data/maps/poke/routes/route24.poke b/P3D/Content/Data/maps/poke/routes/route24.poke
index 37303bd22..f40c5be1b 100644
--- a/P3D/Content/Data/maps/poke/routes/route24.poke
+++ b/P3D/Content/Data/maps/poke/routes/route24.poke
@@ -2,10 +2,9 @@ name=Route 24
 type=WatersEdge
 {0|63|10|-1|12,12}
 {0|69|5|-1|10,10}
-{0|10|60|1,3|8,10}
+{0|10|50|1,2,3|8,10}
 {0|11|20|1,3|12,12}
 {0|12|5|1,2,3|14,14}
-{0|10|50|2|8,10}
 {0|191|30|2|12,12}
 {0|48|30|0|8,8}
 {0|43|50|0|10,12}
diff --git a/P3D/Content/Data/maps/poke/routes/route25.poke b/P3D/Content/Data/maps/poke/routes/route25.poke
index 257459ac2..0f4b2b63f 100644
--- a/P3D/Content/Data/maps/poke/routes/route25.poke
+++ b/P3D/Content/Data/maps/poke/routes/route25.poke
@@ -3,13 +3,13 @@ type=WatersEdge
 {0|48|20|0|10,10}
 {0|43|30|0|10,10}
 {0|163|30|0|10,10}
-{0|164|15|0|12,14}
+{0|164|10|0|12,14}
 {0|16|30|1,2,3|10,10}
 {0|17|20|1,2,3|12,12}
 {0|10|30|1,2,3|10,10}
 {0|11|10|1,2,3|12,12}
 {0|12|5|1,2,3|14,14}
-{0|69|5|-1|10,10}
+{0|69|10|-1|10,10}
 {2|118|90|-1|15,24}
 {2|119|10|-1|20,24}
 {3|118|15|-1|10,10}