diff --git a/P3D/Content/Data/maps/BerryVista.dat b/P3D/Content/Data/maps/BerryVista.dat
index f146f61a2..292fb0416 100644
Binary files a/P3D/Content/Data/maps/BerryVista.dat and b/P3D/Content/Data/maps/BerryVista.dat differ
diff --git a/P3D/Content/Data/maps/Ecruteak.dat b/P3D/Content/Data/maps/Ecruteak.dat
index 101b9a24a..0275207ee 100644
Binary files a/P3D/Content/Data/maps/Ecruteak.dat and b/P3D/Content/Data/maps/Ecruteak.dat differ
diff --git a/P3D/Content/Data/maps/Olivine.dat b/P3D/Content/Data/maps/Olivine.dat
index f69d28bf3..738414d71 100644
Binary files a/P3D/Content/Data/maps/Olivine.dat and b/P3D/Content/Data/maps/Olivine.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/bf1.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/bf1.dat
index d953404ba..c2c6848ea 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/bf1.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/bf1.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/1.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/1.dat
index ffbc767ce..01089ecb1 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/1.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/1.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/2.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/2.dat
index 2cb7513c2..e4743c9d2 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/2.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/2.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/3.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/3.dat
index 682e212c5..d58ebfcf2 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/3.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/3.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/4.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/4.dat
index 13b6c8059..c39f143c9 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/4.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/4.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/5.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/5.dat
index f842a4a20..5465f1456 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/5.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/5.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/6.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/6.dat
index e2bc1848b..a59fbe31d 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/6.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/6.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/7.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/7.dat
index d3d30930d..8577f4fca 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/7.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/7.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/8.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/8.dat
index 2c5397e28..1da4ea5c1 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/8.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/8.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/captain.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/captain.dat
index bc8564b86..f2d4977d7 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/captain.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/cabins/captain.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/captainoutside.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/captainoutside.dat
index fe18d0192..4ac758a05 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/captainoutside.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/captainoutside.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/firsttrip/main.dat b/P3D/Content/Data/maps/SSAqua/firsttrip/main.dat
index b314e27cf..a628d7aaa 100644
Binary files a/P3D/Content/Data/maps/SSAqua/firsttrip/main.dat and b/P3D/Content/Data/maps/SSAqua/firsttrip/main.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/bf1.dat b/P3D/Content/Data/maps/SSAqua/olivine/bf1.dat
index 3e63dfacb..66465369d 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/bf1.dat and b/P3D/Content/Data/maps/SSAqua/olivine/bf1.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/cabins/1.dat b/P3D/Content/Data/maps/SSAqua/olivine/cabins/1.dat
index 05852f8c0..60e920264 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/cabins/1.dat and b/P3D/Content/Data/maps/SSAqua/olivine/cabins/1.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/cabins/2.dat b/P3D/Content/Data/maps/SSAqua/olivine/cabins/2.dat
index 5f556fd59..a77a74e9c 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/cabins/2.dat and b/P3D/Content/Data/maps/SSAqua/olivine/cabins/2.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/cabins/3.dat b/P3D/Content/Data/maps/SSAqua/olivine/cabins/3.dat
index 51fd2972a..c225cde99 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/cabins/3.dat and b/P3D/Content/Data/maps/SSAqua/olivine/cabins/3.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/cabins/4.dat b/P3D/Content/Data/maps/SSAqua/olivine/cabins/4.dat
index 0c92d504a..99696bad3 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/cabins/4.dat and b/P3D/Content/Data/maps/SSAqua/olivine/cabins/4.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/cabins/5.dat b/P3D/Content/Data/maps/SSAqua/olivine/cabins/5.dat
index e5531332a..df9020888 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/cabins/5.dat and b/P3D/Content/Data/maps/SSAqua/olivine/cabins/5.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/cabins/6.dat b/P3D/Content/Data/maps/SSAqua/olivine/cabins/6.dat
index a14c66ed3..fee309f70 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/cabins/6.dat and b/P3D/Content/Data/maps/SSAqua/olivine/cabins/6.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/cabins/7.dat b/P3D/Content/Data/maps/SSAqua/olivine/cabins/7.dat
index bc9ed4b8e..781a53fe1 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/cabins/7.dat and b/P3D/Content/Data/maps/SSAqua/olivine/cabins/7.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/cabins/8.dat b/P3D/Content/Data/maps/SSAqua/olivine/cabins/8.dat
index de241c791..dd90cf80f 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/cabins/8.dat and b/P3D/Content/Data/maps/SSAqua/olivine/cabins/8.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/cabins/captain.dat b/P3D/Content/Data/maps/SSAqua/olivine/cabins/captain.dat
index 3cc66fb43..0908c7dc7 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/cabins/captain.dat and b/P3D/Content/Data/maps/SSAqua/olivine/cabins/captain.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/captainoutside.dat b/P3D/Content/Data/maps/SSAqua/olivine/captainoutside.dat
index 022635f5e..3f9a7f1cc 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/captainoutside.dat and b/P3D/Content/Data/maps/SSAqua/olivine/captainoutside.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/olivine/main.dat b/P3D/Content/Data/maps/SSAqua/olivine/main.dat
index 80a077719..da69fbea9 100644
Binary files a/P3D/Content/Data/maps/SSAqua/olivine/main.dat and b/P3D/Content/Data/maps/SSAqua/olivine/main.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/bf1.dat b/P3D/Content/Data/maps/SSAqua/vermilion/bf1.dat
index a368ca667..50ad5d610 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/bf1.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/bf1.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/1.dat b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/1.dat
index 05ee712d2..8bbaf5dee 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/1.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/1.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/2.dat b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/2.dat
index 9fd015e29..c4067ebfb 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/2.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/2.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/3.dat b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/3.dat
index 21a9d6ab2..e8cee6914 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/3.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/3.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/4.dat b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/4.dat
index 7fa62913a..a862ac807 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/4.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/4.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/5.dat b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/5.dat
index 403ffd0d8..d1e4fc9f0 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/5.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/5.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/6.dat b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/6.dat
index 0194c7200..452beedd9 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/6.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/6.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/7.dat b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/7.dat
index d4c2351c7..673d493de 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/7.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/7.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/8.dat b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/8.dat
index a7bee442b..6db5d0e80 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/8.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/8.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/captain.dat b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/captain.dat
index 7e6d82656..cbb417eb4 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/cabins/captain.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/cabins/captain.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/captainoutside.dat b/P3D/Content/Data/maps/SSAqua/vermilion/captainoutside.dat
index 684846466..c29fb98a2 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/captainoutside.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/captainoutside.dat differ
diff --git a/P3D/Content/Data/maps/SSAqua/vermilion/main.dat b/P3D/Content/Data/maps/SSAqua/vermilion/main.dat
index 17d0548a8..621f89fc1 100644
Binary files a/P3D/Content/Data/maps/SSAqua/vermilion/main.dat and b/P3D/Content/Data/maps/SSAqua/vermilion/main.dat differ
diff --git a/P3D/Content/Data/maps/TestMaps/EmbeddedTower.dat b/P3D/Content/Data/maps/TestMaps/EmbeddedTower.dat
index d686ca3f7..5bb342012 100644
Binary files a/P3D/Content/Data/maps/TestMaps/EmbeddedTower.dat and b/P3D/Content/Data/maps/TestMaps/EmbeddedTower.dat differ
diff --git a/P3D/Content/Data/maps/TestMaps/Kings_Landing.dat b/P3D/Content/Data/maps/TestMaps/Kings_Landing.dat
index e328769fe..32a05371c 100644
Binary files a/P3D/Content/Data/maps/TestMaps/Kings_Landing.dat and b/P3D/Content/Data/maps/TestMaps/Kings_Landing.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph01.dat b/P3D/Content/Data/maps/alph/alph01.dat
index 2af1034fc..f2ded7ae5 100644
Binary files a/P3D/Content/Data/maps/alph/alph01.dat and b/P3D/Content/Data/maps/alph/alph01.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph02.dat b/P3D/Content/Data/maps/alph/alph02.dat
index 36b9d58b4..3058d3eb8 100644
Binary files a/P3D/Content/Data/maps/alph/alph02.dat and b/P3D/Content/Data/maps/alph/alph02.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph03.dat b/P3D/Content/Data/maps/alph/alph03.dat
index 9772d5c9b..6e0b579a5 100644
Binary files a/P3D/Content/Data/maps/alph/alph03.dat and b/P3D/Content/Data/maps/alph/alph03.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph04.dat b/P3D/Content/Data/maps/alph/alph04.dat
index 996ccb3cb..8481da70f 100644
Binary files a/P3D/Content/Data/maps/alph/alph04.dat and b/P3D/Content/Data/maps/alph/alph04.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph05.dat b/P3D/Content/Data/maps/alph/alph05.dat
index 4484d5b2f..4b7929fb0 100644
Binary files a/P3D/Content/Data/maps/alph/alph05.dat and b/P3D/Content/Data/maps/alph/alph05.dat differ
diff --git a/P3D/Content/Data/maps/alph/alph06.dat b/P3D/Content/Data/maps/alph/alph06.dat
index cfdf54ac9..9b766a3f8 100644
Binary files a/P3D/Content/Data/maps/alph/alph06.dat and b/P3D/Content/Data/maps/alph/alph06.dat differ
diff --git a/P3D/Content/Data/maps/alph/alphhouse.dat b/P3D/Content/Data/maps/alph/alphhouse.dat
index 34fce089c..9b302563f 100644
Binary files a/P3D/Content/Data/maps/alph/alphhouse.dat and b/P3D/Content/Data/maps/alph/alphhouse.dat differ
diff --git a/P3D/Content/Data/maps/alph/deepruins.dat b/P3D/Content/Data/maps/alph/deepruins.dat
index b4d0d0cfa..abfeae2f7 100644
Binary files a/P3D/Content/Data/maps/alph/deepruins.dat and b/P3D/Content/Data/maps/alph/deepruins.dat differ
diff --git a/P3D/Content/Data/maps/alph/ruinsofalph.dat b/P3D/Content/Data/maps/alph/ruinsofalph.dat
index b18358ebb..7cab11e39 100644
Binary files a/P3D/Content/Data/maps/alph/ruinsofalph.dat and b/P3D/Content/Data/maps/alph/ruinsofalph.dat differ
diff --git a/P3D/Content/Data/maps/azalea.dat b/P3D/Content/Data/maps/azalea.dat
index dfb152a7e..05e45b138 100644
Binary files a/P3D/Content/Data/maps/azalea.dat and b/P3D/Content/Data/maps/azalea.dat differ
diff --git a/P3D/Content/Data/maps/azalea/0.dat b/P3D/Content/Data/maps/azalea/0.dat
index f6607d92a..d9f55326b 100644
Binary files a/P3D/Content/Data/maps/azalea/0.dat and b/P3D/Content/Data/maps/azalea/0.dat differ
diff --git a/P3D/Content/Data/maps/azalea/center.dat b/P3D/Content/Data/maps/azalea/center.dat
index 5104c925e..d41971844 100644
Binary files a/P3D/Content/Data/maps/azalea/center.dat and b/P3D/Content/Data/maps/azalea/center.dat differ
diff --git a/P3D/Content/Data/maps/azalea/kurt.dat b/P3D/Content/Data/maps/azalea/kurt.dat
index e74412776..58b223b4d 100644
Binary files a/P3D/Content/Data/maps/azalea/kurt.dat and b/P3D/Content/Data/maps/azalea/kurt.dat differ
diff --git a/P3D/Content/Data/maps/azalea/mart.dat b/P3D/Content/Data/maps/azalea/mart.dat
index 5d49eeab6..30619ab5a 100644
Binary files a/P3D/Content/Data/maps/azalea/mart.dat and b/P3D/Content/Data/maps/azalea/mart.dat differ
diff --git a/P3D/Content/Data/maps/barktown.dat b/P3D/Content/Data/maps/barktown.dat
index 69a71d340..cfcc51eb8 100644
Binary files a/P3D/Content/Data/maps/barktown.dat and b/P3D/Content/Data/maps/barktown.dat differ
diff --git a/P3D/Content/Data/maps/barktown/0.dat b/P3D/Content/Data/maps/barktown/0.dat
index 1a25c7899..fca86e794 100644
Binary files a/P3D/Content/Data/maps/barktown/0.dat and b/P3D/Content/Data/maps/barktown/0.dat differ
diff --git a/P3D/Content/Data/maps/barktown/1.dat b/P3D/Content/Data/maps/barktown/1.dat
index 36a71c5e8..40b83b924 100644
Binary files a/P3D/Content/Data/maps/barktown/1.dat and b/P3D/Content/Data/maps/barktown/1.dat differ
diff --git a/P3D/Content/Data/maps/barktown0.dat b/P3D/Content/Data/maps/barktown0.dat
index 676ab6659..6f3e81271 100644
Binary files a/P3D/Content/Data/maps/barktown0.dat and b/P3D/Content/Data/maps/barktown0.dat differ
diff --git a/P3D/Content/Data/maps/battle/Ecruteak.dat b/P3D/Content/Data/maps/battle/Ecruteak.dat
index 99ba566ee..0e3fd8ec3 100644
Binary files a/P3D/Content/Data/maps/battle/Ecruteak.dat and b/P3D/Content/Data/maps/battle/Ecruteak.dat differ
diff --git a/P3D/Content/Data/maps/battle/Olivine.dat b/P3D/Content/Data/maps/battle/Olivine.dat
index dfe553ce0..6aebebbfd 100644
Binary files a/P3D/Content/Data/maps/battle/Olivine.dat and b/P3D/Content/Data/maps/battle/Olivine.dat differ
diff --git a/P3D/Content/Data/maps/battle/alph/alph01.dat b/P3D/Content/Data/maps/battle/alph/alph01.dat
index 3230b46c1..4eaa2cb23 100644
Binary files a/P3D/Content/Data/maps/battle/alph/alph01.dat and b/P3D/Content/Data/maps/battle/alph/alph01.dat differ
diff --git a/P3D/Content/Data/maps/battle/alph/alph03.dat b/P3D/Content/Data/maps/battle/alph/alph03.dat
index 3230b46c1..4eaa2cb23 100644
Binary files a/P3D/Content/Data/maps/battle/alph/alph03.dat and b/P3D/Content/Data/maps/battle/alph/alph03.dat differ
diff --git a/P3D/Content/Data/maps/battle/azalea.dat b/P3D/Content/Data/maps/battle/azalea.dat
index 1e67de635..e0d5d1489 100644
Binary files a/P3D/Content/Data/maps/battle/azalea.dat and b/P3D/Content/Data/maps/battle/azalea.dat differ
diff --git a/P3D/Content/Data/maps/battle/battle0.dat b/P3D/Content/Data/maps/battle/battle0.dat
index 89272bae0..be6c8c69a 100644
Binary files a/P3D/Content/Data/maps/battle/battle0.dat and b/P3D/Content/Data/maps/battle/battle0.dat differ
diff --git a/P3D/Content/Data/maps/battle/boon/cape.dat b/P3D/Content/Data/maps/battle/boon/cape.dat
index 83e629802..167cb350c 100644
Binary files a/P3D/Content/Data/maps/battle/boon/cape.dat and b/P3D/Content/Data/maps/battle/boon/cape.dat differ
diff --git a/P3D/Content/Data/maps/battle/burnedtower/burnedtower1f.dat b/P3D/Content/Data/maps/battle/burnedtower/burnedtower1f.dat
index 99fe33af9..28e8b6652 100644
Binary files a/P3D/Content/Data/maps/battle/burnedtower/burnedtower1f.dat and b/P3D/Content/Data/maps/battle/burnedtower/burnedtower1f.dat differ
diff --git a/P3D/Content/Data/maps/battle/burnedtower/burnedtowerb1f.dat b/P3D/Content/Data/maps/battle/burnedtower/burnedtowerb1f.dat
index 3aaa2889b..20dca4f7c 100644
Binary files a/P3D/Content/Data/maps/battle/burnedtower/burnedtowerb1f.dat and b/P3D/Content/Data/maps/battle/burnedtower/burnedtowerb1f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ceruleancave/1f.dat b/P3D/Content/Data/maps/battle/ceruleancave/1f.dat
index aa7d8c262..da85275ec 100644
Binary files a/P3D/Content/Data/maps/battle/ceruleancave/1f.dat and b/P3D/Content/Data/maps/battle/ceruleancave/1f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ceruleancave/2f.dat b/P3D/Content/Data/maps/battle/ceruleancave/2f.dat
index aa7d8c262..da85275ec 100644
Binary files a/P3D/Content/Data/maps/battle/ceruleancave/2f.dat and b/P3D/Content/Data/maps/battle/ceruleancave/2f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ceruleancave/bf1.dat b/P3D/Content/Data/maps/battle/ceruleancave/bf1.dat
index aa7d8c262..da85275ec 100644
Binary files a/P3D/Content/Data/maps/battle/ceruleancave/bf1.dat and b/P3D/Content/Data/maps/battle/ceruleancave/bf1.dat differ
diff --git a/P3D/Content/Data/maps/battle/cherrygrove.dat b/P3D/Content/Data/maps/battle/cherrygrove.dat
index 053ae432a..49bb60968 100644
Binary files a/P3D/Content/Data/maps/battle/cherrygrove.dat and b/P3D/Content/Data/maps/battle/cherrygrove.dat differ
diff --git a/P3D/Content/Data/maps/battle/chrono/labyrinth.dat b/P3D/Content/Data/maps/battle/chrono/labyrinth.dat
index b893e6347..2fb27fdd9 100644
Binary files a/P3D/Content/Data/maps/battle/chrono/labyrinth.dat and b/P3D/Content/Data/maps/battle/chrono/labyrinth.dat differ
diff --git a/P3D/Content/Data/maps/battle/chrono/meadow.dat b/P3D/Content/Data/maps/battle/chrono/meadow.dat
index e7be08323..9c802190f 100644
Binary files a/P3D/Content/Data/maps/battle/chrono/meadow.dat and b/P3D/Content/Data/maps/battle/chrono/meadow.dat differ
diff --git a/P3D/Content/Data/maps/battle/chrono/memorial.dat b/P3D/Content/Data/maps/battle/chrono/memorial.dat
index 5e42ea853..c7b1c7b94 100644
Binary files a/P3D/Content/Data/maps/battle/chrono/memorial.dat and b/P3D/Content/Data/maps/battle/chrono/memorial.dat differ
diff --git a/P3D/Content/Data/maps/battle/chrono/resort.dat b/P3D/Content/Data/maps/battle/chrono/resort.dat
index 1f8aa8df8..ff5c96133 100644
Binary files a/P3D/Content/Data/maps/battle/chrono/resort.dat and b/P3D/Content/Data/maps/battle/chrono/resort.dat differ
diff --git a/P3D/Content/Data/maps/battle/chrono/warehouse.dat b/P3D/Content/Data/maps/battle/chrono/warehouse.dat
index 3cefa54d4..88099d3c6 100644
Binary files a/P3D/Content/Data/maps/battle/chrono/warehouse.dat and b/P3D/Content/Data/maps/battle/chrono/warehouse.dat differ
diff --git a/P3D/Content/Data/maps/battle/cianwood.dat b/P3D/Content/Data/maps/battle/cianwood.dat
index 770363a1c..87e52fb57 100644
Binary files a/P3D/Content/Data/maps/battle/cianwood.dat and b/P3D/Content/Data/maps/battle/cianwood.dat differ
diff --git a/P3D/Content/Data/maps/battle/darkcave/darkcave0.dat b/P3D/Content/Data/maps/battle/darkcave/darkcave0.dat
index 79f93e853..a5f5612c9 100644
Binary files a/P3D/Content/Data/maps/battle/darkcave/darkcave0.dat and b/P3D/Content/Data/maps/battle/darkcave/darkcave0.dat differ
diff --git a/P3D/Content/Data/maps/battle/darkcave/darkcave1.dat b/P3D/Content/Data/maps/battle/darkcave/darkcave1.dat
index 79f93e853..a5f5612c9 100644
Binary files a/P3D/Content/Data/maps/battle/darkcave/darkcave1.dat and b/P3D/Content/Data/maps/battle/darkcave/darkcave1.dat differ
diff --git a/P3D/Content/Data/maps/battle/diglettscave/entpew.dat b/P3D/Content/Data/maps/battle/diglettscave/entpew.dat
index 976fd8480..cfd0be39c 100644
Binary files a/P3D/Content/Data/maps/battle/diglettscave/entpew.dat and b/P3D/Content/Data/maps/battle/diglettscave/entpew.dat differ
diff --git a/P3D/Content/Data/maps/battle/diglettscave/entver.dat b/P3D/Content/Data/maps/battle/diglettscave/entver.dat
index 976fd8480..cfd0be39c 100644
Binary files a/P3D/Content/Data/maps/battle/diglettscave/entver.dat and b/P3D/Content/Data/maps/battle/diglettscave/entver.dat differ
diff --git a/P3D/Content/Data/maps/battle/diglettscave/main.dat b/P3D/Content/Data/maps/battle/diglettscave/main.dat
index 976fd8480..cfd0be39c 100644
Binary files a/P3D/Content/Data/maps/battle/diglettscave/main.dat and b/P3D/Content/Data/maps/battle/diglettscave/main.dat differ
diff --git a/P3D/Content/Data/maps/battle/dragonsden/main.dat b/P3D/Content/Data/maps/battle/dragonsden/main.dat
index 5bb0e219f..d75f6ed11 100644
Binary files a/P3D/Content/Data/maps/battle/dragonsden/main.dat and b/P3D/Content/Data/maps/battle/dragonsden/main.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/0.dat b/P3D/Content/Data/maps/battle/dungeon/0/0.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/0.dat and b/P3D/Content/Data/maps/battle/dungeon/0/0.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/1.dat b/P3D/Content/Data/maps/battle/dungeon/0/1.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/1.dat and b/P3D/Content/Data/maps/battle/dungeon/0/1.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/10.dat b/P3D/Content/Data/maps/battle/dungeon/0/10.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/10.dat and b/P3D/Content/Data/maps/battle/dungeon/0/10.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/11.dat b/P3D/Content/Data/maps/battle/dungeon/0/11.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/11.dat and b/P3D/Content/Data/maps/battle/dungeon/0/11.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/12.dat b/P3D/Content/Data/maps/battle/dungeon/0/12.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/12.dat and b/P3D/Content/Data/maps/battle/dungeon/0/12.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/13.dat b/P3D/Content/Data/maps/battle/dungeon/0/13.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/13.dat and b/P3D/Content/Data/maps/battle/dungeon/0/13.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/14.dat b/P3D/Content/Data/maps/battle/dungeon/0/14.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/14.dat and b/P3D/Content/Data/maps/battle/dungeon/0/14.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/2.dat b/P3D/Content/Data/maps/battle/dungeon/0/2.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/2.dat and b/P3D/Content/Data/maps/battle/dungeon/0/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/3.dat b/P3D/Content/Data/maps/battle/dungeon/0/3.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/3.dat and b/P3D/Content/Data/maps/battle/dungeon/0/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/4.dat b/P3D/Content/Data/maps/battle/dungeon/0/4.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/4.dat and b/P3D/Content/Data/maps/battle/dungeon/0/4.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/5.dat b/P3D/Content/Data/maps/battle/dungeon/0/5.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/5.dat and b/P3D/Content/Data/maps/battle/dungeon/0/5.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/6.dat b/P3D/Content/Data/maps/battle/dungeon/0/6.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/6.dat and b/P3D/Content/Data/maps/battle/dungeon/0/6.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/7.dat b/P3D/Content/Data/maps/battle/dungeon/0/7.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/7.dat and b/P3D/Content/Data/maps/battle/dungeon/0/7.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/8.dat b/P3D/Content/Data/maps/battle/dungeon/0/8.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/8.dat and b/P3D/Content/Data/maps/battle/dungeon/0/8.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/0/9.dat b/P3D/Content/Data/maps/battle/dungeon/0/9.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/0/9.dat and b/P3D/Content/Data/maps/battle/dungeon/0/9.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/0.dat b/P3D/Content/Data/maps/battle/dungeon/1/0.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/0.dat and b/P3D/Content/Data/maps/battle/dungeon/1/0.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/1.dat b/P3D/Content/Data/maps/battle/dungeon/1/1.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/1.dat and b/P3D/Content/Data/maps/battle/dungeon/1/1.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/10.dat b/P3D/Content/Data/maps/battle/dungeon/1/10.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/10.dat and b/P3D/Content/Data/maps/battle/dungeon/1/10.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/11.dat b/P3D/Content/Data/maps/battle/dungeon/1/11.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/11.dat and b/P3D/Content/Data/maps/battle/dungeon/1/11.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/12.dat b/P3D/Content/Data/maps/battle/dungeon/1/12.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/12.dat and b/P3D/Content/Data/maps/battle/dungeon/1/12.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/13.dat b/P3D/Content/Data/maps/battle/dungeon/1/13.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/13.dat and b/P3D/Content/Data/maps/battle/dungeon/1/13.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/14.dat b/P3D/Content/Data/maps/battle/dungeon/1/14.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/14.dat and b/P3D/Content/Data/maps/battle/dungeon/1/14.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/15.dat b/P3D/Content/Data/maps/battle/dungeon/1/15.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/15.dat and b/P3D/Content/Data/maps/battle/dungeon/1/15.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/16.dat b/P3D/Content/Data/maps/battle/dungeon/1/16.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/16.dat and b/P3D/Content/Data/maps/battle/dungeon/1/16.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/17.dat b/P3D/Content/Data/maps/battle/dungeon/1/17.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/17.dat and b/P3D/Content/Data/maps/battle/dungeon/1/17.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/18.dat b/P3D/Content/Data/maps/battle/dungeon/1/18.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/18.dat and b/P3D/Content/Data/maps/battle/dungeon/1/18.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/19.dat b/P3D/Content/Data/maps/battle/dungeon/1/19.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/19.dat and b/P3D/Content/Data/maps/battle/dungeon/1/19.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/2.dat b/P3D/Content/Data/maps/battle/dungeon/1/2.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/2.dat and b/P3D/Content/Data/maps/battle/dungeon/1/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/20.dat b/P3D/Content/Data/maps/battle/dungeon/1/20.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/20.dat and b/P3D/Content/Data/maps/battle/dungeon/1/20.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/21.dat b/P3D/Content/Data/maps/battle/dungeon/1/21.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/21.dat and b/P3D/Content/Data/maps/battle/dungeon/1/21.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/22.dat b/P3D/Content/Data/maps/battle/dungeon/1/22.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/22.dat and b/P3D/Content/Data/maps/battle/dungeon/1/22.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/23.dat b/P3D/Content/Data/maps/battle/dungeon/1/23.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/23.dat and b/P3D/Content/Data/maps/battle/dungeon/1/23.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/24.dat b/P3D/Content/Data/maps/battle/dungeon/1/24.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/24.dat and b/P3D/Content/Data/maps/battle/dungeon/1/24.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/3.dat b/P3D/Content/Data/maps/battle/dungeon/1/3.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/3.dat and b/P3D/Content/Data/maps/battle/dungeon/1/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/4.dat b/P3D/Content/Data/maps/battle/dungeon/1/4.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/4.dat and b/P3D/Content/Data/maps/battle/dungeon/1/4.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/5.dat b/P3D/Content/Data/maps/battle/dungeon/1/5.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/5.dat and b/P3D/Content/Data/maps/battle/dungeon/1/5.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/6.dat b/P3D/Content/Data/maps/battle/dungeon/1/6.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/6.dat and b/P3D/Content/Data/maps/battle/dungeon/1/6.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/7.dat b/P3D/Content/Data/maps/battle/dungeon/1/7.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/7.dat and b/P3D/Content/Data/maps/battle/dungeon/1/7.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/8.dat b/P3D/Content/Data/maps/battle/dungeon/1/8.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/8.dat and b/P3D/Content/Data/maps/battle/dungeon/1/8.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/1/9.dat b/P3D/Content/Data/maps/battle/dungeon/1/9.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/1/9.dat and b/P3D/Content/Data/maps/battle/dungeon/1/9.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/2/0.dat b/P3D/Content/Data/maps/battle/dungeon/2/0.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/2/0.dat and b/P3D/Content/Data/maps/battle/dungeon/2/0.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/2/1.dat b/P3D/Content/Data/maps/battle/dungeon/2/1.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/2/1.dat and b/P3D/Content/Data/maps/battle/dungeon/2/1.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/2/2.dat b/P3D/Content/Data/maps/battle/dungeon/2/2.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/2/2.dat and b/P3D/Content/Data/maps/battle/dungeon/2/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/2/3.dat b/P3D/Content/Data/maps/battle/dungeon/2/3.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/2/3.dat and b/P3D/Content/Data/maps/battle/dungeon/2/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/2/4.dat b/P3D/Content/Data/maps/battle/dungeon/2/4.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/2/4.dat and b/P3D/Content/Data/maps/battle/dungeon/2/4.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/2/5.dat b/P3D/Content/Data/maps/battle/dungeon/2/5.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/2/5.dat and b/P3D/Content/Data/maps/battle/dungeon/2/5.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/2/6.dat b/P3D/Content/Data/maps/battle/dungeon/2/6.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/2/6.dat and b/P3D/Content/Data/maps/battle/dungeon/2/6.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/2/7.dat b/P3D/Content/Data/maps/battle/dungeon/2/7.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/2/7.dat and b/P3D/Content/Data/maps/battle/dungeon/2/7.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/2/outside.dat b/P3D/Content/Data/maps/battle/dungeon/2/outside.dat
index 67cb97bcf..d2c8b6ece 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/2/outside.dat and b/P3D/Content/Data/maps/battle/dungeon/2/outside.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/checkpoint1.dat b/P3D/Content/Data/maps/battle/dungeon/checkpoint1.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/checkpoint1.dat and b/P3D/Content/Data/maps/battle/dungeon/checkpoint1.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/chess.dat b/P3D/Content/Data/maps/battle/dungeon/chess.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/chess.dat and b/P3D/Content/Data/maps/battle/dungeon/chess.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/main.dat b/P3D/Content/Data/maps/battle/dungeon/main.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/main.dat and b/P3D/Content/Data/maps/battle/dungeon/main.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/mindend.dat b/P3D/Content/Data/maps/battle/dungeon/mindend.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/mindend.dat and b/P3D/Content/Data/maps/battle/dungeon/mindend.dat differ
diff --git a/P3D/Content/Data/maps/battle/dungeon/passage.dat b/P3D/Content/Data/maps/battle/dungeon/passage.dat
index 0ee5bec3f..8592c3bd5 100644
Binary files a/P3D/Content/Data/maps/battle/dungeon/passage.dat and b/P3D/Content/Data/maps/battle/dungeon/passage.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/dance_theater.dat b/P3D/Content/Data/maps/battle/ecruteak/dance_theater.dat
index 5e20f933e..f268a121d 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/dance_theater.dat and b/P3D/Content/Data/maps/battle/ecruteak/dance_theater.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/tintower10f.dat b/P3D/Content/Data/maps/battle/ecruteak/tintower10f.dat
index 79e8f795f..90e006fe6 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/tintower10f.dat and b/P3D/Content/Data/maps/battle/ecruteak/tintower10f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/tintower1f.dat b/P3D/Content/Data/maps/battle/ecruteak/tintower1f.dat
index 0ee498523..f8fa59072 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/tintower1f.dat and b/P3D/Content/Data/maps/battle/ecruteak/tintower1f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/tintower2f.dat b/P3D/Content/Data/maps/battle/ecruteak/tintower2f.dat
index 0ee498523..f8fa59072 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/tintower2f.dat and b/P3D/Content/Data/maps/battle/ecruteak/tintower2f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/tintower3f.dat b/P3D/Content/Data/maps/battle/ecruteak/tintower3f.dat
index 0ee498523..f8fa59072 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/tintower3f.dat and b/P3D/Content/Data/maps/battle/ecruteak/tintower3f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/tintower4f.dat b/P3D/Content/Data/maps/battle/ecruteak/tintower4f.dat
index 0ee498523..f8fa59072 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/tintower4f.dat and b/P3D/Content/Data/maps/battle/ecruteak/tintower4f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/tintower5f.dat b/P3D/Content/Data/maps/battle/ecruteak/tintower5f.dat
index 0ee498523..f8fa59072 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/tintower5f.dat and b/P3D/Content/Data/maps/battle/ecruteak/tintower5f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/tintower6f.dat b/P3D/Content/Data/maps/battle/ecruteak/tintower6f.dat
index 0ee498523..f8fa59072 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/tintower6f.dat and b/P3D/Content/Data/maps/battle/ecruteak/tintower6f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/tintower7f.dat b/P3D/Content/Data/maps/battle/ecruteak/tintower7f.dat
index 0f1e007e1..e9139deab 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/tintower7f.dat and b/P3D/Content/Data/maps/battle/ecruteak/tintower7f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/tintower8f.dat b/P3D/Content/Data/maps/battle/ecruteak/tintower8f.dat
index 0f1e007e1..e9139deab 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/tintower8f.dat and b/P3D/Content/Data/maps/battle/ecruteak/tintower8f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ecruteak/tintower9f.dat b/P3D/Content/Data/maps/battle/ecruteak/tintower9f.dat
index 0f1e007e1..e9139deab 100644
Binary files a/P3D/Content/Data/maps/battle/ecruteak/tintower9f.dat and b/P3D/Content/Data/maps/battle/ecruteak/tintower9f.dat differ
diff --git a/P3D/Content/Data/maps/battle/faraway/interior.dat b/P3D/Content/Data/maps/battle/faraway/interior.dat
index 70f239740..9ae393f87 100644
Binary files a/P3D/Content/Data/maps/battle/faraway/interior.dat and b/P3D/Content/Data/maps/battle/faraway/interior.dat differ
diff --git a/P3D/Content/Data/maps/battle/fortune/altering.dat b/P3D/Content/Data/maps/battle/fortune/altering.dat
index ff08b47a2..aa0a19b6d 100644
--- a/P3D/Content/Data/maps/battle/fortune/altering.dat
+++ b/P3D/Content/Data/maps/battle/fortune/altering.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Altering Cave]}}{"MusicLoop"{str[diglettscave]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[2]}}{"Weather"{int[1]}}]}}
 
 Small:
 Floor:
diff --git a/P3D/Content/Data/maps/battle/fortune/green.dat b/P3D/Content/Data/maps/battle/fortune/green.dat
index c31b9c994..250008bf9 100644
--- a/P3D/Content/Data/maps/battle/fortune/green.dat
+++ b/P3D/Content/Data/maps/battle/fortune/green.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Green Path]}}{"MusicLoop"{str[RouteMusic7]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BattleMap"{str[fortune\green.dat,-10.7,0,-11]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BattleMap"{str[fortune\green.dat,-10.7,0,-11]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[9,1]}}{"Position"{intArr[0,0,10]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[16,16,16,16]}}{"Rotation"{int[2]}}]}}
diff --git a/P3D/Content/Data/maps/battle/fortune/outcast.dat b/P3D/Content/Data/maps/battle/fortune/outcast.dat
index 3d4586574..aa4747701 100644
--- a/P3D/Content/Data/maps/battle/fortune/outcast.dat
+++ b/P3D/Content/Data/maps/battle/fortune/outcast.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Outcast Island]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[12,11]}}{"Position"{intArr[5,0,15]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[16,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/fortune/patternbush/main.dat b/P3D/Content/Data/maps/battle/fortune/patternbush/main.dat
index 5f2635f33..587c333d1 100644
--- a/P3D/Content/Data/maps/battle/fortune/patternbush/main.dat
+++ b/P3D/Content/Data/maps/battle/fortune/patternbush/main.dat
@@ -1,4 +1,4 @@
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BattleMap"{str[fortune\patternbush\main.dat,0,0,-0.6]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BattleMap"{str[fortune\patternbush\main.dat,0,0,-0.6]}}]}}
 
 {"Floor"{ENT[{"Size"{intArr[14,10]}}{"Position"{intArr[5,0,9]}}{"TexturePath"{str[viridianForest]}}{"Texture"{rec[0,0,16,16]}}]}}
 
diff --git a/P3D/Content/Data/maps/battle/fortune/valley.dat b/P3D/Content/Data/maps/battle/fortune/valley.dat
index dd90676d4..95c0f8791 100644
--- a/P3D/Content/Data/maps/battle/fortune/valley.dat
+++ b/P3D/Content/Data/maps/battle/fortune/valley.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Ruin Valley]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"MapScript"{str[fortune\dot\door]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BattleMap"{str[fortune\valley.dat,13,0,-5.7]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"MapScript"{str[fortune\dot\door]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BattleMap"{str[fortune\valley.dat,13,0,-5.7]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[7,3]}}{"Position"{intArr[15,1,28]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/frontier/battlefactory/arena.dat b/P3D/Content/Data/maps/battle/frontier/battlefactory/arena.dat
index acbb0acb8..038c76764 100644
Binary files a/P3D/Content/Data/maps/battle/frontier/battlefactory/arena.dat and b/P3D/Content/Data/maps/battle/frontier/battlefactory/arena.dat differ
diff --git a/P3D/Content/Data/maps/battle/frontier/battletower/arena.dat b/P3D/Content/Data/maps/battle/frontier/battletower/arena.dat
index 6a27b1515..a0f661d36 100644
Binary files a/P3D/Content/Data/maps/battle/frontier/battletower/arena.dat and b/P3D/Content/Data/maps/battle/frontier/battletower/arena.dat differ
diff --git a/P3D/Content/Data/maps/battle/goldenrod/club.dat b/P3D/Content/Data/maps/battle/goldenrod/club.dat
index 51c7e6edc..e8905e278 100644
Binary files a/P3D/Content/Data/maps/battle/goldenrod/club.dat and b/P3D/Content/Data/maps/battle/goldenrod/club.dat differ
diff --git a/P3D/Content/Data/maps/battle/goldenrod/radiotower/1f.dat b/P3D/Content/Data/maps/battle/goldenrod/radiotower/1f.dat
index 40776fe7e..8d9918712 100644
Binary files a/P3D/Content/Data/maps/battle/goldenrod/radiotower/1f.dat and b/P3D/Content/Data/maps/battle/goldenrod/radiotower/1f.dat differ
diff --git a/P3D/Content/Data/maps/battle/goldenrod/radiotower/2f.dat b/P3D/Content/Data/maps/battle/goldenrod/radiotower/2f.dat
index 40776fe7e..8d9918712 100644
Binary files a/P3D/Content/Data/maps/battle/goldenrod/radiotower/2f.dat and b/P3D/Content/Data/maps/battle/goldenrod/radiotower/2f.dat differ
diff --git a/P3D/Content/Data/maps/battle/goldenrod/radiotower/3f.dat b/P3D/Content/Data/maps/battle/goldenrod/radiotower/3f.dat
index 40776fe7e..8d9918712 100644
Binary files a/P3D/Content/Data/maps/battle/goldenrod/radiotower/3f.dat and b/P3D/Content/Data/maps/battle/goldenrod/radiotower/3f.dat differ
diff --git a/P3D/Content/Data/maps/battle/goldenrod/radiotower/4f.dat b/P3D/Content/Data/maps/battle/goldenrod/radiotower/4f.dat
index 40776fe7e..8d9918712 100644
Binary files a/P3D/Content/Data/maps/battle/goldenrod/radiotower/4f.dat and b/P3D/Content/Data/maps/battle/goldenrod/radiotower/4f.dat differ
diff --git a/P3D/Content/Data/maps/battle/goldenrod/radiotower/5f.dat b/P3D/Content/Data/maps/battle/goldenrod/radiotower/5f.dat
index 40776fe7e..8d9918712 100644
Binary files a/P3D/Content/Data/maps/battle/goldenrod/radiotower/5f.dat and b/P3D/Content/Data/maps/battle/goldenrod/radiotower/5f.dat differ
diff --git a/P3D/Content/Data/maps/battle/goldenrod/underground0.dat b/P3D/Content/Data/maps/battle/goldenrod/underground0.dat
index c882a0970..2fb121f87 100644
Binary files a/P3D/Content/Data/maps/battle/goldenrod/underground0.dat and b/P3D/Content/Data/maps/battle/goldenrod/underground0.dat differ
diff --git a/P3D/Content/Data/maps/battle/goldenrod/underground2.dat b/P3D/Content/Data/maps/battle/goldenrod/underground2.dat
index fdb02b981..d54b859ae 100644
Binary files a/P3D/Content/Data/maps/battle/goldenrod/underground2.dat and b/P3D/Content/Data/maps/battle/goldenrod/underground2.dat differ
diff --git a/P3D/Content/Data/maps/battle/goldenrod/underground3.dat b/P3D/Content/Data/maps/battle/goldenrod/underground3.dat
index ecd662503..9e3fa7875 100644
Binary files a/P3D/Content/Data/maps/battle/goldenrod/underground3.dat and b/P3D/Content/Data/maps/battle/goldenrod/underground3.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/azalea_gym.dat b/P3D/Content/Data/maps/battle/gyms/azalea_gym.dat
index 216b157a1..f43547f22 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/azalea_gym.dat and b/P3D/Content/Data/maps/battle/gyms/azalea_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/blackthorn_gym_1.dat b/P3D/Content/Data/maps/battle/gyms/blackthorn_gym_1.dat
index 4cf07bb02..78413187b 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/blackthorn_gym_1.dat and b/P3D/Content/Data/maps/battle/gyms/blackthorn_gym_1.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/blackthorn_gym_2.dat b/P3D/Content/Data/maps/battle/gyms/blackthorn_gym_2.dat
index e33e40b4a..c9d01ef5c 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/blackthorn_gym_2.dat and b/P3D/Content/Data/maps/battle/gyms/blackthorn_gym_2.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/celadon_gym.dat b/P3D/Content/Data/maps/battle/gyms/celadon_gym.dat
index 2a755d265..2bd203671 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/celadon_gym.dat and b/P3D/Content/Data/maps/battle/gyms/celadon_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/cerulean_gym.dat b/P3D/Content/Data/maps/battle/gyms/cerulean_gym.dat
index d558c1eb4..7eff94861 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/cerulean_gym.dat and b/P3D/Content/Data/maps/battle/gyms/cerulean_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/cianwood_gym.dat b/P3D/Content/Data/maps/battle/gyms/cianwood_gym.dat
index 182d12b01..312e66cfb 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/cianwood_gym.dat and b/P3D/Content/Data/maps/battle/gyms/cianwood_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/cinnabar_gym.dat b/P3D/Content/Data/maps/battle/gyms/cinnabar_gym.dat
index bb9bb3ae1..14dad55ca 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/cinnabar_gym.dat and b/P3D/Content/Data/maps/battle/gyms/cinnabar_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/ecruteak_gym.dat b/P3D/Content/Data/maps/battle/gyms/ecruteak_gym.dat
index af8d8a170..ee0ae6454 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/ecruteak_gym.dat and b/P3D/Content/Data/maps/battle/gyms/ecruteak_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/fuchsia_gym.dat b/P3D/Content/Data/maps/battle/gyms/fuchsia_gym.dat
index a3f286283..989445dc1 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/fuchsia_gym.dat and b/P3D/Content/Data/maps/battle/gyms/fuchsia_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/goldenrod_gym.dat b/P3D/Content/Data/maps/battle/gyms/goldenrod_gym.dat
index cb73b691c..535616ec6 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/goldenrod_gym.dat and b/P3D/Content/Data/maps/battle/gyms/goldenrod_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/mahogany_gym.dat b/P3D/Content/Data/maps/battle/gyms/mahogany_gym.dat
index 51cf188eb..edea423a9 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/mahogany_gym.dat and b/P3D/Content/Data/maps/battle/gyms/mahogany_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/olivine_gym.dat b/P3D/Content/Data/maps/battle/gyms/olivine_gym.dat
index b156bd456..8a2b37f7d 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/olivine_gym.dat and b/P3D/Content/Data/maps/battle/gyms/olivine_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/pewter_gym.dat b/P3D/Content/Data/maps/battle/gyms/pewter_gym.dat
index 79965b2f7..95960ab60 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/pewter_gym.dat and b/P3D/Content/Data/maps/battle/gyms/pewter_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/saffron_gym.dat b/P3D/Content/Data/maps/battle/gyms/saffron_gym.dat
index 99aea8be1..4e1ee8e17 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/saffron_gym.dat and b/P3D/Content/Data/maps/battle/gyms/saffron_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/vermilion_gym.dat b/P3D/Content/Data/maps/battle/gyms/vermilion_gym.dat
index fbc4b076f..48e4258ba 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/vermilion_gym.dat and b/P3D/Content/Data/maps/battle/gyms/vermilion_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/violet_gym.dat b/P3D/Content/Data/maps/battle/gyms/violet_gym.dat
index a34f43948..fc4fce5cd 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/violet_gym.dat and b/P3D/Content/Data/maps/battle/gyms/violet_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/gyms/viridian_gym.dat b/P3D/Content/Data/maps/battle/gyms/viridian_gym.dat
index a34b7d7d1..be5d441ee 100644
Binary files a/P3D/Content/Data/maps/battle/gyms/viridian_gym.dat and b/P3D/Content/Data/maps/battle/gyms/viridian_gym.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/berryvista.dat b/P3D/Content/Data/maps/battle/hiddengrotto/berryvista.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/berryvista.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/berryvista.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/ilexforest.dat b/P3D/Content/Data/maps/battle/hiddengrotto/ilexforest.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/ilexforest.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/ilexforest.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/indigo.dat b/P3D/Content/Data/maps/battle/hiddengrotto/indigo.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/indigo.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/indigo.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/lakeofrage.dat b/P3D/Content/Data/maps/battle/hiddengrotto/lakeofrage.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/lakeofrage.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/lakeofrage.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/mahogany.dat b/P3D/Content/Data/maps/battle/hiddengrotto/mahogany.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/mahogany.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/mahogany.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/nationalpark0.dat b/P3D/Content/Data/maps/battle/hiddengrotto/nationalpark0.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/nationalpark0.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/nationalpark0.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route26.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route26.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route26.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route26.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route27.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route27.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route27.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route27.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route31.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route31.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route31.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route31.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route32.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route32.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route32.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route32.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route34.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route34.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route34.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route34.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route35.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route35.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route35.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route35.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route39.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route39.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route39.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route39.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route42.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route42.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route42.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route42.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route43.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route43.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route43.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route43.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route44.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route44.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route44.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route44.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route46.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route46.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route46.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route46.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route47.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route47.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route47.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route47.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/route48.dat b/P3D/Content/Data/maps/battle/hiddengrotto/route48.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/route48.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/route48.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/twirl.dat b/P3D/Content/Data/maps/battle/hiddengrotto/twirl.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/twirl.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/twirl.dat differ
diff --git a/P3D/Content/Data/maps/battle/hiddengrotto/violet.dat b/P3D/Content/Data/maps/battle/hiddengrotto/violet.dat
index 296308155..ece2743b7 100644
Binary files a/P3D/Content/Data/maps/battle/hiddengrotto/violet.dat and b/P3D/Content/Data/maps/battle/hiddengrotto/violet.dat differ
diff --git a/P3D/Content/Data/maps/battle/icefall/basement.dat b/P3D/Content/Data/maps/battle/icefall/basement.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/icefall/basement.dat and b/P3D/Content/Data/maps/battle/icefall/basement.dat differ
diff --git a/P3D/Content/Data/maps/battle/icefall/bay.dat b/P3D/Content/Data/maps/battle/icefall/bay.dat
index 00ab29ec6..890f8ff5a 100644
Binary files a/P3D/Content/Data/maps/battle/icefall/bay.dat and b/P3D/Content/Data/maps/battle/icefall/bay.dat differ
diff --git a/P3D/Content/Data/maps/battle/icefall/ent.dat b/P3D/Content/Data/maps/battle/icefall/ent.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/icefall/ent.dat and b/P3D/Content/Data/maps/battle/icefall/ent.dat differ
diff --git a/P3D/Content/Data/maps/battle/icefall/ground.dat b/P3D/Content/Data/maps/battle/icefall/ground.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/icefall/ground.dat and b/P3D/Content/Data/maps/battle/icefall/ground.dat differ
diff --git a/P3D/Content/Data/maps/battle/icepath/1f.dat b/P3D/Content/Data/maps/battle/icepath/1f.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/icepath/1f.dat and b/P3D/Content/Data/maps/battle/icepath/1f.dat differ
diff --git a/P3D/Content/Data/maps/battle/icepath/2f.dat b/P3D/Content/Data/maps/battle/icepath/2f.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/icepath/2f.dat and b/P3D/Content/Data/maps/battle/icepath/2f.dat differ
diff --git a/P3D/Content/Data/maps/battle/icepath/3f.dat b/P3D/Content/Data/maps/battle/icepath/3f.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/icepath/3f.dat and b/P3D/Content/Data/maps/battle/icepath/3f.dat differ
diff --git a/P3D/Content/Data/maps/battle/icepath/4f.dat b/P3D/Content/Data/maps/battle/icepath/4f.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/icepath/4f.dat and b/P3D/Content/Data/maps/battle/icepath/4f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ilexforest.dat b/P3D/Content/Data/maps/battle/ilexforest.dat
index f95d40ebd..f451530bd 100644
Binary files a/P3D/Content/Data/maps/battle/ilexforest.dat and b/P3D/Content/Data/maps/battle/ilexforest.dat differ
diff --git a/P3D/Content/Data/maps/battle/indigo/bruno.dat b/P3D/Content/Data/maps/battle/indigo/bruno.dat
index 1fa430950..5f42bfda9 100644
Binary files a/P3D/Content/Data/maps/battle/indigo/bruno.dat and b/P3D/Content/Data/maps/battle/indigo/bruno.dat differ
diff --git a/P3D/Content/Data/maps/battle/indigo/inside.dat b/P3D/Content/Data/maps/battle/indigo/inside.dat
index 8483ba971..a60328a34 100644
Binary files a/P3D/Content/Data/maps/battle/indigo/inside.dat and b/P3D/Content/Data/maps/battle/indigo/inside.dat differ
diff --git a/P3D/Content/Data/maps/battle/indigo/karen.dat b/P3D/Content/Data/maps/battle/indigo/karen.dat
index e739edebf..a1b23fd94 100644
Binary files a/P3D/Content/Data/maps/battle/indigo/karen.dat and b/P3D/Content/Data/maps/battle/indigo/karen.dat differ
diff --git a/P3D/Content/Data/maps/battle/indigo/koga.dat b/P3D/Content/Data/maps/battle/indigo/koga.dat
index 849e8e16a..afe16d98a 100644
Binary files a/P3D/Content/Data/maps/battle/indigo/koga.dat and b/P3D/Content/Data/maps/battle/indigo/koga.dat differ
diff --git a/P3D/Content/Data/maps/battle/indigo/lance.dat b/P3D/Content/Data/maps/battle/indigo/lance.dat
index 6980e90c9..284d36076 100644
Binary files a/P3D/Content/Data/maps/battle/indigo/lance.dat and b/P3D/Content/Data/maps/battle/indigo/lance.dat differ
diff --git a/P3D/Content/Data/maps/battle/indigo/will.dat b/P3D/Content/Data/maps/battle/indigo/will.dat
index ae1689977..82d2d7175 100644
Binary files a/P3D/Content/Data/maps/battle/indigo/will.dat and b/P3D/Content/Data/maps/battle/indigo/will.dat differ
diff --git a/P3D/Content/Data/maps/battle/kanto0.dat b/P3D/Content/Data/maps/battle/kanto0.dat
index 000ebd880..4408a4015 100644
Binary files a/P3D/Content/Data/maps/battle/kanto0.dat and b/P3D/Content/Data/maps/battle/kanto0.dat differ
diff --git a/P3D/Content/Data/maps/battle/kin/bbridge.dat b/P3D/Content/Data/maps/battle/kin/bbridge.dat
index 4d0effbf0..0ba95d62d 100644
Binary files a/P3D/Content/Data/maps/battle/kin/bbridge.dat and b/P3D/Content/Data/maps/battle/kin/bbridge.dat differ
diff --git a/P3D/Content/Data/maps/battle/kin/berry.dat b/P3D/Content/Data/maps/battle/kin/berry.dat
index 469113692..590571583 100644
Binary files a/P3D/Content/Data/maps/battle/kin/berry.dat and b/P3D/Content/Data/maps/battle/kin/berry.dat differ
diff --git a/P3D/Content/Data/maps/battle/kin/town.dat b/P3D/Content/Data/maps/battle/kin/town.dat
index 00c4cee03..8cb7bc1e7 100644
Binary files a/P3D/Content/Data/maps/battle/kin/town.dat and b/P3D/Content/Data/maps/battle/kin/town.dat differ
diff --git a/P3D/Content/Data/maps/battle/knot/kindle.dat b/P3D/Content/Data/maps/battle/knot/kindle.dat
index 05c6d4b0b..4bce568fc 100644
Binary files a/P3D/Content/Data/maps/battle/knot/kindle.dat and b/P3D/Content/Data/maps/battle/knot/kindle.dat differ
diff --git a/P3D/Content/Data/maps/battle/knot/treasure.dat b/P3D/Content/Data/maps/battle/knot/treasure.dat
index 05c6d4b0b..4bce568fc 100644
Binary files a/P3D/Content/Data/maps/battle/knot/treasure.dat and b/P3D/Content/Data/maps/battle/knot/treasure.dat differ
diff --git a/P3D/Content/Data/maps/battle/kolben/assoffices.dat b/P3D/Content/Data/maps/battle/kolben/assoffices.dat
index c5d64012a..f120a029a 100644
Binary files a/P3D/Content/Data/maps/battle/kolben/assoffices.dat and b/P3D/Content/Data/maps/battle/kolben/assoffices.dat differ
diff --git a/P3D/Content/Data/maps/battle/kolben/basement.dat b/P3D/Content/Data/maps/battle/kolben/basement.dat
index c422f471e..cd792f3ee 100644
--- a/P3D/Content/Data/maps/battle/kolben/basement.dat
+++ b/P3D/Content/Data/maps/battle/kolben/basement.dat
@@ -1,4 +1,4 @@
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"Weather"{int[1]}}]}}
 
 Walls:
 {"EntityField"{ENT[{"EntityID"{str[WallBlock]}}{"Size"{intArr[16,3,9]}}{"Fill"{bool[0]}}{"Position"{sngArr[6,0,9]}}{"TexturePath"{str[House]}}{"Textures"{recArr[[16,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]}}]}}
diff --git a/P3D/Content/Data/maps/battle/kolben/biome/desert.dat b/P3D/Content/Data/maps/battle/kolben/biome/desert.dat
index dd10ee602..d10ed0eae 100644
--- a/P3D/Content/Data/maps/battle/kolben/biome/desert.dat
+++ b/P3D/Content/Data/maps/battle/kolben/biome/desert.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Desert]}}{"MusicLoop"{str[gts]}}{"CurrentRegion"{str[Sevii Islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[7]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[7]}}]}}
 
 Walls:
 {"EntityField"{ENT[{"EntityID"{str[AnimatedBlock]}}{"Size"{intArr[14,5,1]}}{"Fill"{bool[0]}}{"Position"{sngArr[7,0,8]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[160,32,16,16][176,32,16,16][192,32,16,16][208,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben]}}{"Rotation"{int[0]}}{"AnimationData"{intArr2D[[160,32,16,16,1,4,20,0,0]]}}]}}
diff --git a/P3D/Content/Data/maps/battle/kolben/biome/rainforest.dat b/P3D/Content/Data/maps/battle/kolben/biome/rainforest.dat
index fa06d54c0..820de2c0c 100644
--- a/P3D/Content/Data/maps/battle/kolben/biome/rainforest.dat
+++ b/P3D/Content/Data/maps/battle/kolben/biome/rainforest.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Rainforest]}}{"MusicLoop"{str[gts]}}{"CurrentRegion"{str[Sevii Islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[5]}}{"Weather"{int[2]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[5]}}{"Weather"{int[2]}}]}}
 
 Walls:
 {"EntityField"{ENT[{"EntityID"{str[AnimatedBlock]}}{"Size"{intArr[14,5,1]}}{"Fill"{bool[0]}}{"Position"{sngArr[7,0,8]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[160,32,16,16][176,32,16,16][192,32,16,16][208,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben]}}{"Rotation"{int[0]}}{"AnimationData"{intArr2D[[160,32,16,16,1,4,20,0,0]]}}]}}
diff --git a/P3D/Content/Data/maps/battle/kolben/biome/savanna.dat b/P3D/Content/Data/maps/battle/kolben/biome/savanna.dat
index c79d883d3..2b165471e 100644
--- a/P3D/Content/Data/maps/battle/kolben/biome/savanna.dat
+++ b/P3D/Content/Data/maps/battle/kolben/biome/savanna.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Savanna]}}{"MusicLoop"{str[gts]}}{"CurrentRegion"{str[Sevii Islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[5]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[5]}}]}}
 
 Walls:
 {"EntityField"{ENT[{"EntityID"{str[AnimatedBlock]}}{"Size"{intArr[14,5,1]}}{"Fill"{bool[0]}}{"Position"{sngArr[7,0,8]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[160,32,16,16][176,32,16,16][192,32,16,16][208,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben]}}{"Rotation"{int[0]}}{"AnimationData"{intArr2D[[160,32,16,16,1,4,20,0,0]]}}]}}
diff --git a/P3D/Content/Data/maps/battle/kolben/biome/taiga.dat b/P3D/Content/Data/maps/battle/kolben/biome/taiga.dat
index c91f5e12e..6d89ed44e 100644
--- a/P3D/Content/Data/maps/battle/kolben/biome/taiga.dat
+++ b/P3D/Content/Data/maps/battle/kolben/biome/taiga.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Taiga]}}{"MusicLoop"{str[gts]}}{"CurrentRegion"{str[Sevii Islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[3]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"Weather"{int[3]}}]}}
 
 Walls:
 {"EntityField"{ENT[{"EntityID"{str[AnimatedBlock]}}{"Size"{intArr[14,5,1]}}{"Fill"{bool[0]}}{"Position"{sngArr[7,0,8]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[160,32,16,16][176,32,16,16][192,32,16,16][208,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben]}}{"Rotation"{int[0]}}{"AnimationData"{intArr2D[[160,32,16,16,1,4,20,0,0]]}}]}}
diff --git a/P3D/Content/Data/maps/battle/kolben/devoffices.dat b/P3D/Content/Data/maps/battle/kolben/devoffices.dat
index c5d64012a..f120a029a 100644
Binary files a/P3D/Content/Data/maps/battle/kolben/devoffices.dat and b/P3D/Content/Data/maps/battle/kolben/devoffices.dat differ
diff --git a/P3D/Content/Data/maps/battle/kolben/lounge.dat b/P3D/Content/Data/maps/battle/kolben/lounge.dat
index c5d64012a..f120a029a 100644
Binary files a/P3D/Content/Data/maps/battle/kolben/lounge.dat and b/P3D/Content/Data/maps/battle/kolben/lounge.dat differ
diff --git a/P3D/Content/Data/maps/battle/kolben/servers.dat b/P3D/Content/Data/maps/battle/kolben/servers.dat
index c5d64012a..f120a029a 100644
Binary files a/P3D/Content/Data/maps/battle/kolben/servers.dat and b/P3D/Content/Data/maps/battle/kolben/servers.dat differ
diff --git a/P3D/Content/Data/maps/battle/liberty/garden.dat b/P3D/Content/Data/maps/battle/liberty/garden.dat
index 72efd6fd2..7929562c5 100644
--- a/P3D/Content/Data/maps/battle/liberty/garden.dat
+++ b/P3D/Content/Data/maps/battle/liberty/garden.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Liberty Garden]}}{"MusicLoop"{str[routemusic7]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
 
 Grass:
 {"Floor"{ENT[{"Size"{intArr[1,3]}}{"SeasonTexture"{str[Grass]}}{"Position"{intArr[15,1,2]}}{"TexturePath"{str[Routes]}}{"Texture"{rec[96,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/liberty/interior.dat b/P3D/Content/Data/maps/battle/liberty/interior.dat
index e6152f44f..bf4b4674c 100644
--- a/P3D/Content/Data/maps/battle/liberty/interior.dat
+++ b/P3D/Content/Data/maps/battle/liberty/interior.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Lighthouse Basement]}}{"MusicLoop"{str[darkcave]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[12,8]}}{"Position"{intArr[9,0,10]}}{"TexturePath"{str[park]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/liberty/room.dat b/P3D/Content/Data/maps/battle/liberty/room.dat
index e840659fe..c38a884a3 100644
--- a/P3D/Content/Data/maps/battle/liberty/room.dat
+++ b/P3D/Content/Data/maps/battle/liberty/room.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Lighthouse Basement]}}{"MusicLoop"{str[darkcave]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[4,7]}}{"Position"{intArr[10,0,10]}}{"TexturePath"{str[park]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/lighthouse/lighthouse0.dat b/P3D/Content/Data/maps/battle/lighthouse/lighthouse0.dat
index 6753e1b5c..60592bcaa 100644
Binary files a/P3D/Content/Data/maps/battle/lighthouse/lighthouse0.dat and b/P3D/Content/Data/maps/battle/lighthouse/lighthouse0.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/1.dat b/P3D/Content/Data/maps/battle/lostcave/1.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/1.dat and b/P3D/Content/Data/maps/battle/lostcave/1.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/2.dat b/P3D/Content/Data/maps/battle/lostcave/2.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/2.dat and b/P3D/Content/Data/maps/battle/lostcave/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/3.dat b/P3D/Content/Data/maps/battle/lostcave/3.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/3.dat and b/P3D/Content/Data/maps/battle/lostcave/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/4.dat b/P3D/Content/Data/maps/battle/lostcave/4.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/4.dat and b/P3D/Content/Data/maps/battle/lostcave/4.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/5.dat b/P3D/Content/Data/maps/battle/lostcave/5.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/5.dat and b/P3D/Content/Data/maps/battle/lostcave/5.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/6.dat b/P3D/Content/Data/maps/battle/lostcave/6.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/6.dat and b/P3D/Content/Data/maps/battle/lostcave/6.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/7.dat b/P3D/Content/Data/maps/battle/lostcave/7.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/7.dat and b/P3D/Content/Data/maps/battle/lostcave/7.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/8.dat b/P3D/Content/Data/maps/battle/lostcave/8.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/8.dat and b/P3D/Content/Data/maps/battle/lostcave/8.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/ent.dat b/P3D/Content/Data/maps/battle/lostcave/ent.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/ent.dat and b/P3D/Content/Data/maps/battle/lostcave/ent.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/extra1.dat b/P3D/Content/Data/maps/battle/lostcave/extra1.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/extra1.dat and b/P3D/Content/Data/maps/battle/lostcave/extra1.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/extra2.dat b/P3D/Content/Data/maps/battle/lostcave/extra2.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/extra2.dat and b/P3D/Content/Data/maps/battle/lostcave/extra2.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/extra3.dat b/P3D/Content/Data/maps/battle/lostcave/extra3.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/extra3.dat and b/P3D/Content/Data/maps/battle/lostcave/extra3.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/extra4.dat b/P3D/Content/Data/maps/battle/lostcave/extra4.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/extra4.dat and b/P3D/Content/Data/maps/battle/lostcave/extra4.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/ladder.dat b/P3D/Content/Data/maps/battle/lostcave/ladder.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/ladder.dat and b/P3D/Content/Data/maps/battle/lostcave/ladder.dat differ
diff --git a/P3D/Content/Data/maps/battle/lostcave/selphy.dat b/P3D/Content/Data/maps/battle/lostcave/selphy.dat
index cd02f3ce6..257774a9c 100644
Binary files a/P3D/Content/Data/maps/battle/lostcave/selphy.dat and b/P3D/Content/Data/maps/battle/lostcave/selphy.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/braille1.dat b/P3D/Content/Data/maps/battle/mtember/braille1.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/braille1.dat and b/P3D/Content/Data/maps/battle/mtember/braille1.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/braille2.dat b/P3D/Content/Data/maps/battle/mtember/braille2.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/braille2.dat and b/P3D/Content/Data/maps/battle/mtember/braille2.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/exterior.dat b/P3D/Content/Data/maps/battle/mtember/exterior.dat
index 70e11e5c2..c509a92b8 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/exterior.dat and b/P3D/Content/Data/maps/battle/mtember/exterior.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/peak.dat b/P3D/Content/Data/maps/battle/mtember/peak.dat
index 88049f8d7..497aa5c3a 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/peak.dat and b/P3D/Content/Data/maps/battle/mtember/peak.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/peakp1.dat b/P3D/Content/Data/maps/battle/mtember/peakp1.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/peakp1.dat and b/P3D/Content/Data/maps/battle/mtember/peakp1.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/peakp2.dat b/P3D/Content/Data/maps/battle/mtember/peakp2.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/peakp2.dat and b/P3D/Content/Data/maps/battle/mtember/peakp2.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/peakp3.dat b/P3D/Content/Data/maps/battle/mtember/peakp3.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/peakp3.dat and b/P3D/Content/Data/maps/battle/mtember/peakp3.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/secretpath1.dat b/P3D/Content/Data/maps/battle/mtember/secretpath1.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/secretpath1.dat and b/P3D/Content/Data/maps/battle/mtember/secretpath1.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/secretpath2.dat b/P3D/Content/Data/maps/battle/mtember/secretpath2.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/secretpath2.dat and b/P3D/Content/Data/maps/battle/mtember/secretpath2.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/secretpath3.dat b/P3D/Content/Data/maps/battle/mtember/secretpath3.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/secretpath3.dat and b/P3D/Content/Data/maps/battle/mtember/secretpath3.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/secretpath4.dat b/P3D/Content/Data/maps/battle/mtember/secretpath4.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/secretpath4.dat and b/P3D/Content/Data/maps/battle/mtember/secretpath4.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/secretpath5.dat b/P3D/Content/Data/maps/battle/mtember/secretpath5.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/secretpath5.dat and b/P3D/Content/Data/maps/battle/mtember/secretpath5.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtember/secretpath6.dat b/P3D/Content/Data/maps/battle/mtember/secretpath6.dat
index 6dbc0d942..5371f6e9b 100644
Binary files a/P3D/Content/Data/maps/battle/mtember/secretpath6.dat and b/P3D/Content/Data/maps/battle/mtember/secretpath6.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtmoon/main.dat b/P3D/Content/Data/maps/battle/mtmoon/main.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/mtmoon/main.dat and b/P3D/Content/Data/maps/battle/mtmoon/main.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtmoon/north.dat b/P3D/Content/Data/maps/battle/mtmoon/north.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/mtmoon/north.dat and b/P3D/Content/Data/maps/battle/mtmoon/north.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtmoon/south.dat b/P3D/Content/Data/maps/battle/mtmoon/south.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/mtmoon/south.dat and b/P3D/Content/Data/maps/battle/mtmoon/south.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtmortar/mtmortarbf1.dat b/P3D/Content/Data/maps/battle/mtmortar/mtmortarbf1.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/mtmortar/mtmortarbf1.dat and b/P3D/Content/Data/maps/battle/mtmortar/mtmortarbf1.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtmortar/mtmortarf1.dat b/P3D/Content/Data/maps/battle/mtmortar/mtmortarf1.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/mtmortar/mtmortarf1.dat and b/P3D/Content/Data/maps/battle/mtmortar/mtmortarf1.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtmortar/mtmortarf2.dat b/P3D/Content/Data/maps/battle/mtmortar/mtmortarf2.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/mtmortar/mtmortarf2.dat and b/P3D/Content/Data/maps/battle/mtmortar/mtmortarf2.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtmortar/mtmortarmain.dat b/P3D/Content/Data/maps/battle/mtmortar/mtmortarmain.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/mtmortar/mtmortarmain.dat and b/P3D/Content/Data/maps/battle/mtmortar/mtmortarmain.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtsilver/1f.dat b/P3D/Content/Data/maps/battle/mtsilver/1f.dat
index 4a5614513..671fd31ca 100644
Binary files a/P3D/Content/Data/maps/battle/mtsilver/1f.dat and b/P3D/Content/Data/maps/battle/mtsilver/1f.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtsilver/battlemap1.dat b/P3D/Content/Data/maps/battle/mtsilver/battlemap1.dat
index 47df093c7..1765d5c3c 100644
Binary files a/P3D/Content/Data/maps/battle/mtsilver/battlemap1.dat and b/P3D/Content/Data/maps/battle/mtsilver/battlemap1.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtsilver/expert.dat b/P3D/Content/Data/maps/battle/mtsilver/expert.dat
index 066c94136..9a70da3f5 100644
Binary files a/P3D/Content/Data/maps/battle/mtsilver/expert.dat and b/P3D/Content/Data/maps/battle/mtsilver/expert.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtsilver/exterior.dat b/P3D/Content/Data/maps/battle/mtsilver/exterior.dat
index c3a627565..05c215de6 100644
Binary files a/P3D/Content/Data/maps/battle/mtsilver/exterior.dat and b/P3D/Content/Data/maps/battle/mtsilver/exterior.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtsilver/peak.dat b/P3D/Content/Data/maps/battle/mtsilver/peak.dat
index ef7a9041c..847204483 100644
--- a/P3D/Content/Data/maps/battle/mtsilver/peak.dat
+++ b/P3D/Content/Data/maps/battle/mtsilver/peak.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Mt. Silver]}}{"MusicLoop"{str[wind]}}{"CurrentRegion"{str[Johto,Kanto]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[3]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[3]}}{"Lighting"{int[0]}}]}}
 
 Floor:
 Grass:
diff --git a/P3D/Content/Data/maps/battle/mtsilver/side.dat b/P3D/Content/Data/maps/battle/mtsilver/side.dat
index 328f1b4f2..f0deeb208 100644
Binary files a/P3D/Content/Data/maps/battle/mtsilver/side.dat and b/P3D/Content/Data/maps/battle/mtsilver/side.dat differ
diff --git a/P3D/Content/Data/maps/battle/mtsilver/snow.dat b/P3D/Content/Data/maps/battle/mtsilver/snow.dat
index 06b3871c1..c88ff32d0 100644
Binary files a/P3D/Content/Data/maps/battle/mtsilver/snow.dat and b/P3D/Content/Data/maps/battle/mtsilver/snow.dat differ
diff --git a/P3D/Content/Data/maps/battle/nationalpark/contest.dat b/P3D/Content/Data/maps/battle/nationalpark/contest.dat
index 35ed498a3..684519ea2 100644
Binary files a/P3D/Content/Data/maps/battle/nationalpark/contest.dat and b/P3D/Content/Data/maps/battle/nationalpark/contest.dat differ
diff --git a/P3D/Content/Data/maps/battle/nationalpark/nationalpark0.dat b/P3D/Content/Data/maps/battle/nationalpark/nationalpark0.dat
index 35ed498a3..684519ea2 100644
Binary files a/P3D/Content/Data/maps/battle/nationalpark/nationalpark0.dat and b/P3D/Content/Data/maps/battle/nationalpark/nationalpark0.dat differ
diff --git a/P3D/Content/Data/maps/battle/pvp.dat b/P3D/Content/Data/maps/battle/pvp.dat
index d85ee0fdb..78928fe65 100644
Binary files a/P3D/Content/Data/maps/battle/pvp.dat and b/P3D/Content/Data/maps/battle/pvp.dat differ
diff --git a/P3D/Content/Data/maps/battle/quest/canyonent.dat b/P3D/Content/Data/maps/battle/quest/canyonent.dat
index 72ab340d5..11efba4c8 100644
--- a/P3D/Content/Data/maps/battle/quest/canyonent.dat
+++ b/P3D/Content/Data/maps/battle/quest/canyonent.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Canyon Entrance]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[12,8]}}{"Position"{intArr[4,0,-13]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}{"Rotation"{int[1]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/sevault.dat b/P3D/Content/Data/maps/battle/quest/sevault.dat
index 2acd8c85c..aa113a793 100644
--- a/P3D/Content/Data/maps/battle/quest/sevault.dat
+++ b/P3D/Content/Data/maps/battle/quest/sevault.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Sevault Canyon]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}{"BattleMap"{str[quest\sevault.dat,19,2,-26.5]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}{"BattleMap"{str[quest\sevault.dat,19,2,-26.5]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[7,2]}}{"Position"{intArr[74,0,-17]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}{"Rotation"{int[0]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/dilford.dat b/P3D/Content/Data/maps/battle/quest/tanoby/dilford.dat
index 79ad35367..86c2ce892 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/dilford.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/dilford.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Dilford Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,13]}}{"Position"{intArr[4,0,7]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/liptoo.dat b/P3D/Content/Data/maps/battle/quest/tanoby/liptoo.dat
index 67216ea0b..8cd9b7842 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/liptoo.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/liptoo.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Liptoo Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,13]}}{"Position"{intArr[4,0,7]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/main.dat b/P3D/Content/Data/maps/battle/quest/tanoby/main.dat
index bdc44dcb0..71566766a 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/main.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/main.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Tanoby Ruins]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}{"BattleMap"{str[quest\tanoby\main.dat,106.7,0,3]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}{"BattleMap"{str[quest\tanoby\main.dat,106.7,0,3]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[17,12]}}{"Position"{intArr[112,0,3]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[16,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/monean.dat b/P3D/Content/Data/maps/battle/quest/tanoby/monean.dat
index 4e392c9ff..75c740b1b 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/monean.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/monean.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Monean Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,13]}}{"Position"{intArr[4,0,7]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/rixy.dat b/P3D/Content/Data/maps/battle/quest/tanoby/rixy.dat
index 48a5fc360..d8ddadfbb 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/rixy.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/rixy.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Rixy Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,13]}}{"Position"{intArr[4,0,7]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/scufib.dat b/P3D/Content/Data/maps/battle/quest/tanoby/scufib.dat
index c7bd8fb1e..8b3a02eb3 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/scufib.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/scufib.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Scufib Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,13]}}{"Position"{intArr[4,0,7]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/viapois.dat b/P3D/Content/Data/maps/battle/quest/tanoby/viapois.dat
index 86b1346e6..901ff33e6 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/viapois.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/viapois.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Viapois Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,13]}}{"Position"{intArr[4,0,7]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/tanoby/weepth.dat b/P3D/Content/Data/maps/battle/quest/tanoby/weepth.dat
index 50b6280ae..2f830b6d9 100644
--- a/P3D/Content/Data/maps/battle/quest/tanoby/weepth.dat
+++ b/P3D/Content/Data/maps/battle/quest/tanoby/weepth.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Weepth Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,13]}}{"Position"{intArr[4,0,7]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/double/1f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/double/1f.dat
index 6c87d88f3..30d268af9 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/double/1f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/double/1f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/double/2f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/double/2f.dat
index 6bd433d16..ce0a7ae4d 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/double/2f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/double/2f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/double/3f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/double/3f.dat
index 8688c42b3..454691bfe 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/double/3f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/double/3f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/double/4f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/double/4f.dat
index 1f6357daa..fdc6e66fb 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/double/4f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/double/4f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/double/5f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/double/5f.dat
index e039572ae..53a7c39af 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/double/5f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/double/5f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/double/6f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/double/6f.dat
index 3216ace69..7c8f87ed8 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/double/6f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/double/6f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/double/7f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/double/7f.dat
index 5956d6a32..09b07d11f 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/double/7f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/double/7f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/double/8f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/double/8f.dat
index 115a4f271..5a90b1b93 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/double/8f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/double/8f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/1f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/1f.dat
index 6c87d88f3..30d268af9 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/1f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/1f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/2f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/2f.dat
index 6bd433d16..ce0a7ae4d 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/2f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/2f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/3f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/3f.dat
index 8688c42b3..454691bfe 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/3f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/3f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/4f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/4f.dat
index 1f6357daa..fdc6e66fb 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/4f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/4f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/5f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/5f.dat
index e039572ae..53a7c39af 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/5f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/5f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/6f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/6f.dat
index 3216ace69..7c8f87ed8 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/6f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/6f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/7f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/7f.dat
index 5956d6a32..09b07d11f 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/7f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/7f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/8f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/8f.dat
index 115a4f271..5a90b1b93 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/knockout/8f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/knockout/8f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/main.dat b/P3D/Content/Data/maps/battle/quest/trainertower/main.dat
index 41c50bf08..1fbb6fccc 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/main.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/main.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[9,6]}}{"Position"{intArr[10,0,9]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/1f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/1f.dat
index 6c87d88f3..30d268af9 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/1f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/1f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/2f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/2f.dat
index 6bd433d16..ce0a7ae4d 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/2f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/2f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/3f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/3f.dat
index 8688c42b3..454691bfe 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/3f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/3f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/4f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/4f.dat
index 1f6357daa..fdc6e66fb 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/4f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/4f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/5f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/5f.dat
index e039572ae..53a7c39af 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/5f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/5f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/6f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/6f.dat
index 3216ace69..7c8f87ed8 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/6f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/6f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/7f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/7f.dat
index 5956d6a32..09b07d11f 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/7f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/7f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/8f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/8f.dat
index 115a4f271..5a90b1b93 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/mixed/8f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/mixed/8f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/single/1f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/single/1f.dat
index 6c87d88f3..30d268af9 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/single/1f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/single/1f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/single/2f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/single/2f.dat
index 6bd433d16..ce0a7ae4d 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/single/2f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/single/2f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/single/3f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/single/3f.dat
index 8688c42b3..454691bfe 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/single/3f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/single/3f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/single/4f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/single/4f.dat
index 1f6357daa..fdc6e66fb 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/single/4f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/single/4f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/single/5f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/single/5f.dat
index e039572ae..53a7c39af 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/single/5f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/single/5f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/single/6f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/single/6f.dat
index 3216ace69..7c8f87ed8 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/single/6f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/single/6f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/single/7f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/single/7f.dat
index 5956d6a32..09b07d11f 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/single/7f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/single/7f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/quest/trainertower/single/8f.dat b/P3D/Content/Data/maps/battle/quest/trainertower/single/8f.dat
index 115a4f271..5a90b1b93 100644
--- a/P3D/Content/Data/maps/battle/quest/trainertower/single/8f.dat
+++ b/P3D/Content/Data/maps/battle/quest/trainertower/single/8f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[16,10]}}{"Position"{intArr[6,0,7]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/battle/rocketbase/rocketbase1.dat b/P3D/Content/Data/maps/battle/rocketbase/rocketbase1.dat
index 66be9033c..8ee13d738 100644
Binary files a/P3D/Content/Data/maps/battle/rocketbase/rocketbase1.dat and b/P3D/Content/Data/maps/battle/rocketbase/rocketbase1.dat differ
diff --git a/P3D/Content/Data/maps/battle/rocketbase/rocketbase2.dat b/P3D/Content/Data/maps/battle/rocketbase/rocketbase2.dat
index 4617e0843..ad676c0cb 100644
Binary files a/P3D/Content/Data/maps/battle/rocketbase/rocketbase2.dat and b/P3D/Content/Data/maps/battle/rocketbase/rocketbase2.dat differ
diff --git a/P3D/Content/Data/maps/battle/rocketbase/rocketbase3.dat b/P3D/Content/Data/maps/battle/rocketbase/rocketbase3.dat
index 099281037..ff5b91848 100644
Binary files a/P3D/Content/Data/maps/battle/rocketbase/rocketbase3.dat and b/P3D/Content/Data/maps/battle/rocketbase/rocketbase3.dat differ
diff --git a/P3D/Content/Data/maps/battle/rocktunnel/bf1.dat b/P3D/Content/Data/maps/battle/rocktunnel/bf1.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/rocktunnel/bf1.dat and b/P3D/Content/Data/maps/battle/rocktunnel/bf1.dat differ
diff --git a/P3D/Content/Data/maps/battle/rocktunnel/bf2.dat b/P3D/Content/Data/maps/battle/rocktunnel/bf2.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/rocktunnel/bf2.dat and b/P3D/Content/Data/maps/battle/rocktunnel/bf2.dat differ
diff --git a/P3D/Content/Data/maps/battle/route29.dat b/P3D/Content/Data/maps/battle/route29.dat
index 82c312299..19639195c 100644
Binary files a/P3D/Content/Data/maps/battle/route29.dat and b/P3D/Content/Data/maps/battle/route29.dat differ
diff --git a/P3D/Content/Data/maps/battle/route32.dat b/P3D/Content/Data/maps/battle/route32.dat
index 3c57261db..0eb54679c 100644
Binary files a/P3D/Content/Data/maps/battle/route32.dat and b/P3D/Content/Data/maps/battle/route32.dat differ
diff --git a/P3D/Content/Data/maps/battle/route33.dat b/P3D/Content/Data/maps/battle/route33.dat
index a4ee65779..2cf59691e 100644
Binary files a/P3D/Content/Data/maps/battle/route33.dat and b/P3D/Content/Data/maps/battle/route33.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route10.dat b/P3D/Content/Data/maps/battle/routes/route10.dat
index 253017ba0..95865f050 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route10.dat and b/P3D/Content/Data/maps/battle/routes/route10.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route17.dat b/P3D/Content/Data/maps/battle/routes/route17.dat
index 79fb823ff..59f604b91 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route17.dat and b/P3D/Content/Data/maps/battle/routes/route17.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route26.dat b/P3D/Content/Data/maps/battle/routes/route26.dat
index cde7b610f..d0fcd4ea3 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route26.dat and b/P3D/Content/Data/maps/battle/routes/route26.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route27.dat b/P3D/Content/Data/maps/battle/routes/route27.dat
index 612e862c5..d6e1104fb 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route27.dat and b/P3D/Content/Data/maps/battle/routes/route27.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route28.dat b/P3D/Content/Data/maps/battle/routes/route28.dat
index de5fc14f3..3e513db34 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route28.dat and b/P3D/Content/Data/maps/battle/routes/route28.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route34.dat b/P3D/Content/Data/maps/battle/routes/route34.dat
index 7a870c344..ceedda771 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route34.dat and b/P3D/Content/Data/maps/battle/routes/route34.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route40.dat b/P3D/Content/Data/maps/battle/routes/route40.dat
index 634bc64e9..d04d0d955 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route40.dat and b/P3D/Content/Data/maps/battle/routes/route40.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route44.dat b/P3D/Content/Data/maps/battle/routes/route44.dat
index cde7b610f..d0fcd4ea3 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route44.dat and b/P3D/Content/Data/maps/battle/routes/route44.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route45.dat b/P3D/Content/Data/maps/battle/routes/route45.dat
index cde7b610f..d0fcd4ea3 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route45.dat and b/P3D/Content/Data/maps/battle/routes/route45.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route46.dat b/P3D/Content/Data/maps/battle/routes/route46.dat
index cde7b610f..d0fcd4ea3 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route46.dat and b/P3D/Content/Data/maps/battle/routes/route46.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route47/1.dat b/P3D/Content/Data/maps/battle/routes/route47/1.dat
index 4b415241b..98eb6ba54 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route47/1.dat and b/P3D/Content/Data/maps/battle/routes/route47/1.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route47/2.dat b/P3D/Content/Data/maps/battle/routes/route47/2.dat
index 4b415241b..98eb6ba54 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route47/2.dat and b/P3D/Content/Data/maps/battle/routes/route47/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route47/3.dat b/P3D/Content/Data/maps/battle/routes/route47/3.dat
index 4b415241b..98eb6ba54 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route47/3.dat and b/P3D/Content/Data/maps/battle/routes/route47/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route47/c1.dat b/P3D/Content/Data/maps/battle/routes/route47/c1.dat
index fddc3724f..d694dfa3a 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route47/c1.dat and b/P3D/Content/Data/maps/battle/routes/route47/c1.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route47/c2.dat b/P3D/Content/Data/maps/battle/routes/route47/c2.dat
index fddc3724f..d694dfa3a 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route47/c2.dat and b/P3D/Content/Data/maps/battle/routes/route47/c2.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route47/cb.dat b/P3D/Content/Data/maps/battle/routes/route47/cb.dat
index fddc3724f..d694dfa3a 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route47/cb.dat and b/P3D/Content/Data/maps/battle/routes/route47/cb.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route47/embtower/kyurem.dat b/P3D/Content/Data/maps/battle/routes/route47/embtower/kyurem.dat
index ef2aa7e33..09c4628a2 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route47/embtower/kyurem.dat and b/P3D/Content/Data/maps/battle/routes/route47/embtower/kyurem.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route47/embtower/reshiram.dat b/P3D/Content/Data/maps/battle/routes/route47/embtower/reshiram.dat
index 1368f6cd7..260c47527 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route47/embtower/reshiram.dat and b/P3D/Content/Data/maps/battle/routes/route47/embtower/reshiram.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route47/embtower/zekrom.dat b/P3D/Content/Data/maps/battle/routes/route47/embtower/zekrom.dat
index 4d9ab5807..c8755e4b0 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route47/embtower/zekrom.dat and b/P3D/Content/Data/maps/battle/routes/route47/embtower/zekrom.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route48.dat b/P3D/Content/Data/maps/battle/routes/route48.dat
index 92029ae6c..bdf693444 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route48.dat and b/P3D/Content/Data/maps/battle/routes/route48.dat differ
diff --git a/P3D/Content/Data/maps/battle/routes/route9.dat b/P3D/Content/Data/maps/battle/routes/route9.dat
index b74f1f9f7..39946ea7d 100644
Binary files a/P3D/Content/Data/maps/battle/routes/route9.dat and b/P3D/Content/Data/maps/battle/routes/route9.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/0.dat b/P3D/Content/Data/maps/battle/safarizone/areas/0.dat
index 38924f8d7..c96623a75 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/0.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/0.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/1.dat b/P3D/Content/Data/maps/battle/safarizone/areas/1.dat
index 4c49063c8..e8ff2849f 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/1.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/1.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/10.dat b/P3D/Content/Data/maps/battle/safarizone/areas/10.dat
index a43694989..57e6aa9be 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/10.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/10.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/11.dat b/P3D/Content/Data/maps/battle/safarizone/areas/11.dat
index d62fe3bda..2ce47d1f0 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/11.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/11.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/12.dat b/P3D/Content/Data/maps/battle/safarizone/areas/12.dat
index c805717b9..0ab0fcc86 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/12.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/12.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/13.dat b/P3D/Content/Data/maps/battle/safarizone/areas/13.dat
index fa26565ef..728ebcf5f 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/13.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/13.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/14.dat b/P3D/Content/Data/maps/battle/safarizone/areas/14.dat
index b66b93442..363bb6352 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/14.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/14.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/15.dat b/P3D/Content/Data/maps/battle/safarizone/areas/15.dat
index 80c8d4bc6..50fdd8838 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/15.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/15.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/16.dat b/P3D/Content/Data/maps/battle/safarizone/areas/16.dat
index ad79511b6..011507137 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/16.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/16.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/17.dat b/P3D/Content/Data/maps/battle/safarizone/areas/17.dat
index 381b47142..991f58d20 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/17.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/17.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/18.dat b/P3D/Content/Data/maps/battle/safarizone/areas/18.dat
index cc99e5aa2..2cc815c5d 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/18.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/18.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/19.dat b/P3D/Content/Data/maps/battle/safarizone/areas/19.dat
index 38924f8d7..c96623a75 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/19.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/19.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/2.dat b/P3D/Content/Data/maps/battle/safarizone/areas/2.dat
index a4e9961ea..32df68e76 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/2.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/3.dat b/P3D/Content/Data/maps/battle/safarizone/areas/3.dat
index 343771ade..20e6188cc 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/3.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/4.dat b/P3D/Content/Data/maps/battle/safarizone/areas/4.dat
index 685761157..e7753eed5 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/4.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/4.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/5.dat b/P3D/Content/Data/maps/battle/safarizone/areas/5.dat
index 7d7acfe60..96e385c10 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/5.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/5.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/6.dat b/P3D/Content/Data/maps/battle/safarizone/areas/6.dat
index a7a6dbdef..ef923a975 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/6.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/6.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/7.dat b/P3D/Content/Data/maps/battle/safarizone/areas/7.dat
index 0b02be9fa..d41d7c920 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/7.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/7.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/8.dat b/P3D/Content/Data/maps/battle/safarizone/areas/8.dat
index a43694989..57e6aa9be 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/8.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/8.dat differ
diff --git a/P3D/Content/Data/maps/battle/safarizone/areas/9.dat b/P3D/Content/Data/maps/battle/safarizone/areas/9.dat
index a43694989..57e6aa9be 100644
Binary files a/P3D/Content/Data/maps/battle/safarizone/areas/9.dat and b/P3D/Content/Data/maps/battle/safarizone/areas/9.dat differ
diff --git a/P3D/Content/Data/maps/battle/saffron/underground0.dat b/P3D/Content/Data/maps/battle/saffron/underground0.dat
index 0156e61b3..59d9db1a8 100644
Binary files a/P3D/Content/Data/maps/battle/saffron/underground0.dat and b/P3D/Content/Data/maps/battle/saffron/underground0.dat differ
diff --git a/P3D/Content/Data/maps/battle/seafoam/bf1.dat b/P3D/Content/Data/maps/battle/seafoam/bf1.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/seafoam/bf1.dat and b/P3D/Content/Data/maps/battle/seafoam/bf1.dat differ
diff --git a/P3D/Content/Data/maps/battle/seafoam/bf2.dat b/P3D/Content/Data/maps/battle/seafoam/bf2.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/seafoam/bf2.dat and b/P3D/Content/Data/maps/battle/seafoam/bf2.dat differ
diff --git a/P3D/Content/Data/maps/battle/seafoam/bf3.dat b/P3D/Content/Data/maps/battle/seafoam/bf3.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/seafoam/bf3.dat and b/P3D/Content/Data/maps/battle/seafoam/bf3.dat differ
diff --git a/P3D/Content/Data/maps/battle/seafoam/bf4.dat b/P3D/Content/Data/maps/battle/seafoam/bf4.dat
index b3b6fdf99..6b20307c3 100644
Binary files a/P3D/Content/Data/maps/battle/seafoam/bf4.dat and b/P3D/Content/Data/maps/battle/seafoam/bf4.dat differ
diff --git a/P3D/Content/Data/maps/battle/slowpokewell/slowpokewell1f.dat b/P3D/Content/Data/maps/battle/slowpokewell/slowpokewell1f.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/slowpokewell/slowpokewell1f.dat and b/P3D/Content/Data/maps/battle/slowpokewell/slowpokewell1f.dat differ
diff --git a/P3D/Content/Data/maps/battle/slowpokewell/slowpokewellb1f.dat b/P3D/Content/Data/maps/battle/slowpokewell/slowpokewellb1f.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/slowpokewell/slowpokewellb1f.dat and b/P3D/Content/Data/maps/battle/slowpokewell/slowpokewellb1f.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/bf1.dat b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/bf1.dat
index ec1f64cac..9c76eeb9d 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/bf1.dat and b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/bf1.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/2.dat b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/2.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/2.dat and b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/3.dat b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/3.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/3.dat and b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/4.dat b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/4.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/4.dat and b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/4.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/5.dat b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/5.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/5.dat and b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/5.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/6.dat b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/6.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/6.dat and b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/6.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/7.dat b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/7.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/7.dat and b/P3D/Content/Data/maps/battle/ssaqua/firsttrip/cabins/7.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/olivine/bf1.dat b/P3D/Content/Data/maps/battle/ssaqua/olivine/bf1.dat
index ec1f64cac..9c76eeb9d 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/olivine/bf1.dat and b/P3D/Content/Data/maps/battle/ssaqua/olivine/bf1.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/2.dat b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/2.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/2.dat and b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/3.dat b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/3.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/3.dat and b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/4.dat b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/4.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/4.dat and b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/4.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/5.dat b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/5.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/5.dat and b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/5.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/6.dat b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/6.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/6.dat and b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/6.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/7.dat b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/7.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/7.dat and b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/7.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/8.dat b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/8.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/8.dat and b/P3D/Content/Data/maps/battle/ssaqua/olivine/cabins/8.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/vermilion/bf1.dat b/P3D/Content/Data/maps/battle/ssaqua/vermilion/bf1.dat
index ec1f64cac..9c76eeb9d 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/vermilion/bf1.dat and b/P3D/Content/Data/maps/battle/ssaqua/vermilion/bf1.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/2.dat b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/2.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/2.dat and b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/3.dat b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/3.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/3.dat and b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/4.dat b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/4.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/4.dat and b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/4.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/5.dat b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/5.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/5.dat and b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/5.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/6.dat b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/6.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/6.dat and b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/6.dat differ
diff --git a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/7.dat b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/7.dat
index e6562ef50..d273ac378 100644
Binary files a/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/7.dat and b/P3D/Content/Data/maps/battle/ssaqua/vermilion/cabins/7.dat differ
diff --git a/P3D/Content/Data/maps/battle/tohjofalls.dat b/P3D/Content/Data/maps/battle/tohjofalls.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/tohjofalls.dat and b/P3D/Content/Data/maps/battle/tohjofalls.dat differ
diff --git a/P3D/Content/Data/maps/battle/tohjofalls/hideout.dat b/P3D/Content/Data/maps/battle/tohjofalls/hideout.dat
index 730ff782f..5d855868b 100644
Binary files a/P3D/Content/Data/maps/battle/tohjofalls/hideout.dat and b/P3D/Content/Data/maps/battle/tohjofalls/hideout.dat differ
diff --git a/P3D/Content/Data/maps/battle/twirl forest/0/0.dat b/P3D/Content/Data/maps/battle/twirl forest/0/0.dat
index 806768a57..aecb7de1f 100644
Binary files a/P3D/Content/Data/maps/battle/twirl forest/0/0.dat and b/P3D/Content/Data/maps/battle/twirl forest/0/0.dat differ
diff --git a/P3D/Content/Data/maps/battle/twirl forest/0/1.dat b/P3D/Content/Data/maps/battle/twirl forest/0/1.dat
index 806768a57..aecb7de1f 100644
Binary files a/P3D/Content/Data/maps/battle/twirl forest/0/1.dat and b/P3D/Content/Data/maps/battle/twirl forest/0/1.dat differ
diff --git a/P3D/Content/Data/maps/battle/twirl forest/0/10.dat b/P3D/Content/Data/maps/battle/twirl forest/0/10.dat
index 806768a57..aecb7de1f 100644
Binary files a/P3D/Content/Data/maps/battle/twirl forest/0/10.dat and b/P3D/Content/Data/maps/battle/twirl forest/0/10.dat differ
diff --git a/P3D/Content/Data/maps/battle/twirl forest/0/11.dat b/P3D/Content/Data/maps/battle/twirl forest/0/11.dat
index 806768a57..aecb7de1f 100644
Binary files a/P3D/Content/Data/maps/battle/twirl forest/0/11.dat and b/P3D/Content/Data/maps/battle/twirl forest/0/11.dat differ
diff --git a/P3D/Content/Data/maps/battle/twirl forest/0/15.dat b/P3D/Content/Data/maps/battle/twirl forest/0/15.dat
index 806768a57..aecb7de1f 100644
Binary files a/P3D/Content/Data/maps/battle/twirl forest/0/15.dat and b/P3D/Content/Data/maps/battle/twirl forest/0/15.dat differ
diff --git a/P3D/Content/Data/maps/battle/twirl forest/0/2.dat b/P3D/Content/Data/maps/battle/twirl forest/0/2.dat
index 806768a57..aecb7de1f 100644
Binary files a/P3D/Content/Data/maps/battle/twirl forest/0/2.dat and b/P3D/Content/Data/maps/battle/twirl forest/0/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/twirl forest/0/3.dat b/P3D/Content/Data/maps/battle/twirl forest/0/3.dat
index 806768a57..aecb7de1f 100644
Binary files a/P3D/Content/Data/maps/battle/twirl forest/0/3.dat and b/P3D/Content/Data/maps/battle/twirl forest/0/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/twirl forest/0/4.dat b/P3D/Content/Data/maps/battle/twirl forest/0/4.dat
index 806768a57..aecb7de1f 100644
Binary files a/P3D/Content/Data/maps/battle/twirl forest/0/4.dat and b/P3D/Content/Data/maps/battle/twirl forest/0/4.dat differ
diff --git a/P3D/Content/Data/maps/battle/twirl forest/0/5.dat b/P3D/Content/Data/maps/battle/twirl forest/0/5.dat
index 806768a57..aecb7de1f 100644
Binary files a/P3D/Content/Data/maps/battle/twirl forest/0/5.dat and b/P3D/Content/Data/maps/battle/twirl forest/0/5.dat differ
diff --git a/P3D/Content/Data/maps/battle/twirl forest/0/9.dat b/P3D/Content/Data/maps/battle/twirl forest/0/9.dat
index 806768a57..aecb7de1f 100644
Binary files a/P3D/Content/Data/maps/battle/twirl forest/0/9.dat and b/P3D/Content/Data/maps/battle/twirl forest/0/9.dat differ
diff --git a/P3D/Content/Data/maps/battle/underwatercave/main.dat b/P3D/Content/Data/maps/battle/underwatercave/main.dat
index caf292af5..89ad70420 100644
--- a/P3D/Content/Data/maps/battle/underwatercave/main.dat
+++ b/P3D/Content/Data/maps/battle/underwatercave/main.dat
@@ -1,4 +1,4 @@
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[1]}}{"Lightning"{int[3]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"Weather"{int[1]}}{"Lighting"{int[3]}}]}}
 
 {"Backdrop"{BAC[{"Position"{sngArr[-20,6.5,-20]}}{"Size"{intArr[70,65]}}{"Rotation"{sngArr[0,0,0]}}{"Type"{str[texture]}}{"TexturePath"{str[UnderwaterCave]}}{"Texture"{rec[16,0,16,16]}}]}}
 
diff --git a/P3D/Content/Data/maps/battle/underwatercave/manaphy.dat b/P3D/Content/Data/maps/battle/underwatercave/manaphy.dat
index 26f1c15f5..f3be3acd3 100644
--- a/P3D/Content/Data/maps/battle/underwatercave/manaphy.dat
+++ b/P3D/Content/Data/maps/battle/underwatercave/manaphy.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Underwater Path]}}{"MusicLoop"{str[darkcave]}}{"WildPokemon"{bool[1]}}{"OverworldPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[4]}}{"Weather"{int[4]}}{"Lightning"{int[3]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[4]}}{"Weather"{int[4]}}{"Lighting"{int[3]}}]}}
 Floor:
 	Normal Floor:
 		{"EntityField"{ENT[{"Size"{intArr[11,11]}}{"Position"{sngArr[0,-0.25,0]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}}
diff --git a/P3D/Content/Data/maps/battle/underwatercave/surface.dat b/P3D/Content/Data/maps/battle/underwatercave/surface.dat
index 25251b99f..0c117708b 100644
Binary files a/P3D/Content/Data/maps/battle/underwatercave/surface.dat and b/P3D/Content/Data/maps/battle/underwatercave/surface.dat differ
diff --git a/P3D/Content/Data/maps/battle/underwatercave/underwater.dat b/P3D/Content/Data/maps/battle/underwatercave/underwater.dat
index ccbc915d3..bafdf38ca 100644
--- a/P3D/Content/Data/maps/battle/underwatercave/underwater.dat
+++ b/P3D/Content/Data/maps/battle/underwatercave/underwater.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Underwater Path]}}{"MusicLoop"{str[darkcave]}}{"WildPokemon"{bool[1]}}{"OverworldPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[4]}}{"Weather"{int[4]}}{"Lightning"{int[3]}}{"SurfingBattleMap"{str[underwatercave\underwater.dat,-7,0,14]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[4]}}{"Weather"{int[4]}}{"Lighting"{int[3]}}{"SurfingBattleMap"{str[underwatercave\underwater.dat,-7,0,14]}}]}}
 
 
 \\Internal Part:
diff --git a/P3D/Content/Data/maps/battle/underwatercave/volcano.dat b/P3D/Content/Data/maps/battle/underwatercave/volcano.dat
index 2c37adff5..f96233b3b 100644
Binary files a/P3D/Content/Data/maps/battle/underwatercave/volcano.dat and b/P3D/Content/Data/maps/battle/underwatercave/volcano.dat differ
diff --git a/P3D/Content/Data/maps/battle/unioncave/unioncavebf1.dat b/P3D/Content/Data/maps/battle/unioncave/unioncavebf1.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/unioncave/unioncavebf1.dat and b/P3D/Content/Data/maps/battle/unioncave/unioncavebf1.dat differ
diff --git a/P3D/Content/Data/maps/battle/unioncave/unioncavebf2.dat b/P3D/Content/Data/maps/battle/unioncave/unioncavebf2.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/unioncave/unioncavebf2.dat and b/P3D/Content/Data/maps/battle/unioncave/unioncavebf2.dat differ
diff --git a/P3D/Content/Data/maps/battle/unioncave/unioncavef1.dat b/P3D/Content/Data/maps/battle/unioncave/unioncavef1.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/unioncave/unioncavef1.dat and b/P3D/Content/Data/maps/battle/unioncave/unioncavef1.dat differ
diff --git a/P3D/Content/Data/maps/battle/v_forest/main.dat b/P3D/Content/Data/maps/battle/v_forest/main.dat
index 986b4307c..a46a27806 100644
Binary files a/P3D/Content/Data/maps/battle/v_forest/main.dat and b/P3D/Content/Data/maps/battle/v_forest/main.dat differ
diff --git a/P3D/Content/Data/maps/battle/victoryroad/1.dat b/P3D/Content/Data/maps/battle/victoryroad/1.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/victoryroad/1.dat and b/P3D/Content/Data/maps/battle/victoryroad/1.dat differ
diff --git a/P3D/Content/Data/maps/battle/victoryroad/2.dat b/P3D/Content/Data/maps/battle/victoryroad/2.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/victoryroad/2.dat and b/P3D/Content/Data/maps/battle/victoryroad/2.dat differ
diff --git a/P3D/Content/Data/maps/battle/victoryroad/3.dat b/P3D/Content/Data/maps/battle/victoryroad/3.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/victoryroad/3.dat and b/P3D/Content/Data/maps/battle/victoryroad/3.dat differ
diff --git a/P3D/Content/Data/maps/battle/violet.dat b/P3D/Content/Data/maps/battle/violet.dat
index 6c8b633f7..8a7a6ac43 100644
Binary files a/P3D/Content/Data/maps/battle/violet.dat and b/P3D/Content/Data/maps/battle/violet.dat differ
diff --git a/P3D/Content/Data/maps/battle/violet/sprouttowerf1.dat b/P3D/Content/Data/maps/battle/violet/sprouttowerf1.dat
index 4c8066db0..a4d4c8608 100644
Binary files a/P3D/Content/Data/maps/battle/violet/sprouttowerf1.dat and b/P3D/Content/Data/maps/battle/violet/sprouttowerf1.dat differ
diff --git a/P3D/Content/Data/maps/battle/violet/sprouttowerf2.dat b/P3D/Content/Data/maps/battle/violet/sprouttowerf2.dat
index 4c8066db0..a4d4c8608 100644
Binary files a/P3D/Content/Data/maps/battle/violet/sprouttowerf2.dat and b/P3D/Content/Data/maps/battle/violet/sprouttowerf2.dat differ
diff --git a/P3D/Content/Data/maps/battle/violet/sprouttowerf3.dat b/P3D/Content/Data/maps/battle/violet/sprouttowerf3.dat
index 4c8066db0..a4d4c8608 100644
Binary files a/P3D/Content/Data/maps/battle/violet/sprouttowerf3.dat and b/P3D/Content/Data/maps/battle/violet/sprouttowerf3.dat differ
diff --git a/P3D/Content/Data/maps/battle/viridian/trainerhouse/arena.dat b/P3D/Content/Data/maps/battle/viridian/trainerhouse/arena.dat
index b717d9838..ca2e3d2bc 100644
Binary files a/P3D/Content/Data/maps/battle/viridian/trainerhouse/arena.dat and b/P3D/Content/Data/maps/battle/viridian/trainerhouse/arena.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/1fne.dat b/P3D/Content/Data/maps/battle/whirlislands/1fne.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/1fne.dat and b/P3D/Content/Data/maps/battle/whirlislands/1fne.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/1fnw.dat b/P3D/Content/Data/maps/battle/whirlislands/1fnw.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/1fnw.dat and b/P3D/Content/Data/maps/battle/whirlislands/1fnw.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/1fse.dat b/P3D/Content/Data/maps/battle/whirlislands/1fse.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/1fse.dat and b/P3D/Content/Data/maps/battle/whirlislands/1fse.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/1fsw.dat b/P3D/Content/Data/maps/battle/whirlislands/1fsw.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/1fsw.dat and b/P3D/Content/Data/maps/battle/whirlislands/1fsw.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/bf1main.dat b/P3D/Content/Data/maps/battle/whirlislands/bf1main.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/bf1main.dat and b/P3D/Content/Data/maps/battle/whirlislands/bf1main.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/lugia.dat b/P3D/Content/Data/maps/battle/whirlislands/lugia.dat
index 8b4e2ab5a..46784ca20 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/lugia.dat and b/P3D/Content/Data/maps/battle/whirlislands/lugia.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/sc1.dat b/P3D/Content/Data/maps/battle/whirlislands/sc1.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/sc1.dat and b/P3D/Content/Data/maps/battle/whirlislands/sc1.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/sc2.dat b/P3D/Content/Data/maps/battle/whirlislands/sc2.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/sc2.dat and b/P3D/Content/Data/maps/battle/whirlislands/sc2.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/sc3.dat b/P3D/Content/Data/maps/battle/whirlislands/sc3.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/sc3.dat and b/P3D/Content/Data/maps/battle/whirlislands/sc3.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/sc4.dat b/P3D/Content/Data/maps/battle/whirlislands/sc4.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/sc4.dat and b/P3D/Content/Data/maps/battle/whirlislands/sc4.dat differ
diff --git a/P3D/Content/Data/maps/battle/whirlislands/wfall.dat b/P3D/Content/Data/maps/battle/whirlislands/wfall.dat
index cb4ac98a4..fb73f7229 100644
Binary files a/P3D/Content/Data/maps/battle/whirlislands/wfall.dat and b/P3D/Content/Data/maps/battle/whirlislands/wfall.dat differ
diff --git a/P3D/Content/Data/maps/blackthorn.dat b/P3D/Content/Data/maps/blackthorn.dat
index d3f8c0213..57368b286 100644
Binary files a/P3D/Content/Data/maps/blackthorn.dat and b/P3D/Content/Data/maps/blackthorn.dat differ
diff --git a/P3D/Content/Data/maps/blackthorn/000.dat b/P3D/Content/Data/maps/blackthorn/000.dat
index 16f779405..166f5adb1 100644
Binary files a/P3D/Content/Data/maps/blackthorn/000.dat and b/P3D/Content/Data/maps/blackthorn/000.dat differ
diff --git a/P3D/Content/Data/maps/blackthorn/001.dat b/P3D/Content/Data/maps/blackthorn/001.dat
index 1c7b9e996..79fe3aae1 100644
Binary files a/P3D/Content/Data/maps/blackthorn/001.dat and b/P3D/Content/Data/maps/blackthorn/001.dat differ
diff --git a/P3D/Content/Data/maps/blackthorn/002.dat b/P3D/Content/Data/maps/blackthorn/002.dat
index 8c9240380..cd735f20c 100644
Binary files a/P3D/Content/Data/maps/blackthorn/002.dat and b/P3D/Content/Data/maps/blackthorn/002.dat differ
diff --git a/P3D/Content/Data/maps/blackthorn/center.dat b/P3D/Content/Data/maps/blackthorn/center.dat
index b519570b0..f2e4c28f1 100644
Binary files a/P3D/Content/Data/maps/blackthorn/center.dat and b/P3D/Content/Data/maps/blackthorn/center.dat differ
diff --git a/P3D/Content/Data/maps/blackthorn/mart.dat b/P3D/Content/Data/maps/blackthorn/mart.dat
index dc8bea8f7..2e2e628dc 100644
Binary files a/P3D/Content/Data/maps/blackthorn/mart.dat and b/P3D/Content/Data/maps/blackthorn/mart.dat differ
diff --git a/P3D/Content/Data/maps/boon/1.dat b/P3D/Content/Data/maps/boon/1.dat
index 621cad7ee..60f0d345e 100644
Binary files a/P3D/Content/Data/maps/boon/1.dat and b/P3D/Content/Data/maps/boon/1.dat differ
diff --git a/P3D/Content/Data/maps/boon/2.dat b/P3D/Content/Data/maps/boon/2.dat
index 5f792505d..e898d74e7 100644
Binary files a/P3D/Content/Data/maps/boon/2.dat and b/P3D/Content/Data/maps/boon/2.dat differ
diff --git a/P3D/Content/Data/maps/boon/cape.dat b/P3D/Content/Data/maps/boon/cape.dat
index c2e3a4917..eadec6a62 100644
Binary files a/P3D/Content/Data/maps/boon/cape.dat and b/P3D/Content/Data/maps/boon/cape.dat differ
diff --git a/P3D/Content/Data/maps/boon/capehouse.dat b/P3D/Content/Data/maps/boon/capehouse.dat
index ca194d032..62486032d 100644
Binary files a/P3D/Content/Data/maps/boon/capehouse.dat and b/P3D/Content/Data/maps/boon/capehouse.dat differ
diff --git a/P3D/Content/Data/maps/boon/center.dat b/P3D/Content/Data/maps/boon/center.dat
index 06f30ff20..6dc025591 100644
Binary files a/P3D/Content/Data/maps/boon/center.dat and b/P3D/Content/Data/maps/boon/center.dat differ
diff --git a/P3D/Content/Data/maps/boon/dock.dat b/P3D/Content/Data/maps/boon/dock.dat
index 329dce984..69e1f9487 100644
Binary files a/P3D/Content/Data/maps/boon/dock.dat and b/P3D/Content/Data/maps/boon/dock.dat differ
diff --git a/P3D/Content/Data/maps/boon/town.dat b/P3D/Content/Data/maps/boon/town.dat
index 5886477ed..2f7aa60b1 100644
Binary files a/P3D/Content/Data/maps/boon/town.dat and b/P3D/Content/Data/maps/boon/town.dat differ
diff --git a/P3D/Content/Data/maps/burnedtower/burnedtower1f.dat b/P3D/Content/Data/maps/burnedtower/burnedtower1f.dat
index e3fd5bd4c..a879daec3 100644
Binary files a/P3D/Content/Data/maps/burnedtower/burnedtower1f.dat and b/P3D/Content/Data/maps/burnedtower/burnedtower1f.dat differ
diff --git a/P3D/Content/Data/maps/burnedtower/burnedtowerb1f.dat b/P3D/Content/Data/maps/burnedtower/burnedtowerb1f.dat
index b89c5ac18..3e945a92c 100644
Binary files a/P3D/Content/Data/maps/burnedtower/burnedtowerb1f.dat and b/P3D/Content/Data/maps/burnedtower/burnedtowerb1f.dat differ
diff --git a/P3D/Content/Data/maps/celadon/center.dat b/P3D/Content/Data/maps/celadon/center.dat
index 4e7a63ef1..5ab37c612 100644
Binary files a/P3D/Content/Data/maps/celadon/center.dat and b/P3D/Content/Data/maps/celadon/center.dat differ
diff --git a/P3D/Content/Data/maps/celadon/condo1.dat b/P3D/Content/Data/maps/celadon/condo1.dat
index fae674df1..dc5540da3 100644
Binary files a/P3D/Content/Data/maps/celadon/condo1.dat and b/P3D/Content/Data/maps/celadon/condo1.dat differ
diff --git a/P3D/Content/Data/maps/celadon/condo2.dat b/P3D/Content/Data/maps/celadon/condo2.dat
index ad93e70c4..03ac131be 100644
Binary files a/P3D/Content/Data/maps/celadon/condo2.dat and b/P3D/Content/Data/maps/celadon/condo2.dat differ
diff --git a/P3D/Content/Data/maps/celadon/condo3.dat b/P3D/Content/Data/maps/celadon/condo3.dat
index 290a6318d..33d527586 100644
Binary files a/P3D/Content/Data/maps/celadon/condo3.dat and b/P3D/Content/Data/maps/celadon/condo3.dat differ
diff --git a/P3D/Content/Data/maps/celadon/condo4.dat b/P3D/Content/Data/maps/celadon/condo4.dat
index a8c5171c2..2b14121ae 100644
Binary files a/P3D/Content/Data/maps/celadon/condo4.dat and b/P3D/Content/Data/maps/celadon/condo4.dat differ
diff --git a/P3D/Content/Data/maps/celadon/diner.dat b/P3D/Content/Data/maps/celadon/diner.dat
index 100aca0b5..a66ebf2d8 100644
Binary files a/P3D/Content/Data/maps/celadon/diner.dat and b/P3D/Content/Data/maps/celadon/diner.dat differ
diff --git a/P3D/Content/Data/maps/celadon/main.dat b/P3D/Content/Data/maps/celadon/main.dat
index cc58d7558..c962b91e9 100644
Binary files a/P3D/Content/Data/maps/celadon/main.dat and b/P3D/Content/Data/maps/celadon/main.dat differ
diff --git a/P3D/Content/Data/maps/celadon/mart.dat b/P3D/Content/Data/maps/celadon/mart.dat
index 32d5a1721..bbbc23baa 100644
Binary files a/P3D/Content/Data/maps/celadon/mart.dat and b/P3D/Content/Data/maps/celadon/mart.dat differ
diff --git a/P3D/Content/Data/maps/cerulean/1.dat b/P3D/Content/Data/maps/cerulean/1.dat
index 616543a65..747f66926 100644
Binary files a/P3D/Content/Data/maps/cerulean/1.dat and b/P3D/Content/Data/maps/cerulean/1.dat differ
diff --git a/P3D/Content/Data/maps/cerulean/2.dat b/P3D/Content/Data/maps/cerulean/2.dat
index 121d2749d..a2c2e10a5 100644
Binary files a/P3D/Content/Data/maps/cerulean/2.dat and b/P3D/Content/Data/maps/cerulean/2.dat differ
diff --git a/P3D/Content/Data/maps/cerulean/3.dat b/P3D/Content/Data/maps/cerulean/3.dat
index 2cf297628..a18639f18 100644
Binary files a/P3D/Content/Data/maps/cerulean/3.dat and b/P3D/Content/Data/maps/cerulean/3.dat differ
diff --git a/P3D/Content/Data/maps/cerulean/center.dat b/P3D/Content/Data/maps/cerulean/center.dat
index ce5bfb21b..88e188813 100644
Binary files a/P3D/Content/Data/maps/cerulean/center.dat and b/P3D/Content/Data/maps/cerulean/center.dat differ
diff --git a/P3D/Content/Data/maps/cerulean/main.dat b/P3D/Content/Data/maps/cerulean/main.dat
index 9b0234203..dfeb84d19 100644
Binary files a/P3D/Content/Data/maps/cerulean/main.dat and b/P3D/Content/Data/maps/cerulean/main.dat differ
diff --git a/P3D/Content/Data/maps/cerulean/mart.dat b/P3D/Content/Data/maps/cerulean/mart.dat
index 64e2712a5..118f9617c 100644
Binary files a/P3D/Content/Data/maps/cerulean/mart.dat and b/P3D/Content/Data/maps/cerulean/mart.dat differ
diff --git a/P3D/Content/Data/maps/ceruleancave/1f.dat b/P3D/Content/Data/maps/ceruleancave/1f.dat
index afa8dbf43..100f662f2 100644
Binary files a/P3D/Content/Data/maps/ceruleancave/1f.dat and b/P3D/Content/Data/maps/ceruleancave/1f.dat differ
diff --git a/P3D/Content/Data/maps/ceruleancave/2f.dat b/P3D/Content/Data/maps/ceruleancave/2f.dat
index 73edf287b..e5dd54374 100644
Binary files a/P3D/Content/Data/maps/ceruleancave/2f.dat and b/P3D/Content/Data/maps/ceruleancave/2f.dat differ
diff --git a/P3D/Content/Data/maps/ceruleancave/bf1.dat b/P3D/Content/Data/maps/ceruleancave/bf1.dat
index fae0f0c24..b5f293367 100644
Binary files a/P3D/Content/Data/maps/ceruleancave/bf1.dat and b/P3D/Content/Data/maps/ceruleancave/bf1.dat differ
diff --git a/P3D/Content/Data/maps/cherrygrove.dat b/P3D/Content/Data/maps/cherrygrove.dat
index daef9c909..b7c2b2f47 100644
Binary files a/P3D/Content/Data/maps/cherrygrove.dat and b/P3D/Content/Data/maps/cherrygrove.dat differ
diff --git a/P3D/Content/Data/maps/cherrygrove/0.dat b/P3D/Content/Data/maps/cherrygrove/0.dat
index 1a493a233..69c7320d9 100644
Binary files a/P3D/Content/Data/maps/cherrygrove/0.dat and b/P3D/Content/Data/maps/cherrygrove/0.dat differ
diff --git a/P3D/Content/Data/maps/cherrygrove/1.dat b/P3D/Content/Data/maps/cherrygrove/1.dat
index a185c3305..5f9fc36c0 100644
Binary files a/P3D/Content/Data/maps/cherrygrove/1.dat and b/P3D/Content/Data/maps/cherrygrove/1.dat differ
diff --git a/P3D/Content/Data/maps/cherrygrove/2.dat b/P3D/Content/Data/maps/cherrygrove/2.dat
index beacacf27..9303039fc 100644
Binary files a/P3D/Content/Data/maps/cherrygrove/2.dat and b/P3D/Content/Data/maps/cherrygrove/2.dat differ
diff --git a/P3D/Content/Data/maps/cherrygrove_center.dat b/P3D/Content/Data/maps/cherrygrove_center.dat
index 4bed3fd64..7285bbeb0 100644
Binary files a/P3D/Content/Data/maps/cherrygrove_center.dat and b/P3D/Content/Data/maps/cherrygrove_center.dat differ
diff --git a/P3D/Content/Data/maps/cherrygrove_mart.dat b/P3D/Content/Data/maps/cherrygrove_mart.dat
index 0ed8eec03..0b564cafc 100644
Binary files a/P3D/Content/Data/maps/cherrygrove_mart.dat and b/P3D/Content/Data/maps/cherrygrove_mart.dat differ
diff --git a/P3D/Content/Data/maps/chrono/1.dat b/P3D/Content/Data/maps/chrono/1.dat
index 6fbd1f69e..e04b3a904 100644
Binary files a/P3D/Content/Data/maps/chrono/1.dat and b/P3D/Content/Data/maps/chrono/1.dat differ
diff --git a/P3D/Content/Data/maps/chrono/2.dat b/P3D/Content/Data/maps/chrono/2.dat
index e96f838dd..98a0649f9 100644
Binary files a/P3D/Content/Data/maps/chrono/2.dat and b/P3D/Content/Data/maps/chrono/2.dat differ
diff --git a/P3D/Content/Data/maps/chrono/center.dat b/P3D/Content/Data/maps/chrono/center.dat
index bb78d7e2c..c9cd2e2a2 100644
Binary files a/P3D/Content/Data/maps/chrono/center.dat and b/P3D/Content/Data/maps/chrono/center.dat differ
diff --git a/P3D/Content/Data/maps/chrono/dock.dat b/P3D/Content/Data/maps/chrono/dock.dat
index 965edb2eb..2d8bf4214 100644
Binary files a/P3D/Content/Data/maps/chrono/dock.dat and b/P3D/Content/Data/maps/chrono/dock.dat differ
diff --git a/P3D/Content/Data/maps/chrono/labyrinth.dat b/P3D/Content/Data/maps/chrono/labyrinth.dat
index 994ae4682..6aee504ad 100644
Binary files a/P3D/Content/Data/maps/chrono/labyrinth.dat and b/P3D/Content/Data/maps/chrono/labyrinth.dat differ
diff --git a/P3D/Content/Data/maps/chrono/meadow.dat b/P3D/Content/Data/maps/chrono/meadow.dat
index a2c94b313..0c5950e1d 100644
Binary files a/P3D/Content/Data/maps/chrono/meadow.dat and b/P3D/Content/Data/maps/chrono/meadow.dat differ
diff --git a/P3D/Content/Data/maps/chrono/memorial.dat b/P3D/Content/Data/maps/chrono/memorial.dat
index 8649d9005..ce7cbe7fb 100644
Binary files a/P3D/Content/Data/maps/chrono/memorial.dat and b/P3D/Content/Data/maps/chrono/memorial.dat differ
diff --git a/P3D/Content/Data/maps/chrono/resort.dat b/P3D/Content/Data/maps/chrono/resort.dat
index db2f72ce7..b0bc07950 100644
Binary files a/P3D/Content/Data/maps/chrono/resort.dat and b/P3D/Content/Data/maps/chrono/resort.dat differ
diff --git a/P3D/Content/Data/maps/chrono/selphy.dat b/P3D/Content/Data/maps/chrono/selphy.dat
index 41fa92c69..42dd88f29 100644
Binary files a/P3D/Content/Data/maps/chrono/selphy.dat and b/P3D/Content/Data/maps/chrono/selphy.dat differ
diff --git a/P3D/Content/Data/maps/chrono/town.dat b/P3D/Content/Data/maps/chrono/town.dat
index 8921f1c2f..9ec558661 100644
Binary files a/P3D/Content/Data/maps/chrono/town.dat and b/P3D/Content/Data/maps/chrono/town.dat differ
diff --git a/P3D/Content/Data/maps/chrono/warehouse.dat b/P3D/Content/Data/maps/chrono/warehouse.dat
index 13d429da2..4d7ceddd6 100644
Binary files a/P3D/Content/Data/maps/chrono/warehouse.dat and b/P3D/Content/Data/maps/chrono/warehouse.dat differ
diff --git a/P3D/Content/Data/maps/cianwood.dat b/P3D/Content/Data/maps/cianwood.dat
index e788db0df..e60eb4550 100644
Binary files a/P3D/Content/Data/maps/cianwood.dat and b/P3D/Content/Data/maps/cianwood.dat differ
diff --git a/P3D/Content/Data/maps/cianwood/000.dat b/P3D/Content/Data/maps/cianwood/000.dat
index b75f8e592..215915efa 100644
Binary files a/P3D/Content/Data/maps/cianwood/000.dat and b/P3D/Content/Data/maps/cianwood/000.dat differ
diff --git a/P3D/Content/Data/maps/cianwood/001.dat b/P3D/Content/Data/maps/cianwood/001.dat
index be229fcd1..639abd0b7 100644
Binary files a/P3D/Content/Data/maps/cianwood/001.dat and b/P3D/Content/Data/maps/cianwood/001.dat differ
diff --git a/P3D/Content/Data/maps/cianwood/002.dat b/P3D/Content/Data/maps/cianwood/002.dat
index 5e0bf8596..6f0cb9cb0 100644
Binary files a/P3D/Content/Data/maps/cianwood/002.dat and b/P3D/Content/Data/maps/cianwood/002.dat differ
diff --git a/P3D/Content/Data/maps/cianwood/003.dat b/P3D/Content/Data/maps/cianwood/003.dat
index e7487dd5c..31cc22419 100644
Binary files a/P3D/Content/Data/maps/cianwood/003.dat and b/P3D/Content/Data/maps/cianwood/003.dat differ
diff --git a/P3D/Content/Data/maps/cianwood/004.dat b/P3D/Content/Data/maps/cianwood/004.dat
index 43b935102..c6f7b4b82 100644
Binary files a/P3D/Content/Data/maps/cianwood/004.dat and b/P3D/Content/Data/maps/cianwood/004.dat differ
diff --git a/P3D/Content/Data/maps/cianwood/center.dat b/P3D/Content/Data/maps/cianwood/center.dat
index b83678e85..8882a4290 100644
Binary files a/P3D/Content/Data/maps/cianwood/center.dat and b/P3D/Content/Data/maps/cianwood/center.dat differ
diff --git a/P3D/Content/Data/maps/cinnabar/center.dat b/P3D/Content/Data/maps/cinnabar/center.dat
index e4cea6f10..6291ba5d8 100644
Binary files a/P3D/Content/Data/maps/cinnabar/center.dat and b/P3D/Content/Data/maps/cinnabar/center.dat differ
diff --git a/P3D/Content/Data/maps/cinnabar/main.dat b/P3D/Content/Data/maps/cinnabar/main.dat
index 6a10a7ca5..eeeffa15a 100644
Binary files a/P3D/Content/Data/maps/cinnabar/main.dat and b/P3D/Content/Data/maps/cinnabar/main.dat differ
diff --git a/P3D/Content/Data/maps/darkcave/darkcave0.dat b/P3D/Content/Data/maps/darkcave/darkcave0.dat
index 820642fc4..e63e9d786 100644
Binary files a/P3D/Content/Data/maps/darkcave/darkcave0.dat and b/P3D/Content/Data/maps/darkcave/darkcave0.dat differ
diff --git a/P3D/Content/Data/maps/darkcave/darkcave1.dat b/P3D/Content/Data/maps/darkcave/darkcave1.dat
index 2f5ef592f..1eb01a6c4 100644
Binary files a/P3D/Content/Data/maps/darkcave/darkcave1.dat and b/P3D/Content/Data/maps/darkcave/darkcave1.dat differ
diff --git a/P3D/Content/Data/maps/diamonddive/1f.dat b/P3D/Content/Data/maps/diamonddive/1f.dat
index 29e38921e..825306625 100644
Binary files a/P3D/Content/Data/maps/diamonddive/1f.dat and b/P3D/Content/Data/maps/diamonddive/1f.dat differ
diff --git a/P3D/Content/Data/maps/diamonddive/interior/1.dat b/P3D/Content/Data/maps/diamonddive/interior/1.dat
index 686ea3b3b..7cad78b94 100644
Binary files a/P3D/Content/Data/maps/diamonddive/interior/1.dat and b/P3D/Content/Data/maps/diamonddive/interior/1.dat differ
diff --git a/P3D/Content/Data/maps/diamonddive/interior/2.dat b/P3D/Content/Data/maps/diamonddive/interior/2.dat
index c689644f2..181dbe80f 100644
Binary files a/P3D/Content/Data/maps/diamonddive/interior/2.dat and b/P3D/Content/Data/maps/diamonddive/interior/2.dat differ
diff --git a/P3D/Content/Data/maps/diamonddive/interior/3.dat b/P3D/Content/Data/maps/diamonddive/interior/3.dat
index 136d14480..0dabdef7d 100644
Binary files a/P3D/Content/Data/maps/diamonddive/interior/3.dat and b/P3D/Content/Data/maps/diamonddive/interior/3.dat differ
diff --git a/P3D/Content/Data/maps/diamonddive/interior/4.dat b/P3D/Content/Data/maps/diamonddive/interior/4.dat
index 782a2da74..f6597aa73 100644
Binary files a/P3D/Content/Data/maps/diamonddive/interior/4.dat and b/P3D/Content/Data/maps/diamonddive/interior/4.dat differ
diff --git a/P3D/Content/Data/maps/diamonddive/interior/5.dat b/P3D/Content/Data/maps/diamonddive/interior/5.dat
index 0528cf995..cfd6a812b 100644
Binary files a/P3D/Content/Data/maps/diamonddive/interior/5.dat and b/P3D/Content/Data/maps/diamonddive/interior/5.dat differ
diff --git a/P3D/Content/Data/maps/diamonddive/interior/6.dat b/P3D/Content/Data/maps/diamonddive/interior/6.dat
index 8b6c0c5e5..58df614b4 100644
Binary files a/P3D/Content/Data/maps/diamonddive/interior/6.dat and b/P3D/Content/Data/maps/diamonddive/interior/6.dat differ
diff --git a/P3D/Content/Data/maps/diamonddive/interior/7.dat b/P3D/Content/Data/maps/diamonddive/interior/7.dat
index 6b348d1a5..3e52ec74e 100644
Binary files a/P3D/Content/Data/maps/diamonddive/interior/7.dat and b/P3D/Content/Data/maps/diamonddive/interior/7.dat differ
diff --git a/P3D/Content/Data/maps/diamonddive/interior/interior.dat b/P3D/Content/Data/maps/diamonddive/interior/interior.dat
index 34bc41b57..e8a0e37e2 100644
Binary files a/P3D/Content/Data/maps/diamonddive/interior/interior.dat and b/P3D/Content/Data/maps/diamonddive/interior/interior.dat differ
diff --git a/P3D/Content/Data/maps/diglettscave/entpew.dat b/P3D/Content/Data/maps/diglettscave/entpew.dat
index 1f75445da..65c20e4fa 100644
Binary files a/P3D/Content/Data/maps/diglettscave/entpew.dat and b/P3D/Content/Data/maps/diglettscave/entpew.dat differ
diff --git a/P3D/Content/Data/maps/diglettscave/entver.dat b/P3D/Content/Data/maps/diglettscave/entver.dat
index 1b79effce..9c6368216 100644
Binary files a/P3D/Content/Data/maps/diglettscave/entver.dat and b/P3D/Content/Data/maps/diglettscave/entver.dat differ
diff --git a/P3D/Content/Data/maps/diglettscave/main.dat b/P3D/Content/Data/maps/diglettscave/main.dat
index eaf8a37c5..865e8a102 100644
Binary files a/P3D/Content/Data/maps/diglettscave/main.dat and b/P3D/Content/Data/maps/diglettscave/main.dat differ
diff --git a/P3D/Content/Data/maps/dragonsden/0.dat b/P3D/Content/Data/maps/dragonsden/0.dat
index 999432d14..c7eb80593 100644
Binary files a/P3D/Content/Data/maps/dragonsden/0.dat and b/P3D/Content/Data/maps/dragonsden/0.dat differ
diff --git a/P3D/Content/Data/maps/dragonsden/1.dat b/P3D/Content/Data/maps/dragonsden/1.dat
index cca1ccd67..7d3bd8976 100644
Binary files a/P3D/Content/Data/maps/dragonsden/1.dat and b/P3D/Content/Data/maps/dragonsden/1.dat differ
diff --git a/P3D/Content/Data/maps/dragonsden/main.dat b/P3D/Content/Data/maps/dragonsden/main.dat
index a516b64dd..b5d68ebd2 100644
Binary files a/P3D/Content/Data/maps/dragonsden/main.dat and b/P3D/Content/Data/maps/dragonsden/main.dat differ
diff --git a/P3D/Content/Data/maps/dragonsden/shrine.dat b/P3D/Content/Data/maps/dragonsden/shrine.dat
index 8bd846f10..a94214369 100644
Binary files a/P3D/Content/Data/maps/dragonsden/shrine.dat and b/P3D/Content/Data/maps/dragonsden/shrine.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/0.dat b/P3D/Content/Data/maps/dungeon/0/0.dat
index fed7881d7..d539fa000 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/0.dat and b/P3D/Content/Data/maps/dungeon/0/0.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/1.dat b/P3D/Content/Data/maps/dungeon/0/1.dat
index 558b38dae..50a5a4672 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/1.dat and b/P3D/Content/Data/maps/dungeon/0/1.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/10.dat b/P3D/Content/Data/maps/dungeon/0/10.dat
index 2ff7c8af0..d5aadcec6 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/10.dat and b/P3D/Content/Data/maps/dungeon/0/10.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/11.dat b/P3D/Content/Data/maps/dungeon/0/11.dat
index 2db7d74a8..98c61b811 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/11.dat and b/P3D/Content/Data/maps/dungeon/0/11.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/12.dat b/P3D/Content/Data/maps/dungeon/0/12.dat
index 9f92517ce..52a1ed17e 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/12.dat and b/P3D/Content/Data/maps/dungeon/0/12.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/13.dat b/P3D/Content/Data/maps/dungeon/0/13.dat
index ad6a11fa8..7b6f3bb79 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/13.dat and b/P3D/Content/Data/maps/dungeon/0/13.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/14.dat b/P3D/Content/Data/maps/dungeon/0/14.dat
index d532d5896..b719ee743 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/14.dat and b/P3D/Content/Data/maps/dungeon/0/14.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/2.dat b/P3D/Content/Data/maps/dungeon/0/2.dat
index 7fbd63555..e99f2ef70 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/2.dat and b/P3D/Content/Data/maps/dungeon/0/2.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/3.dat b/P3D/Content/Data/maps/dungeon/0/3.dat
index 9ee307a67..cb0080dc6 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/3.dat and b/P3D/Content/Data/maps/dungeon/0/3.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/4.dat b/P3D/Content/Data/maps/dungeon/0/4.dat
index 26c3e28ea..e5347ddaa 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/4.dat and b/P3D/Content/Data/maps/dungeon/0/4.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/5.dat b/P3D/Content/Data/maps/dungeon/0/5.dat
index 27b95e035..eecfa3cf7 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/5.dat and b/P3D/Content/Data/maps/dungeon/0/5.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/6.dat b/P3D/Content/Data/maps/dungeon/0/6.dat
index 1488ef486..a19aa40dc 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/6.dat and b/P3D/Content/Data/maps/dungeon/0/6.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/7.dat b/P3D/Content/Data/maps/dungeon/0/7.dat
index 2683925a3..174119ec3 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/7.dat and b/P3D/Content/Data/maps/dungeon/0/7.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/8.dat b/P3D/Content/Data/maps/dungeon/0/8.dat
index ce741b16f..a001418a4 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/8.dat and b/P3D/Content/Data/maps/dungeon/0/8.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/0/9.dat b/P3D/Content/Data/maps/dungeon/0/9.dat
index 8e03f7830..ab8bf6e2c 100644
Binary files a/P3D/Content/Data/maps/dungeon/0/9.dat and b/P3D/Content/Data/maps/dungeon/0/9.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/0.dat b/P3D/Content/Data/maps/dungeon/1/0.dat
index bbde7b453..0660220b4 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/0.dat and b/P3D/Content/Data/maps/dungeon/1/0.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/1.dat b/P3D/Content/Data/maps/dungeon/1/1.dat
index beffc88cd..4676f5223 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/1.dat and b/P3D/Content/Data/maps/dungeon/1/1.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/10.dat b/P3D/Content/Data/maps/dungeon/1/10.dat
index e2ec56ab3..71571562c 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/10.dat and b/P3D/Content/Data/maps/dungeon/1/10.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/11.dat b/P3D/Content/Data/maps/dungeon/1/11.dat
index cbd463109..2fb09fbfc 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/11.dat and b/P3D/Content/Data/maps/dungeon/1/11.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/12.dat b/P3D/Content/Data/maps/dungeon/1/12.dat
index 9e3bf0626..f205581c6 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/12.dat and b/P3D/Content/Data/maps/dungeon/1/12.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/13.dat b/P3D/Content/Data/maps/dungeon/1/13.dat
index 7997e5e6e..26aec9aa2 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/13.dat and b/P3D/Content/Data/maps/dungeon/1/13.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/14.dat b/P3D/Content/Data/maps/dungeon/1/14.dat
index c4facf41d..3f53545c7 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/14.dat and b/P3D/Content/Data/maps/dungeon/1/14.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/15.dat b/P3D/Content/Data/maps/dungeon/1/15.dat
index 37d6edcd8..b18aa6f80 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/15.dat and b/P3D/Content/Data/maps/dungeon/1/15.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/16.dat b/P3D/Content/Data/maps/dungeon/1/16.dat
index d68f94252..aeaf2bec7 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/16.dat and b/P3D/Content/Data/maps/dungeon/1/16.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/17.dat b/P3D/Content/Data/maps/dungeon/1/17.dat
index 59acdecd6..523476c22 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/17.dat and b/P3D/Content/Data/maps/dungeon/1/17.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/18.dat b/P3D/Content/Data/maps/dungeon/1/18.dat
index 43bddd8c0..76af466ef 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/18.dat and b/P3D/Content/Data/maps/dungeon/1/18.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/19.dat b/P3D/Content/Data/maps/dungeon/1/19.dat
index 5a630a2ad..a51ad0bed 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/19.dat and b/P3D/Content/Data/maps/dungeon/1/19.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/2.dat b/P3D/Content/Data/maps/dungeon/1/2.dat
index c94a93ee3..e0699323e 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/2.dat and b/P3D/Content/Data/maps/dungeon/1/2.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/20.dat b/P3D/Content/Data/maps/dungeon/1/20.dat
index 80bb31b96..ef67bd693 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/20.dat and b/P3D/Content/Data/maps/dungeon/1/20.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/21.dat b/P3D/Content/Data/maps/dungeon/1/21.dat
index 663e49b12..1dedff469 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/21.dat and b/P3D/Content/Data/maps/dungeon/1/21.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/22.dat b/P3D/Content/Data/maps/dungeon/1/22.dat
index 6d4b23ce8..754923e99 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/22.dat and b/P3D/Content/Data/maps/dungeon/1/22.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/23.dat b/P3D/Content/Data/maps/dungeon/1/23.dat
index b0e30ad39..1be53bf09 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/23.dat and b/P3D/Content/Data/maps/dungeon/1/23.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/24.dat b/P3D/Content/Data/maps/dungeon/1/24.dat
index 064c29733..ec260c71c 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/24.dat and b/P3D/Content/Data/maps/dungeon/1/24.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/3.dat b/P3D/Content/Data/maps/dungeon/1/3.dat
index b9cb46798..71dde2743 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/3.dat and b/P3D/Content/Data/maps/dungeon/1/3.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/4.dat b/P3D/Content/Data/maps/dungeon/1/4.dat
index f768fc2e5..447a63865 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/4.dat and b/P3D/Content/Data/maps/dungeon/1/4.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/5.dat b/P3D/Content/Data/maps/dungeon/1/5.dat
index 3fb9f43ce..f755deb8b 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/5.dat and b/P3D/Content/Data/maps/dungeon/1/5.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/6.dat b/P3D/Content/Data/maps/dungeon/1/6.dat
index 18f736cee..e5859af66 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/6.dat and b/P3D/Content/Data/maps/dungeon/1/6.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/7.dat b/P3D/Content/Data/maps/dungeon/1/7.dat
index 66d4cab42..0f5f6a26f 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/7.dat and b/P3D/Content/Data/maps/dungeon/1/7.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/8.dat b/P3D/Content/Data/maps/dungeon/1/8.dat
index 7e6d88591..4b01f3d49 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/8.dat and b/P3D/Content/Data/maps/dungeon/1/8.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/1/9.dat b/P3D/Content/Data/maps/dungeon/1/9.dat
index 5e1578af4..6879d1475 100644
Binary files a/P3D/Content/Data/maps/dungeon/1/9.dat and b/P3D/Content/Data/maps/dungeon/1/9.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/2/0.dat b/P3D/Content/Data/maps/dungeon/2/0.dat
index 2b621d756..92ebba537 100644
Binary files a/P3D/Content/Data/maps/dungeon/2/0.dat and b/P3D/Content/Data/maps/dungeon/2/0.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/2/1.dat b/P3D/Content/Data/maps/dungeon/2/1.dat
index b3e59afb0..534f6eec8 100644
Binary files a/P3D/Content/Data/maps/dungeon/2/1.dat and b/P3D/Content/Data/maps/dungeon/2/1.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/2/2.dat b/P3D/Content/Data/maps/dungeon/2/2.dat
index 1a4d4dd1d..4807fda80 100644
Binary files a/P3D/Content/Data/maps/dungeon/2/2.dat and b/P3D/Content/Data/maps/dungeon/2/2.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/2/3.dat b/P3D/Content/Data/maps/dungeon/2/3.dat
index 7e5621dde..004b804ad 100644
Binary files a/P3D/Content/Data/maps/dungeon/2/3.dat and b/P3D/Content/Data/maps/dungeon/2/3.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/2/4.dat b/P3D/Content/Data/maps/dungeon/2/4.dat
index d4c2abd3a..1ce8a57a3 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/dungeon/2/5.dat b/P3D/Content/Data/maps/dungeon/2/5.dat
index 5e380fc32..c30a2093f 100644
Binary files a/P3D/Content/Data/maps/dungeon/2/5.dat and b/P3D/Content/Data/maps/dungeon/2/5.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/2/6.dat b/P3D/Content/Data/maps/dungeon/2/6.dat
index 361d3fee6..233af2bd4 100644
Binary files a/P3D/Content/Data/maps/dungeon/2/6.dat and b/P3D/Content/Data/maps/dungeon/2/6.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/2/7.dat b/P3D/Content/Data/maps/dungeon/2/7.dat
index 6bd46487f..69dd43d47 100644
Binary files a/P3D/Content/Data/maps/dungeon/2/7.dat and b/P3D/Content/Data/maps/dungeon/2/7.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/2/mega.dat b/P3D/Content/Data/maps/dungeon/2/mega.dat
index c01a4582b..b1fbb2978 100644
--- a/P3D/Content/Data/maps/dungeon/2/mega.dat
+++ b/P3D/Content/Data/maps/dungeon/2/mega.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Millennial Star Tower]}}{"MusicLoop"{str[startower]}}{"CurrentRegion"{str[Kanto]}}{"WildPokemon"{bool[1]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[5,6]}}{"Position"{intArr[0,0,-1]}}{"TexturePath"{str[dungeon]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/dungeon/2/outside.dat b/P3D/Content/Data/maps/dungeon/2/outside.dat
index c728efd35..24843e96f 100644
Binary files a/P3D/Content/Data/maps/dungeon/2/outside.dat and b/P3D/Content/Data/maps/dungeon/2/outside.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/checkpoint1.dat b/P3D/Content/Data/maps/dungeon/checkpoint1.dat
index 434b21c64..923b1a192 100644
Binary files a/P3D/Content/Data/maps/dungeon/checkpoint1.dat and b/P3D/Content/Data/maps/dungeon/checkpoint1.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/chess.dat b/P3D/Content/Data/maps/dungeon/chess.dat
index 20a306abb..0399be407 100644
Binary files a/P3D/Content/Data/maps/dungeon/chess.dat and b/P3D/Content/Data/maps/dungeon/chess.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/main.dat b/P3D/Content/Data/maps/dungeon/main.dat
index 035ac1f68..1e2ac8d96 100644
--- a/P3D/Content/Data/maps/dungeon/main.dat
+++ b/P3D/Content/Data/maps/dungeon/main.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Ancient Ruins]}}{"MusicLoop"{str[ancient_ruins]}}{"CurrentRegion"{str[Kanto]}}{"WildPokemon"{bool[1]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[30,2]}}{"Position"{intArr[-10,1,-1]}}{"TexturePath"{str[dungeon]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/dungeon/mindend.dat b/P3D/Content/Data/maps/dungeon/mindend.dat
index 0ac385a06..40326458c 100644
Binary files a/P3D/Content/Data/maps/dungeon/mindend.dat and b/P3D/Content/Data/maps/dungeon/mindend.dat differ
diff --git a/P3D/Content/Data/maps/dungeon/passage.dat b/P3D/Content/Data/maps/dungeon/passage.dat
index 43514120f..396942389 100644
Binary files a/P3D/Content/Data/maps/dungeon/passage.dat and b/P3D/Content/Data/maps/dungeon/passage.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/001.dat b/P3D/Content/Data/maps/ecruteak/001.dat
index 731bbeaae..aad2146c9 100644
Binary files a/P3D/Content/Data/maps/ecruteak/001.dat and b/P3D/Content/Data/maps/ecruteak/001.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/002.dat b/P3D/Content/Data/maps/ecruteak/002.dat
index 0bc101159..b924eed84 100644
Binary files a/P3D/Content/Data/maps/ecruteak/002.dat and b/P3D/Content/Data/maps/ecruteak/002.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/center.dat b/P3D/Content/Data/maps/ecruteak/center.dat
index bf181dbc2..b6a36a52b 100644
Binary files a/P3D/Content/Data/maps/ecruteak/center.dat and b/P3D/Content/Data/maps/ecruteak/center.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/dance_theater.dat b/P3D/Content/Data/maps/ecruteak/dance_theater.dat
index a51a394c4..b6bf04ec9 100644
Binary files a/P3D/Content/Data/maps/ecruteak/dance_theater.dat and b/P3D/Content/Data/maps/ecruteak/dance_theater.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/event.dat b/P3D/Content/Data/maps/ecruteak/event.dat
index a9e052d8b..598269df7 100644
Binary files a/P3D/Content/Data/maps/ecruteak/event.dat and b/P3D/Content/Data/maps/ecruteak/event.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/mart.dat b/P3D/Content/Data/maps/ecruteak/mart.dat
index 0eb560582..01eb6e950 100644
Binary files a/P3D/Content/Data/maps/ecruteak/mart.dat and b/P3D/Content/Data/maps/ecruteak/mart.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower10f.dat b/P3D/Content/Data/maps/ecruteak/tintower10f.dat
index fa602f9a6..f334108fd 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower10f.dat and b/P3D/Content/Data/maps/ecruteak/tintower10f.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower1f.dat b/P3D/Content/Data/maps/ecruteak/tintower1f.dat
index 18a1b7024..3eaf50098 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower1f.dat and b/P3D/Content/Data/maps/ecruteak/tintower1f.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower2f.dat b/P3D/Content/Data/maps/ecruteak/tintower2f.dat
index 154753fdb..2b5bc633d 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower2f.dat and b/P3D/Content/Data/maps/ecruteak/tintower2f.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower3f.dat b/P3D/Content/Data/maps/ecruteak/tintower3f.dat
index 99acf2425..de175b10f 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower3f.dat and b/P3D/Content/Data/maps/ecruteak/tintower3f.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower4f.dat b/P3D/Content/Data/maps/ecruteak/tintower4f.dat
index 035ef92bf..cd2386a56 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower4f.dat and b/P3D/Content/Data/maps/ecruteak/tintower4f.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower5f.dat b/P3D/Content/Data/maps/ecruteak/tintower5f.dat
index 73bd18505..e16fb4f87 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower5f.dat and b/P3D/Content/Data/maps/ecruteak/tintower5f.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower6f.dat b/P3D/Content/Data/maps/ecruteak/tintower6f.dat
index 393f032e2..06ece41d5 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower6f.dat and b/P3D/Content/Data/maps/ecruteak/tintower6f.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower7f.dat b/P3D/Content/Data/maps/ecruteak/tintower7f.dat
index ae6973642..f9ffd4754 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower7f.dat and b/P3D/Content/Data/maps/ecruteak/tintower7f.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower8f.dat b/P3D/Content/Data/maps/ecruteak/tintower8f.dat
index 28ff7d59a..a94cad83e 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower8f.dat and b/P3D/Content/Data/maps/ecruteak/tintower8f.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintower9f.dat b/P3D/Content/Data/maps/ecruteak/tintower9f.dat
index 990a72cbb..32e00c051 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintower9f.dat and b/P3D/Content/Data/maps/ecruteak/tintower9f.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintowergate1.dat b/P3D/Content/Data/maps/ecruteak/tintowergate1.dat
index 995a4cc05..04fdf35ad 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintowergate1.dat and b/P3D/Content/Data/maps/ecruteak/tintowergate1.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintowergate2.dat b/P3D/Content/Data/maps/ecruteak/tintowergate2.dat
index a1b268de3..a8ff16124 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintowergate2.dat and b/P3D/Content/Data/maps/ecruteak/tintowergate2.dat differ
diff --git a/P3D/Content/Data/maps/ecruteak/tintowergate3.dat b/P3D/Content/Data/maps/ecruteak/tintowergate3.dat
index ccaf10d9d..6be71d072 100644
Binary files a/P3D/Content/Data/maps/ecruteak/tintowergate3.dat and b/P3D/Content/Data/maps/ecruteak/tintowergate3.dat differ
diff --git a/P3D/Content/Data/maps/elmlab.dat b/P3D/Content/Data/maps/elmlab.dat
index 245a55f96..1a7fa8a60 100644
Binary files a/P3D/Content/Data/maps/elmlab.dat and b/P3D/Content/Data/maps/elmlab.dat differ
diff --git a/P3D/Content/Data/maps/faraway/exterior.dat b/P3D/Content/Data/maps/faraway/exterior.dat
index 506cb7184..b3fb57f95 100644
Binary files a/P3D/Content/Data/maps/faraway/exterior.dat and b/P3D/Content/Data/maps/faraway/exterior.dat differ
diff --git a/P3D/Content/Data/maps/faraway/interior.dat b/P3D/Content/Data/maps/faraway/interior.dat
index 03ccc94e8..a9ca39414 100644
Binary files a/P3D/Content/Data/maps/faraway/interior.dat and b/P3D/Content/Data/maps/faraway/interior.dat differ
diff --git a/P3D/Content/Data/maps/floe/1.dat b/P3D/Content/Data/maps/floe/1.dat
index 1b07e0520..59a86f6d8 100644
Binary files a/P3D/Content/Data/maps/floe/1.dat and b/P3D/Content/Data/maps/floe/1.dat differ
diff --git a/P3D/Content/Data/maps/floe/2.dat b/P3D/Content/Data/maps/floe/2.dat
index 37d08acda..c160f3994 100644
Binary files a/P3D/Content/Data/maps/floe/2.dat and b/P3D/Content/Data/maps/floe/2.dat differ
diff --git a/P3D/Content/Data/maps/floe/3.dat b/P3D/Content/Data/maps/floe/3.dat
index 16219b497..435b6b9e9 100644
Binary files a/P3D/Content/Data/maps/floe/3.dat and b/P3D/Content/Data/maps/floe/3.dat differ
diff --git a/P3D/Content/Data/maps/floe/center.dat b/P3D/Content/Data/maps/floe/center.dat
index 631bbf08c..c59b526de 100644
Binary files a/P3D/Content/Data/maps/floe/center.dat and b/P3D/Content/Data/maps/floe/center.dat differ
diff --git a/P3D/Content/Data/maps/floe/daycare.dat b/P3D/Content/Data/maps/floe/daycare.dat
index 2d7ff7c75..81eb4ea15 100644
Binary files a/P3D/Content/Data/maps/floe/daycare.dat and b/P3D/Content/Data/maps/floe/daycare.dat differ
diff --git a/P3D/Content/Data/maps/floe/dock.dat b/P3D/Content/Data/maps/floe/dock.dat
index f5d0feba5..557108653 100644
Binary files a/P3D/Content/Data/maps/floe/dock.dat and b/P3D/Content/Data/maps/floe/dock.dat differ
diff --git a/P3D/Content/Data/maps/floe/mart.dat b/P3D/Content/Data/maps/floe/mart.dat
index 07c577cad..daf2e4c97 100644
Binary files a/P3D/Content/Data/maps/floe/mart.dat and b/P3D/Content/Data/maps/floe/mart.dat differ
diff --git a/P3D/Content/Data/maps/floe/town.dat b/P3D/Content/Data/maps/floe/town.dat
index 4694a7a50..a6613f6d6 100644
Binary files a/P3D/Content/Data/maps/floe/town.dat and b/P3D/Content/Data/maps/floe/town.dat differ
diff --git a/P3D/Content/Data/maps/fortune/0.dat b/P3D/Content/Data/maps/fortune/0.dat
index 0e23eb95a..c685cb660 100644
Binary files a/P3D/Content/Data/maps/fortune/0.dat and b/P3D/Content/Data/maps/fortune/0.dat differ
diff --git a/P3D/Content/Data/maps/fortune/1.dat b/P3D/Content/Data/maps/fortune/1.dat
index 5be5a32db..e698bf16c 100644
--- a/P3D/Content/Data/maps/fortune/1.dat
+++ b/P3D/Content/Data/maps/fortune/1.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Water Path]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[8,8]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[House2]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/2.dat b/P3D/Content/Data/maps/fortune/2.dat
index 79eca2222..478594bbb 100644
--- a/P3D/Content/Data/maps/fortune/2.dat
+++ b/P3D/Content/Data/maps/fortune/2.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Water Path]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[8,8]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[House2]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/altering.dat b/P3D/Content/Data/maps/fortune/altering.dat
index ff5330ecb..99c0d74ef 100644
--- a/P3D/Content/Data/maps/fortune/altering.dat
+++ b/P3D/Content/Data/maps/fortune/altering.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Altering Cave]}}{"MusicLoop"{str[diglettscave]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[1]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"BattleMap"{str[fortune\altering.dat,5.5,0,0.5]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[2]}}{"Weather"{int[1]}}{"BattleMap"{str[fortune\altering.dat,5.5,0,0.5]}}]}}
 
 Small:
 Floor:
diff --git a/P3D/Content/Data/maps/fortune/center.dat b/P3D/Content/Data/maps/fortune/center.dat
index 649f7efad..2ad448539 100644
Binary files a/P3D/Content/Data/maps/fortune/center.dat and b/P3D/Content/Data/maps/fortune/center.dat differ
diff --git a/P3D/Content/Data/maps/fortune/dock.dat b/P3D/Content/Data/maps/fortune/dock.dat
index 4884fadd1..1e687c7fc 100644
Binary files a/P3D/Content/Data/maps/fortune/dock.dat and b/P3D/Content/Data/maps/fortune/dock.dat differ
diff --git a/P3D/Content/Data/maps/fortune/dot/0.dat b/P3D/Content/Data/maps/fortune/dot/0.dat
index 5614ebb75..56f41fb1e 100644
--- a/P3D/Content/Data/maps/fortune/dot/0.dat
+++ b/P3D/Content/Data/maps/fortune/dot/0.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Dotted Hole]}}{"MusicLoop"{str[diglettscave]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[2]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[11,9]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Sevii]}}{"Texture"{rec[32,128,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/dot/1.dat b/P3D/Content/Data/maps/fortune/dot/1.dat
index 109b414f1..5e89d3bfd 100644
--- a/P3D/Content/Data/maps/fortune/dot/1.dat
+++ b/P3D/Content/Data/maps/fortune/dot/1.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Dotted Hole]}}{"MusicLoop"{str[diglettscave]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[2]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[11,9]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Sevii]}}{"Texture"{rec[32,128,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/dot/2.dat b/P3D/Content/Data/maps/fortune/dot/2.dat
index 5648d2b76..5267d1056 100644
--- a/P3D/Content/Data/maps/fortune/dot/2.dat
+++ b/P3D/Content/Data/maps/fortune/dot/2.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Dotted Hole]}}{"MusicLoop"{str[diglettscave]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[2]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[11,9]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Sevii]}}{"Texture"{rec[32,128,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/dot/3.dat b/P3D/Content/Data/maps/fortune/dot/3.dat
index ce1b0d992..25651d031 100644
--- a/P3D/Content/Data/maps/fortune/dot/3.dat
+++ b/P3D/Content/Data/maps/fortune/dot/3.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Dotted Hole]}}{"MusicLoop"{str[diglettscave]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[2]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[11,9]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Sevii]}}{"Texture"{rec[32,128,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/dot/end.dat b/P3D/Content/Data/maps/fortune/dot/end.dat
index 6cd55220f..36dc04da2 100644
--- a/P3D/Content/Data/maps/fortune/dot/end.dat
+++ b/P3D/Content/Data/maps/fortune/dot/end.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Dotted Hole]}}{"MusicLoop"{str[diglettscave]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"MapScript"{str[fortune\dot\dstonemap]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[2]}}{"Weather"{int[1]}}{"MapScript"{str[fortune\dot\dstonemap]}}{"Lighting"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[9,9]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Sevii]}}{"Texture"{rec[32,128,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/dot/ent.dat b/P3D/Content/Data/maps/fortune/dot/ent.dat
index 116a57670..600db1718 100644
--- a/P3D/Content/Data/maps/fortune/dot/ent.dat
+++ b/P3D/Content/Data/maps/fortune/dot/ent.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Dotted Hole]}}{"MusicLoop"{str[diglettscave]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"MapScript"{str[fortune\dot\n]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[2]}}{"Weather"{int[1]}}{"MapScript"{str[fortune\dot\n]}}{"Lighting"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[14,10]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Sevii]}}{"Texture"{rec[32,128,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/green.dat b/P3D/Content/Data/maps/fortune/green.dat
index e9b2a2b31..f68db17d9 100644
--- a/P3D/Content/Data/maps/fortune/green.dat
+++ b/P3D/Content/Data/maps/fortune/green.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Green Path]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BattleMap"{str[fortune\green.dat,-10.7,0,-11]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BattleMap"{str[fortune\green.dat,-10.7,0,-11]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[4,4]}}{"Position"{intArr[38,1,9]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/mart.dat b/P3D/Content/Data/maps/fortune/mart.dat
index 669e0dd8f..c69eed9a5 100644
Binary files a/P3D/Content/Data/maps/fortune/mart.dat and b/P3D/Content/Data/maps/fortune/mart.dat differ
diff --git a/P3D/Content/Data/maps/fortune/outcast.dat b/P3D/Content/Data/maps/fortune/outcast.dat
index e68183dce..be0606426 100644
--- a/P3D/Content/Data/maps/fortune/outcast.dat
+++ b/P3D/Content/Data/maps/fortune/outcast.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Outcast Island]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BattleMap"{str[fortune\green.dat,-10.7,0,-11]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BattleMap"{str[fortune\green.dat,-10.7,0,-11]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[12,11]}}{"Position"{intArr[5,0,15]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[16,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/patternbush/east.dat b/P3D/Content/Data/maps/fortune/patternbush/east.dat
index 72d7807b3..1d87e425e 100644
--- a/P3D/Content/Data/maps/fortune/patternbush/east.dat
+++ b/P3D/Content/Data/maps/fortune/patternbush/east.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Gate]}}{"MusicLoop"{str[viridian_forest]}}{"CurrentRegion"{str[Sevii Islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"RideType"{int[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}{"BattleMap"{str[fortune\patternbush\main.dat,0,0,-0.6]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"RideType"{int[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}{"BattleMap"{str[fortune\patternbush\main.dat,0,0,-0.6]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[10,7]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Gate]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/patternbush/main.dat b/P3D/Content/Data/maps/fortune/patternbush/main.dat
index 27283e474..8a1562cd6 100644
--- a/P3D/Content/Data/maps/fortune/patternbush/main.dat
+++ b/P3D/Content/Data/maps/fortune/patternbush/main.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Pattern Bush]}}{"MusicLoop"{str[viridian_forest]}}{"CurrentRegion"{str[Sevii Islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[2]}}{"BattleMap"{str[fortune\patternbush\main.dat,0,0,-0.6]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[2]}}{"BattleMap"{str[fortune\patternbush\main.dat,0,0,-0.6]}}]}}
 
 Floors:
 {"Floor"{ENT[{"Size"{intArr[60,30]}}{"Position"{intArr[2,0,2]}}{"TexturePath"{str[berryForest]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/patternbush/west.dat b/P3D/Content/Data/maps/fortune/patternbush/west.dat
index 3e8a4fe61..e733f9455 100644
--- a/P3D/Content/Data/maps/fortune/patternbush/west.dat
+++ b/P3D/Content/Data/maps/fortune/patternbush/west.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Gate]}}{"MusicLoop"{str[viridian_forest]}}{"CurrentRegion"{str[Sevii Islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"RideType"{int[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}{"BattleMap"{str[fortune\patternbush\main.dat,0,0,-0.6]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"RideType"{int[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}{"BattleMap"{str[fortune\patternbush\main.dat,0,0,-0.6]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[10,7]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Gate]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/town.dat b/P3D/Content/Data/maps/fortune/town.dat
index edcebbcc9..ecd52fea7 100644
Binary files a/P3D/Content/Data/maps/fortune/town.dat and b/P3D/Content/Data/maps/fortune/town.dat differ
diff --git a/P3D/Content/Data/maps/fortune/valley.dat b/P3D/Content/Data/maps/fortune/valley.dat
index 0e0ad67e2..9dabe141b 100644
--- a/P3D/Content/Data/maps/fortune/valley.dat
+++ b/P3D/Content/Data/maps/fortune/valley.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Ruin Valley]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"MapScript"{str[fortune\dot\door]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BattleMap"{str[fortune\valley.dat,13,0,-5.7]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"MapScript"{str[fortune\dot\door]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BattleMap"{str[fortune\valley.dat,13,0,-5.7]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[7,3]}}{"Position"{intArr[15,1,28]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/fortune/water.dat b/P3D/Content/Data/maps/fortune/water.dat
index c758820da..d6216ca31 100644
--- a/P3D/Content/Data/maps/fortune/water.dat
+++ b/P3D/Content/Data/maps/fortune/water.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Water Path]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BattleMap"{str[fortune\green.dat,-10.7,0,-11]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BattleMap"{str[fortune\green.dat,-10.7,0,-11]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[12,11]}}{"Position"{intArr[-1,1,6]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/frontier/battlefactory/arena.dat b/P3D/Content/Data/maps/frontier/battlefactory/arena.dat
index a522cf21c..50f5eff0e 100644
Binary files a/P3D/Content/Data/maps/frontier/battlefactory/arena.dat and b/P3D/Content/Data/maps/frontier/battlefactory/arena.dat differ
diff --git a/P3D/Content/Data/maps/frontier/battlefactory/main.dat b/P3D/Content/Data/maps/frontier/battlefactory/main.dat
index ffec346e0..620526a0c 100644
Binary files a/P3D/Content/Data/maps/frontier/battlefactory/main.dat and b/P3D/Content/Data/maps/frontier/battlefactory/main.dat differ
diff --git a/P3D/Content/Data/maps/frontier/battlefactory/rental.dat b/P3D/Content/Data/maps/frontier/battlefactory/rental.dat
index 6704d3b04..685c60f35 100644
Binary files a/P3D/Content/Data/maps/frontier/battlefactory/rental.dat and b/P3D/Content/Data/maps/frontier/battlefactory/rental.dat differ
diff --git a/P3D/Content/Data/maps/frontier/battlefrontier.dat b/P3D/Content/Data/maps/frontier/battlefrontier.dat
index 0f4d2f1fb..bbcd7a2b8 100644
Binary files a/P3D/Content/Data/maps/frontier/battlefrontier.dat and b/P3D/Content/Data/maps/frontier/battlefrontier.dat differ
diff --git a/P3D/Content/Data/maps/frontier/battletower/arena.dat b/P3D/Content/Data/maps/frontier/battletower/arena.dat
index 9dab3263b..3f1ae364c 100644
Binary files a/P3D/Content/Data/maps/frontier/battletower/arena.dat and b/P3D/Content/Data/maps/frontier/battletower/arena.dat differ
diff --git a/P3D/Content/Data/maps/frontier/battletower/main.dat b/P3D/Content/Data/maps/frontier/battletower/main.dat
index 35bfe6e39..3feace4e1 100644
Binary files a/P3D/Content/Data/maps/frontier/battletower/main.dat and b/P3D/Content/Data/maps/frontier/battletower/main.dat differ
diff --git a/P3D/Content/Data/maps/frontier/battletower/passage.dat b/P3D/Content/Data/maps/frontier/battletower/passage.dat
index c523155f6..452463fc1 100644
Binary files a/P3D/Content/Data/maps/frontier/battletower/passage.dat and b/P3D/Content/Data/maps/frontier/battletower/passage.dat differ
diff --git a/P3D/Content/Data/maps/frontier/main.dat b/P3D/Content/Data/maps/frontier/main.dat
index d71125d27..eae063176 100644
Binary files a/P3D/Content/Data/maps/frontier/main.dat and b/P3D/Content/Data/maps/frontier/main.dat differ
diff --git a/P3D/Content/Data/maps/fuchsia/1.dat b/P3D/Content/Data/maps/fuchsia/1.dat
index 9c31b2a13..1c953f81f 100644
Binary files a/P3D/Content/Data/maps/fuchsia/1.dat and b/P3D/Content/Data/maps/fuchsia/1.dat differ
diff --git a/P3D/Content/Data/maps/fuchsia/2.dat b/P3D/Content/Data/maps/fuchsia/2.dat
index c3f0804da..ecf70be7a 100644
Binary files a/P3D/Content/Data/maps/fuchsia/2.dat and b/P3D/Content/Data/maps/fuchsia/2.dat differ
diff --git a/P3D/Content/Data/maps/fuchsia/center.dat b/P3D/Content/Data/maps/fuchsia/center.dat
index 6695dfeaa..e8f526e5b 100644
Binary files a/P3D/Content/Data/maps/fuchsia/center.dat and b/P3D/Content/Data/maps/fuchsia/center.dat differ
diff --git a/P3D/Content/Data/maps/fuchsia/main.dat b/P3D/Content/Data/maps/fuchsia/main.dat
index fe2d1bbd9..812866b36 100644
Binary files a/P3D/Content/Data/maps/fuchsia/main.dat and b/P3D/Content/Data/maps/fuchsia/main.dat differ
diff --git a/P3D/Content/Data/maps/fuchsia/mart.dat b/P3D/Content/Data/maps/fuchsia/mart.dat
index 76686f05a..bf8afc564 100644
Binary files a/P3D/Content/Data/maps/fuchsia/mart.dat and b/P3D/Content/Data/maps/fuchsia/mart.dat differ
diff --git a/P3D/Content/Data/maps/fuchsia/rarestore.dat b/P3D/Content/Data/maps/fuchsia/rarestore.dat
index 145daab08..2047568ff 100644
Binary files a/P3D/Content/Data/maps/fuchsia/rarestore.dat and b/P3D/Content/Data/maps/fuchsia/rarestore.dat differ
diff --git a/P3D/Content/Data/maps/fuchsia/safarioffice.dat b/P3D/Content/Data/maps/fuchsia/safarioffice.dat
index e49243282..f7ecd030c 100644
Binary files a/P3D/Content/Data/maps/fuchsia/safarioffice.dat and b/P3D/Content/Data/maps/fuchsia/safarioffice.dat differ
diff --git a/P3D/Content/Data/maps/gates/alphroute32gate.dat b/P3D/Content/Data/maps/gates/alphroute32gate.dat
index c8cac03e7..c8365c68c 100644
Binary files a/P3D/Content/Data/maps/gates/alphroute32gate.dat and b/P3D/Content/Data/maps/gates/alphroute32gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/alphroute36gate.dat b/P3D/Content/Data/maps/gates/alphroute36gate.dat
index 2b4179956..0cdf40594 100644
Binary files a/P3D/Content/Data/maps/gates/alphroute36gate.dat and b/P3D/Content/Data/maps/gates/alphroute36gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/azaleailexgate.dat b/P3D/Content/Data/maps/gates/azaleailexgate.dat
index b1a5c268c..3d2d040d4 100644
Binary files a/P3D/Content/Data/maps/gates/azaleailexgate.dat and b/P3D/Content/Data/maps/gates/azaleailexgate.dat differ
diff --git a/P3D/Content/Data/maps/gates/battlegate.dat b/P3D/Content/Data/maps/gates/battlegate.dat
index 8b0454706..25796e74d 100644
Binary files a/P3D/Content/Data/maps/gates/battlegate.dat and b/P3D/Content/Data/maps/gates/battlegate.dat differ
diff --git a/P3D/Content/Data/maps/gates/berry-bridgegate.dat b/P3D/Content/Data/maps/gates/berry-bridgegate.dat
index 340166063..e5edee1be 100644
Binary files a/P3D/Content/Data/maps/gates/berry-bridgegate.dat and b/P3D/Content/Data/maps/gates/berry-bridgegate.dat differ
diff --git a/P3D/Content/Data/maps/gates/cliffedge.dat b/P3D/Content/Data/maps/gates/cliffedge.dat
index e2a3947b4..3fa7386fe 100644
Binary files a/P3D/Content/Data/maps/gates/cliffedge.dat and b/P3D/Content/Data/maps/gates/cliffedge.dat differ
diff --git a/P3D/Content/Data/maps/gates/ecruteakroute38gate.dat b/P3D/Content/Data/maps/gates/ecruteakroute38gate.dat
index 5acc88f93..826838fd0 100644
Binary files a/P3D/Content/Data/maps/gates/ecruteakroute38gate.dat and b/P3D/Content/Data/maps/gates/ecruteakroute38gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/ecruteakroute42gate.dat b/P3D/Content/Data/maps/gates/ecruteakroute42gate.dat
index 9f9c199e1..ff698a204 100644
Binary files a/P3D/Content/Data/maps/gates/ecruteakroute42gate.dat and b/P3D/Content/Data/maps/gates/ecruteakroute42gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/fuchsia-15gate.dat b/P3D/Content/Data/maps/gates/fuchsia-15gate.dat
index eb4f17695..0d16b98c2 100644
Binary files a/P3D/Content/Data/maps/gates/fuchsia-15gate.dat and b/P3D/Content/Data/maps/gates/fuchsia-15gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/fuchsia-19gate.dat b/P3D/Content/Data/maps/gates/fuchsia-19gate.dat
index 16fe080ba..53a885c37 100644
Binary files a/P3D/Content/Data/maps/gates/fuchsia-19gate.dat and b/P3D/Content/Data/maps/gates/fuchsia-19gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/goldenrodroute35gate.dat b/P3D/Content/Data/maps/gates/goldenrodroute35gate.dat
index 3ace7a7e5..e65f1cf5c 100644
Binary files a/P3D/Content/Data/maps/gates/goldenrodroute35gate.dat and b/P3D/Content/Data/maps/gates/goldenrodroute35gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/ilexroute34gate.dat b/P3D/Content/Data/maps/gates/ilexroute34gate.dat
index 4d9ca5e4b..e66db1eb1 100644
Binary files a/P3D/Content/Data/maps/gates/ilexroute34gate.dat and b/P3D/Content/Data/maps/gates/ilexroute34gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/league.dat b/P3D/Content/Data/maps/gates/league.dat
index 7d1d72d7e..decc4d9ba 100644
Binary files a/P3D/Content/Data/maps/gates/league.dat and b/P3D/Content/Data/maps/gates/league.dat differ
diff --git a/P3D/Content/Data/maps/gates/mahoganyroute43gate.dat b/P3D/Content/Data/maps/gates/mahoganyroute43gate.dat
index 8d70ef52a..c9a0aa656 100644
Binary files a/P3D/Content/Data/maps/gates/mahoganyroute43gate.dat and b/P3D/Content/Data/maps/gates/mahoganyroute43gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/route16.dat b/P3D/Content/Data/maps/gates/route16.dat
index 6114f0771..147a118d4 100644
Binary files a/P3D/Content/Data/maps/gates/route16.dat and b/P3D/Content/Data/maps/gates/route16.dat differ
diff --git a/P3D/Content/Data/maps/gates/route17-18.dat b/P3D/Content/Data/maps/gates/route17-18.dat
index c752eacfe..09df64f8b 100644
Binary files a/P3D/Content/Data/maps/gates/route17-18.dat and b/P3D/Content/Data/maps/gates/route17-18.dat differ
diff --git a/P3D/Content/Data/maps/gates/route2946gate.dat b/P3D/Content/Data/maps/gates/route2946gate.dat
index c13df8030..cf73ed4df 100644
Binary files a/P3D/Content/Data/maps/gates/route2946gate.dat and b/P3D/Content/Data/maps/gates/route2946gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/route43gate.dat b/P3D/Content/Data/maps/gates/route43gate.dat
index 958638f7a..b63d25bfa 100644
Binary files a/P3D/Content/Data/maps/gates/route43gate.dat and b/P3D/Content/Data/maps/gates/route43gate.dat differ
diff --git a/P3D/Content/Data/maps/gates/saffroneast.dat b/P3D/Content/Data/maps/gates/saffroneast.dat
index a67b4e0eb..46a368cf9 100644
Binary files a/P3D/Content/Data/maps/gates/saffroneast.dat and b/P3D/Content/Data/maps/gates/saffroneast.dat differ
diff --git a/P3D/Content/Data/maps/gates/saffronnorth.dat b/P3D/Content/Data/maps/gates/saffronnorth.dat
index fbf8e2494..61ccb681e 100644
Binary files a/P3D/Content/Data/maps/gates/saffronnorth.dat and b/P3D/Content/Data/maps/gates/saffronnorth.dat differ
diff --git a/P3D/Content/Data/maps/gates/saffronsouth.dat b/P3D/Content/Data/maps/gates/saffronsouth.dat
index 38de9d50f..86408fe5c 100644
Binary files a/P3D/Content/Data/maps/gates/saffronsouth.dat and b/P3D/Content/Data/maps/gates/saffronsouth.dat differ
diff --git a/P3D/Content/Data/maps/gates/saffronwest.dat b/P3D/Content/Data/maps/gates/saffronwest.dat
index 72219091f..a7e726027 100644
Binary files a/P3D/Content/Data/maps/gates/saffronwest.dat and b/P3D/Content/Data/maps/gates/saffronwest.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod.dat b/P3D/Content/Data/maps/goldenrod.dat
index 23105573c..d43f1408c 100644
--- a/P3D/Content/Data/maps/goldenrod.dat
+++ b/P3D/Content/Data/maps/goldenrod.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Goldenrod City]}}{"MusicLoop"{str[Goldenrod]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
 
 Brick:
 {"Floor"{ENT[{"Size"{intArr[4,36]}}{"Position"{intArr[18,0,0]}}{"TexturePath"{str[Goldenrod]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/goldenrod/001.dat b/P3D/Content/Data/maps/goldenrod/001.dat
index 7e0fd09b7..86fdee590 100644
Binary files a/P3D/Content/Data/maps/goldenrod/001.dat and b/P3D/Content/Data/maps/goldenrod/001.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/002.dat b/P3D/Content/Data/maps/goldenrod/002.dat
index 11a244ad0..16ccbac70 100644
Binary files a/P3D/Content/Data/maps/goldenrod/002.dat and b/P3D/Content/Data/maps/goldenrod/002.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/bill.dat b/P3D/Content/Data/maps/goldenrod/bill.dat
index a4b3d8745..75fdde175 100644
Binary files a/P3D/Content/Data/maps/goldenrod/bill.dat and b/P3D/Content/Data/maps/goldenrod/bill.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/center.dat b/P3D/Content/Data/maps/goldenrod/center.dat
index 8c5b15799..def3c797b 100644
Binary files a/P3D/Content/Data/maps/goldenrod/center.dat and b/P3D/Content/Data/maps/goldenrod/center.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/center_friends.dat b/P3D/Content/Data/maps/goldenrod/center_friends.dat
index 9d51f807c..323b853bd 100644
Binary files a/P3D/Content/Data/maps/goldenrod/center_friends.dat and b/P3D/Content/Data/maps/goldenrod/center_friends.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/center_global.dat b/P3D/Content/Data/maps/goldenrod/center_global.dat
index 9a2d4726f..29d3e592b 100644
Binary files a/P3D/Content/Data/maps/goldenrod/center_global.dat and b/P3D/Content/Data/maps/goldenrod/center_global.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/club.dat b/P3D/Content/Data/maps/goldenrod/club.dat
index 621df4734..478d63ce9 100644
Binary files a/P3D/Content/Data/maps/goldenrod/club.dat and b/P3D/Content/Data/maps/goldenrod/club.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/flowershop.dat b/P3D/Content/Data/maps/goldenrod/flowershop.dat
index 2aa8f0c9c..11d8c5648 100644
Binary files a/P3D/Content/Data/maps/goldenrod/flowershop.dat and b/P3D/Content/Data/maps/goldenrod/flowershop.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/mart.dat b/P3D/Content/Data/maps/goldenrod/mart.dat
index b14bb66d9..cb9e83e81 100644
Binary files a/P3D/Content/Data/maps/goldenrod/mart.dat and b/P3D/Content/Data/maps/goldenrod/mart.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/martbasement.dat b/P3D/Content/Data/maps/goldenrod/martbasement.dat
index c0964b3a4..42047b7f3 100644
Binary files a/P3D/Content/Data/maps/goldenrod/martbasement.dat and b/P3D/Content/Data/maps/goldenrod/martbasement.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/namerater.dat b/P3D/Content/Data/maps/goldenrod/namerater.dat
index 096c7c7cd..fe1613c6f 100644
Binary files a/P3D/Content/Data/maps/goldenrod/namerater.dat and b/P3D/Content/Data/maps/goldenrod/namerater.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/radiotower/1f.dat b/P3D/Content/Data/maps/goldenrod/radiotower/1f.dat
index 6def596c6..ddf7a1e2c 100644
Binary files a/P3D/Content/Data/maps/goldenrod/radiotower/1f.dat and b/P3D/Content/Data/maps/goldenrod/radiotower/1f.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/radiotower/2f.dat b/P3D/Content/Data/maps/goldenrod/radiotower/2f.dat
index e0e08489b..ba1bc263d 100644
Binary files a/P3D/Content/Data/maps/goldenrod/radiotower/2f.dat and b/P3D/Content/Data/maps/goldenrod/radiotower/2f.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/radiotower/3f.dat b/P3D/Content/Data/maps/goldenrod/radiotower/3f.dat
index f8075b346..2d50218b6 100644
Binary files a/P3D/Content/Data/maps/goldenrod/radiotower/3f.dat and b/P3D/Content/Data/maps/goldenrod/radiotower/3f.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/radiotower/4f.dat b/P3D/Content/Data/maps/goldenrod/radiotower/4f.dat
index d1e6ca396..8764b74e3 100644
Binary files a/P3D/Content/Data/maps/goldenrod/radiotower/4f.dat and b/P3D/Content/Data/maps/goldenrod/radiotower/4f.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/radiotower/5f.dat b/P3D/Content/Data/maps/goldenrod/radiotower/5f.dat
index eb03ef45a..f1a414cb1 100644
Binary files a/P3D/Content/Data/maps/goldenrod/radiotower/5f.dat and b/P3D/Content/Data/maps/goldenrod/radiotower/5f.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/taming_shop.dat b/P3D/Content/Data/maps/goldenrod/taming_shop.dat
index 41fe0e748..42021b5db 100644
Binary files a/P3D/Content/Data/maps/goldenrod/taming_shop.dat and b/P3D/Content/Data/maps/goldenrod/taming_shop.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/trainstation.dat b/P3D/Content/Data/maps/goldenrod/trainstation.dat
index 107db0588..6f312e32d 100644
Binary files a/P3D/Content/Data/maps/goldenrod/trainstation.dat and b/P3D/Content/Data/maps/goldenrod/trainstation.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/underground0.dat b/P3D/Content/Data/maps/goldenrod/underground0.dat
index 73ad3a503..2e09a7876 100644
Binary files a/P3D/Content/Data/maps/goldenrod/underground0.dat and b/P3D/Content/Data/maps/goldenrod/underground0.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/underground1.dat b/P3D/Content/Data/maps/goldenrod/underground1.dat
index 4239e3b42..e207b96c4 100644
Binary files a/P3D/Content/Data/maps/goldenrod/underground1.dat and b/P3D/Content/Data/maps/goldenrod/underground1.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/underground2.dat b/P3D/Content/Data/maps/goldenrod/underground2.dat
index db2c4d45d..02629fb4e 100644
Binary files a/P3D/Content/Data/maps/goldenrod/underground2.dat and b/P3D/Content/Data/maps/goldenrod/underground2.dat differ
diff --git a/P3D/Content/Data/maps/goldenrod/underground3.dat b/P3D/Content/Data/maps/goldenrod/underground3.dat
index f0fa9d950..c655c44d9 100644
Binary files a/P3D/Content/Data/maps/goldenrod/underground3.dat and b/P3D/Content/Data/maps/goldenrod/underground3.dat differ
diff --git a/P3D/Content/Data/maps/gyms/azalea_gym.dat b/P3D/Content/Data/maps/gyms/azalea_gym.dat
index 8b9f14e46..975d90dd6 100644
Binary files a/P3D/Content/Data/maps/gyms/azalea_gym.dat and b/P3D/Content/Data/maps/gyms/azalea_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/blackthorn_gym_1.dat b/P3D/Content/Data/maps/gyms/blackthorn_gym_1.dat
index 749a81ab4..b12d4afc5 100644
Binary files a/P3D/Content/Data/maps/gyms/blackthorn_gym_1.dat and b/P3D/Content/Data/maps/gyms/blackthorn_gym_1.dat differ
diff --git a/P3D/Content/Data/maps/gyms/blackthorn_gym_2.dat b/P3D/Content/Data/maps/gyms/blackthorn_gym_2.dat
index a69980e8a..3e94900a6 100644
Binary files a/P3D/Content/Data/maps/gyms/blackthorn_gym_2.dat and b/P3D/Content/Data/maps/gyms/blackthorn_gym_2.dat differ
diff --git a/P3D/Content/Data/maps/gyms/celadon_gym.dat b/P3D/Content/Data/maps/gyms/celadon_gym.dat
index 78a5f710f..7ba7c9083 100644
Binary files a/P3D/Content/Data/maps/gyms/celadon_gym.dat and b/P3D/Content/Data/maps/gyms/celadon_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/cerulean_gym.dat b/P3D/Content/Data/maps/gyms/cerulean_gym.dat
index 4333910ac..abb7a23fa 100644
Binary files a/P3D/Content/Data/maps/gyms/cerulean_gym.dat and b/P3D/Content/Data/maps/gyms/cerulean_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/cianwood_gym.dat b/P3D/Content/Data/maps/gyms/cianwood_gym.dat
index 4c87902b8..4d0e8fd8b 100644
Binary files a/P3D/Content/Data/maps/gyms/cianwood_gym.dat and b/P3D/Content/Data/maps/gyms/cianwood_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/cinnabar_gym.dat b/P3D/Content/Data/maps/gyms/cinnabar_gym.dat
index 3e174dcf2..708dcecd2 100644
Binary files a/P3D/Content/Data/maps/gyms/cinnabar_gym.dat and b/P3D/Content/Data/maps/gyms/cinnabar_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/ecruteak_gym.dat b/P3D/Content/Data/maps/gyms/ecruteak_gym.dat
index 6db8a4c86..292d3f24d 100644
Binary files a/P3D/Content/Data/maps/gyms/ecruteak_gym.dat and b/P3D/Content/Data/maps/gyms/ecruteak_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/fuchsia_gym.dat b/P3D/Content/Data/maps/gyms/fuchsia_gym.dat
index 2ff0b8a6b..9da0b531f 100644
Binary files a/P3D/Content/Data/maps/gyms/fuchsia_gym.dat and b/P3D/Content/Data/maps/gyms/fuchsia_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/goldenrod_gym.dat b/P3D/Content/Data/maps/gyms/goldenrod_gym.dat
index 725acb862..7e6f85db5 100644
Binary files a/P3D/Content/Data/maps/gyms/goldenrod_gym.dat and b/P3D/Content/Data/maps/gyms/goldenrod_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/mahogany_gym.dat b/P3D/Content/Data/maps/gyms/mahogany_gym.dat
index 32f6bc5fd..f790d503c 100644
Binary files a/P3D/Content/Data/maps/gyms/mahogany_gym.dat and b/P3D/Content/Data/maps/gyms/mahogany_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/olivine_gym.dat b/P3D/Content/Data/maps/gyms/olivine_gym.dat
index cb114ef9d..a654c3e0f 100644
Binary files a/P3D/Content/Data/maps/gyms/olivine_gym.dat and b/P3D/Content/Data/maps/gyms/olivine_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/pewter_gym.dat b/P3D/Content/Data/maps/gyms/pewter_gym.dat
index 35e1b8c77..aab5602ed 100644
Binary files a/P3D/Content/Data/maps/gyms/pewter_gym.dat and b/P3D/Content/Data/maps/gyms/pewter_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/saffron_gym.dat b/P3D/Content/Data/maps/gyms/saffron_gym.dat
index 1281de323..6e2f77c06 100644
Binary files a/P3D/Content/Data/maps/gyms/saffron_gym.dat and b/P3D/Content/Data/maps/gyms/saffron_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/vermilion_gym.dat b/P3D/Content/Data/maps/gyms/vermilion_gym.dat
index 2c66ae806..7e2d723c9 100644
Binary files a/P3D/Content/Data/maps/gyms/vermilion_gym.dat and b/P3D/Content/Data/maps/gyms/vermilion_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/violet_gym.dat b/P3D/Content/Data/maps/gyms/violet_gym.dat
index e35b1e2ae..02a065626 100644
Binary files a/P3D/Content/Data/maps/gyms/violet_gym.dat and b/P3D/Content/Data/maps/gyms/violet_gym.dat differ
diff --git a/P3D/Content/Data/maps/gyms/viridian_gym.dat b/P3D/Content/Data/maps/gyms/viridian_gym.dat
index c48b2a330..92847ff0c 100644
Binary files a/P3D/Content/Data/maps/gyms/viridian_gym.dat and b/P3D/Content/Data/maps/gyms/viridian_gym.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/berryvista.dat b/P3D/Content/Data/maps/hiddengrotto/berryvista.dat
index 0440aa23d..05488d391 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/berryvista.dat and b/P3D/Content/Data/maps/hiddengrotto/berryvista.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/ilexforest.dat b/P3D/Content/Data/maps/hiddengrotto/ilexforest.dat
index 4326cddd5..3bd9959cc 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/ilexforest.dat and b/P3D/Content/Data/maps/hiddengrotto/ilexforest.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/indigo.dat b/P3D/Content/Data/maps/hiddengrotto/indigo.dat
index 813be7718..c9f4f9bbf 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/indigo.dat and b/P3D/Content/Data/maps/hiddengrotto/indigo.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/lakeofrage.dat b/P3D/Content/Data/maps/hiddengrotto/lakeofrage.dat
index 553d09417..2bf863cba 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/lakeofrage.dat and b/P3D/Content/Data/maps/hiddengrotto/lakeofrage.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/mahogany.dat b/P3D/Content/Data/maps/hiddengrotto/mahogany.dat
index ebe3c6b90..7b01f8268 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/mahogany.dat and b/P3D/Content/Data/maps/hiddengrotto/mahogany.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/nationalpark0.dat b/P3D/Content/Data/maps/hiddengrotto/nationalpark0.dat
index c6a1dcfd2..95e9e98f7 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/nationalpark0.dat and b/P3D/Content/Data/maps/hiddengrotto/nationalpark0.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route26.dat b/P3D/Content/Data/maps/hiddengrotto/route26.dat
index f457af163..2cbf61f5d 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route26.dat and b/P3D/Content/Data/maps/hiddengrotto/route26.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route27.dat b/P3D/Content/Data/maps/hiddengrotto/route27.dat
index 3c08bd5f4..b11828504 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route27.dat and b/P3D/Content/Data/maps/hiddengrotto/route27.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route31.dat b/P3D/Content/Data/maps/hiddengrotto/route31.dat
index 571fd4c0c..d969e0b97 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route31.dat and b/P3D/Content/Data/maps/hiddengrotto/route31.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route32.dat b/P3D/Content/Data/maps/hiddengrotto/route32.dat
index a068acff7..ad436ac24 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route32.dat and b/P3D/Content/Data/maps/hiddengrotto/route32.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route34.dat b/P3D/Content/Data/maps/hiddengrotto/route34.dat
index 782aa9fbf..c303ac850 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route34.dat and b/P3D/Content/Data/maps/hiddengrotto/route34.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route35.dat b/P3D/Content/Data/maps/hiddengrotto/route35.dat
index 53706d8c7..cc36f4550 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route35.dat and b/P3D/Content/Data/maps/hiddengrotto/route35.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route39.dat b/P3D/Content/Data/maps/hiddengrotto/route39.dat
index 4d65021da..cdf40f11c 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route39.dat and b/P3D/Content/Data/maps/hiddengrotto/route39.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route42.dat b/P3D/Content/Data/maps/hiddengrotto/route42.dat
index 044c53dea..cdddc653e 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route42.dat and b/P3D/Content/Data/maps/hiddengrotto/route42.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route43.dat b/P3D/Content/Data/maps/hiddengrotto/route43.dat
index b96c87324..dd3f2e553 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route43.dat and b/P3D/Content/Data/maps/hiddengrotto/route43.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route44.dat b/P3D/Content/Data/maps/hiddengrotto/route44.dat
index 9a26af2cf..3716b2180 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route44.dat and b/P3D/Content/Data/maps/hiddengrotto/route44.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route46.dat b/P3D/Content/Data/maps/hiddengrotto/route46.dat
index 6ffcb05fd..64d9902be 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route46.dat and b/P3D/Content/Data/maps/hiddengrotto/route46.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route47.dat b/P3D/Content/Data/maps/hiddengrotto/route47.dat
index e2fdd5925..046b87e43 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route47.dat and b/P3D/Content/Data/maps/hiddengrotto/route47.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/route48.dat b/P3D/Content/Data/maps/hiddengrotto/route48.dat
index 42dd7742b..608f76c00 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/route48.dat and b/P3D/Content/Data/maps/hiddengrotto/route48.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/twirl.dat b/P3D/Content/Data/maps/hiddengrotto/twirl.dat
index f71bf19e6..c3ab6a07a 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/twirl.dat and b/P3D/Content/Data/maps/hiddengrotto/twirl.dat differ
diff --git a/P3D/Content/Data/maps/hiddengrotto/violet.dat b/P3D/Content/Data/maps/hiddengrotto/violet.dat
index 3cf8e9de6..9a388d330 100644
Binary files a/P3D/Content/Data/maps/hiddengrotto/violet.dat and b/P3D/Content/Data/maps/hiddengrotto/violet.dat differ
diff --git a/P3D/Content/Data/maps/icefall/basement.dat b/P3D/Content/Data/maps/icefall/basement.dat
index 851baf3fd..809771bc7 100644
Binary files a/P3D/Content/Data/maps/icefall/basement.dat and b/P3D/Content/Data/maps/icefall/basement.dat differ
diff --git a/P3D/Content/Data/maps/icefall/bay.dat b/P3D/Content/Data/maps/icefall/bay.dat
index 22d658aeb..9ed864b0a 100644
Binary files a/P3D/Content/Data/maps/icefall/bay.dat and b/P3D/Content/Data/maps/icefall/bay.dat differ
diff --git a/P3D/Content/Data/maps/icefall/dive.dat b/P3D/Content/Data/maps/icefall/dive.dat
index 105b1ff85..d632da60c 100644
Binary files a/P3D/Content/Data/maps/icefall/dive.dat and b/P3D/Content/Data/maps/icefall/dive.dat differ
diff --git a/P3D/Content/Data/maps/icefall/ent.dat b/P3D/Content/Data/maps/icefall/ent.dat
index 8bd7596f3..a75730eb7 100644
Binary files a/P3D/Content/Data/maps/icefall/ent.dat and b/P3D/Content/Data/maps/icefall/ent.dat differ
diff --git a/P3D/Content/Data/maps/icefall/ground.dat b/P3D/Content/Data/maps/icefall/ground.dat
index 44eabe164..5859b0899 100644
Binary files a/P3D/Content/Data/maps/icefall/ground.dat and b/P3D/Content/Data/maps/icefall/ground.dat differ
diff --git a/P3D/Content/Data/maps/icepath/1f.dat b/P3D/Content/Data/maps/icepath/1f.dat
index 77b4793dc..56095e4de 100644
Binary files a/P3D/Content/Data/maps/icepath/1f.dat and b/P3D/Content/Data/maps/icepath/1f.dat differ
diff --git a/P3D/Content/Data/maps/icepath/2f.dat b/P3D/Content/Data/maps/icepath/2f.dat
index 42a6445f8..84c681b50 100644
Binary files a/P3D/Content/Data/maps/icepath/2f.dat and b/P3D/Content/Data/maps/icepath/2f.dat differ
diff --git a/P3D/Content/Data/maps/icepath/3f.dat b/P3D/Content/Data/maps/icepath/3f.dat
index 2f85ae50d..d4b549517 100644
Binary files a/P3D/Content/Data/maps/icepath/3f.dat and b/P3D/Content/Data/maps/icepath/3f.dat differ
diff --git a/P3D/Content/Data/maps/icepath/4f.dat b/P3D/Content/Data/maps/icepath/4f.dat
index bd8e20510..c8310e8cb 100644
Binary files a/P3D/Content/Data/maps/icepath/4f.dat and b/P3D/Content/Data/maps/icepath/4f.dat differ
diff --git a/P3D/Content/Data/maps/ilexforest.dat b/P3D/Content/Data/maps/ilexforest.dat
index 2d6797d4c..f69f5a82e 100644
--- a/P3D/Content/Data/maps/ilexforest.dat
+++ b/P3D/Content/Data/maps/ilexforest.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Ilex Forest]}}{"MusicLoop"{str[ilex_forest]}}{"WildPokemon"{bool[1]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[5]}}{"Weather"{int[0]}}{"Lightning"{int[2]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[5]}}{"Weather"{int[0]}}{"Lighting"{int[2]}}]}}
 
 Floors:
 {"Floor"{ENT[{"Size"{intArr[34,10]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[Routes]}}{"Texture"{rec[32,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/indigo/bruno.dat b/P3D/Content/Data/maps/indigo/bruno.dat
index c8e509ffb..8521e17ef 100644
Binary files a/P3D/Content/Data/maps/indigo/bruno.dat and b/P3D/Content/Data/maps/indigo/bruno.dat differ
diff --git a/P3D/Content/Data/maps/indigo/halloffame.dat b/P3D/Content/Data/maps/indigo/halloffame.dat
index 1fb2ba5e9..c6cbe263d 100644
Binary files a/P3D/Content/Data/maps/indigo/halloffame.dat and b/P3D/Content/Data/maps/indigo/halloffame.dat differ
diff --git a/P3D/Content/Data/maps/indigo/halloffame_interface.dat b/P3D/Content/Data/maps/indigo/halloffame_interface.dat
index bfc72cc46..afccd8227 100644
Binary files a/P3D/Content/Data/maps/indigo/halloffame_interface.dat and b/P3D/Content/Data/maps/indigo/halloffame_interface.dat differ
diff --git a/P3D/Content/Data/maps/indigo/inside.dat b/P3D/Content/Data/maps/indigo/inside.dat
index 442553122..ec0bfdb54 100644
Binary files a/P3D/Content/Data/maps/indigo/inside.dat and b/P3D/Content/Data/maps/indigo/inside.dat differ
diff --git a/P3D/Content/Data/maps/indigo/karen.dat b/P3D/Content/Data/maps/indigo/karen.dat
index 5d27b4299..7058a0cfb 100644
Binary files a/P3D/Content/Data/maps/indigo/karen.dat and b/P3D/Content/Data/maps/indigo/karen.dat differ
diff --git a/P3D/Content/Data/maps/indigo/koga.dat b/P3D/Content/Data/maps/indigo/koga.dat
index 14b050d68..ca50e6417 100644
Binary files a/P3D/Content/Data/maps/indigo/koga.dat and b/P3D/Content/Data/maps/indigo/koga.dat differ
diff --git a/P3D/Content/Data/maps/indigo/lance.dat b/P3D/Content/Data/maps/indigo/lance.dat
index 5dc59238a..84991944a 100644
Binary files a/P3D/Content/Data/maps/indigo/lance.dat and b/P3D/Content/Data/maps/indigo/lance.dat differ
diff --git a/P3D/Content/Data/maps/indigo/outside.dat b/P3D/Content/Data/maps/indigo/outside.dat
index 65139fdb3..da1752c74 100644
--- a/P3D/Content/Data/maps/indigo/outside.dat
+++ b/P3D/Content/Data/maps/indigo/outside.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Indigo Plateau]}}{"MusicLoop"{str[indigo]}}{"CurrentRegion"{str[Johto,Kanto]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[1,1]}}{"Position"{intArr[-1,0,1]}}{"TexturePath"{str[Routes]}}{"Texture"{rec[96,16,16,16]}}{"Visible"{bool[0]}}{"hasSnow"{bool[0]}}]}}
diff --git a/P3D/Content/Data/maps/indigo/portraitplace.dat b/P3D/Content/Data/maps/indigo/portraitplace.dat
index d56c1dab7..0459055cf 100644
Binary files a/P3D/Content/Data/maps/indigo/portraitplace.dat and b/P3D/Content/Data/maps/indigo/portraitplace.dat differ
diff --git a/P3D/Content/Data/maps/indigo/will.dat b/P3D/Content/Data/maps/indigo/will.dat
index 8720dd521..406112403 100644
Binary files a/P3D/Content/Data/maps/indigo/will.dat and b/P3D/Content/Data/maps/indigo/will.dat differ
diff --git a/P3D/Content/Data/maps/kin/1.dat b/P3D/Content/Data/maps/kin/1.dat
index cec11e689..6a7fb844e 100644
Binary files a/P3D/Content/Data/maps/kin/1.dat and b/P3D/Content/Data/maps/kin/1.dat differ
diff --git a/P3D/Content/Data/maps/kin/2.dat b/P3D/Content/Data/maps/kin/2.dat
index 670692379..6e3cf9bd0 100644
Binary files a/P3D/Content/Data/maps/kin/2.dat and b/P3D/Content/Data/maps/kin/2.dat differ
diff --git a/P3D/Content/Data/maps/kin/3.dat b/P3D/Content/Data/maps/kin/3.dat
index 56f6a23d3..959b2a263 100644
Binary files a/P3D/Content/Data/maps/kin/3.dat and b/P3D/Content/Data/maps/kin/3.dat differ
diff --git a/P3D/Content/Data/maps/kin/4.dat b/P3D/Content/Data/maps/kin/4.dat
index 72d8ba34a..f6a1e9d11 100644
Binary files a/P3D/Content/Data/maps/kin/4.dat and b/P3D/Content/Data/maps/kin/4.dat differ
diff --git a/P3D/Content/Data/maps/kin/5.dat b/P3D/Content/Data/maps/kin/5.dat
index 360aec59a..d8a29897e 100644
Binary files a/P3D/Content/Data/maps/kin/5.dat and b/P3D/Content/Data/maps/kin/5.dat differ
diff --git a/P3D/Content/Data/maps/kin/bbridge.dat b/P3D/Content/Data/maps/kin/bbridge.dat
index b669cc05c..7dad3255b 100644
Binary files a/P3D/Content/Data/maps/kin/bbridge.dat and b/P3D/Content/Data/maps/kin/bbridge.dat differ
diff --git a/P3D/Content/Data/maps/kin/berry.dat b/P3D/Content/Data/maps/kin/berry.dat
index c839a22b0..d124ed930 100644
Binary files a/P3D/Content/Data/maps/kin/berry.dat and b/P3D/Content/Data/maps/kin/berry.dat differ
diff --git a/P3D/Content/Data/maps/kin/center.dat b/P3D/Content/Data/maps/kin/center.dat
index 4827b5778..a4141ce4a 100644
Binary files a/P3D/Content/Data/maps/kin/center.dat and b/P3D/Content/Data/maps/kin/center.dat differ
diff --git a/P3D/Content/Data/maps/kin/dock.dat b/P3D/Content/Data/maps/kin/dock.dat
index 658167d8e..855e20094 100644
Binary files a/P3D/Content/Data/maps/kin/dock.dat and b/P3D/Content/Data/maps/kin/dock.dat differ
diff --git a/P3D/Content/Data/maps/kin/mart.dat b/P3D/Content/Data/maps/kin/mart.dat
index 0793b926b..166c2225b 100644
Binary files a/P3D/Content/Data/maps/kin/mart.dat and b/P3D/Content/Data/maps/kin/mart.dat differ
diff --git a/P3D/Content/Data/maps/kin/path.dat b/P3D/Content/Data/maps/kin/path.dat
index 9c79f4f74..1e25dbfcc 100644
Binary files a/P3D/Content/Data/maps/kin/path.dat and b/P3D/Content/Data/maps/kin/path.dat differ
diff --git a/P3D/Content/Data/maps/kin/port.dat b/P3D/Content/Data/maps/kin/port.dat
index 6ad8d27b6..ea24398c0 100644
Binary files a/P3D/Content/Data/maps/kin/port.dat and b/P3D/Content/Data/maps/kin/port.dat differ
diff --git a/P3D/Content/Data/maps/kin/town.dat b/P3D/Content/Data/maps/kin/town.dat
index 5b9715f5e..7a4faacbc 100644
Binary files a/P3D/Content/Data/maps/kin/town.dat and b/P3D/Content/Data/maps/kin/town.dat differ
diff --git a/P3D/Content/Data/maps/knot/1.dat b/P3D/Content/Data/maps/knot/1.dat
index 887073fd1..82dfd6e72 100644
Binary files a/P3D/Content/Data/maps/knot/1.dat and b/P3D/Content/Data/maps/knot/1.dat differ
diff --git a/P3D/Content/Data/maps/knot/2.dat b/P3D/Content/Data/maps/knot/2.dat
index d7cdae5a4..609fdd5a5 100644
Binary files a/P3D/Content/Data/maps/knot/2.dat and b/P3D/Content/Data/maps/knot/2.dat differ
diff --git a/P3D/Content/Data/maps/knot/dock.dat b/P3D/Content/Data/maps/knot/dock.dat
index 02fadae06..b76ea6105 100644
Binary files a/P3D/Content/Data/maps/knot/dock.dat and b/P3D/Content/Data/maps/knot/dock.dat differ
diff --git a/P3D/Content/Data/maps/knot/kindle.dat b/P3D/Content/Data/maps/knot/kindle.dat
index 8721be3ff..683da3ba9 100644
Binary files a/P3D/Content/Data/maps/knot/kindle.dat and b/P3D/Content/Data/maps/knot/kindle.dat differ
diff --git a/P3D/Content/Data/maps/knot/spa.dat b/P3D/Content/Data/maps/knot/spa.dat
index 4e95f7335..79e8c2114 100644
Binary files a/P3D/Content/Data/maps/knot/spa.dat and b/P3D/Content/Data/maps/knot/spa.dat differ
diff --git a/P3D/Content/Data/maps/knot/town.dat b/P3D/Content/Data/maps/knot/town.dat
index 009e32886..e9eb3e045 100644
Binary files a/P3D/Content/Data/maps/knot/town.dat and b/P3D/Content/Data/maps/knot/town.dat differ
diff --git a/P3D/Content/Data/maps/knot/treasure.dat b/P3D/Content/Data/maps/knot/treasure.dat
index 198cce0fd..e5bda0f58 100644
Binary files a/P3D/Content/Data/maps/knot/treasure.dat and b/P3D/Content/Data/maps/knot/treasure.dat differ
diff --git a/P3D/Content/Data/maps/kolben/assoffices.dat b/P3D/Content/Data/maps/kolben/assoffices.dat
index 3abbce73e..1c32f4fe3 100644
--- a/P3D/Content/Data/maps/kolben/assoffices.dat
+++ b/P3D/Content/Data/maps/kolben/assoffices.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Kolben Tower]}}{"MusicLoop"{str[battletower]}}{"CurrentRegion"{str[Sevii Islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[kolben\BSOD]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[kolben\BSOD]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[17,8]}}{"Position"{intArr[1,0,-1]}}{"TexturePath"{str[kolben]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/kolben/basement.dat b/P3D/Content/Data/maps/kolben/basement.dat
index 6f22fb2d2..9ee614c67 100644
--- a/P3D/Content/Data/maps/kolben/basement.dat
+++ b/P3D/Content/Data/maps/kolben/basement.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Kolben Tower]}}{"MusicLoop"{str[battletower]}}{"CurrentRegion"{str[Sevii Islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[kolben\BSOD]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[kolben\BSOD]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[5,19]}}{"Position"{intArr[7,0,0]}}{"TexturePath"{str[kolben]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/kolben/biome/desert.dat b/P3D/Content/Data/maps/kolben/biome/desert.dat
index 6a8b82825..54c2be372 100644
--- a/P3D/Content/Data/maps/kolben/biome/desert.dat
+++ b/P3D/Content/Data/maps/kolben/biome/desert.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Desert]}}{"MusicLoop"{str[gts]}}{"CurrentRegion"{str[Sevii Islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[7]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[7]}}]}}
 
 Walls:
 {"EntityField"{ENT[{"EntityID"{str[AnimatedBlock]}}{"Size"{intArr[14,5,1]}}{"Fill"{bool[0]}}{"Position"{sngArr[7,0,8]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[160,32,16,16][176,32,16,16][192,32,16,16][208,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben]}}{"Rotation"{int[0]}}{"AnimationData"{intArr2D[[160,32,16,16,1,4,20,0,0]]}}]}}
diff --git a/P3D/Content/Data/maps/kolben/biome/rainforest.dat b/P3D/Content/Data/maps/kolben/biome/rainforest.dat
index 567897534..31229f5ad 100644
--- a/P3D/Content/Data/maps/kolben/biome/rainforest.dat
+++ b/P3D/Content/Data/maps/kolben/biome/rainforest.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Rainforest]}}{"MusicLoop"{str[gts]}}{"CurrentRegion"{str[Sevii Islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[5]}}{"Weather"{int[2]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[5]}}{"Weather"{int[2]}}]}}
 
 Walls:
 {"EntityField"{ENT[{"EntityID"{str[AnimatedBlock]}}{"Size"{intArr[14,5,1]}}{"Fill"{bool[0]}}{"Position"{sngArr[7,0,8]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[160,32,16,16][176,32,16,16][192,32,16,16][208,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben]}}{"Rotation"{int[0]}}{"AnimationData"{intArr2D[[160,32,16,16,1,4,20,0,0]]}}]}}
diff --git a/P3D/Content/Data/maps/kolben/biome/savanna.dat b/P3D/Content/Data/maps/kolben/biome/savanna.dat
index 020f60feb..53b00f17e 100644
--- a/P3D/Content/Data/maps/kolben/biome/savanna.dat
+++ b/P3D/Content/Data/maps/kolben/biome/savanna.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Savanna]}}{"MusicLoop"{str[gts]}}{"CurrentRegion"{str[Sevii Islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[5]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[5]}}]}}
 
 Walls:
 {"EntityField"{ENT[{"EntityID"{str[AnimatedBlock]}}{"Size"{intArr[14,5,1]}}{"Fill"{bool[0]}}{"Position"{sngArr[7,0,8]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[160,32,16,16][176,32,16,16][192,32,16,16][208,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben]}}{"Rotation"{int[0]}}{"AnimationData"{intArr2D[[160,32,16,16,1,4,20,0,0]]}}]}}
diff --git a/P3D/Content/Data/maps/kolben/biome/taiga.dat b/P3D/Content/Data/maps/kolben/biome/taiga.dat
index c83e0c545..f3ab8ab53 100644
--- a/P3D/Content/Data/maps/kolben/biome/taiga.dat
+++ b/P3D/Content/Data/maps/kolben/biome/taiga.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Taiga]}}{"MusicLoop"{str[gts]}}{"CurrentRegion"{str[Sevii Islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[3]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"Weather"{int[3]}}]}}
 
 Walls:
 {"EntityField"{ENT[{"EntityID"{str[AnimatedBlock]}}{"Size"{intArr[14,5,1]}}{"Fill"{bool[0]}}{"Position"{sngArr[7,0,8]}}{"TexturePath"{str[Kolben]}}{"Textures"{recArr[[160,32,16,16][176,32,16,16][192,32,16,16][208,32,16,16]]}}{"TextureIndex"{intArr[0,0,-1,-1,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[kolben]}}{"Rotation"{int[0]}}{"AnimationData"{intArr2D[[160,32,16,16,1,4,20,0,0]]}}]}}
diff --git a/P3D/Content/Data/maps/kolben/center.dat b/P3D/Content/Data/maps/kolben/center.dat
index 5140fa221..05723a5e4 100644
Binary files a/P3D/Content/Data/maps/kolben/center.dat and b/P3D/Content/Data/maps/kolben/center.dat differ
diff --git a/P3D/Content/Data/maps/kolben/devoffices.dat b/P3D/Content/Data/maps/kolben/devoffices.dat
index 67e52d3e9..d354f06bf 100644
--- a/P3D/Content/Data/maps/kolben/devoffices.dat
+++ b/P3D/Content/Data/maps/kolben/devoffices.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Kolben Tower]}}{"MusicLoop"{str[battletower]}}{"CurrentRegion"{str[Sevii Islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[kolben\BSOD]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[kolben\BSOD]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[17,8]}}{"Position"{intArr[1,0,-1]}}{"TexturePath"{str[kolben]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/kolben/elevator.dat b/P3D/Content/Data/maps/kolben/elevator.dat
index 4db8b925e..da6440b03 100644
Binary files a/P3D/Content/Data/maps/kolben/elevator.dat and b/P3D/Content/Data/maps/kolben/elevator.dat differ
diff --git a/P3D/Content/Data/maps/kolben/lounge.dat b/P3D/Content/Data/maps/kolben/lounge.dat
index 2a75fb79e..eb98bf306 100644
--- a/P3D/Content/Data/maps/kolben/lounge.dat
+++ b/P3D/Content/Data/maps/kolben/lounge.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Kolben Tower]}}{"MusicLoop"{str[battletower]}}{"CurrentRegion"{str[Sevii Islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[kolben\randomscreen]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[kolben\randomscreen]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[19,11]}}{"Position"{intArr[0,0,-1]}}{"TexturePath"{str[kolben]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/kolben/servers.dat b/P3D/Content/Data/maps/kolben/servers.dat
index a4da813bf..b1778e9eb 100644
--- a/P3D/Content/Data/maps/kolben/servers.dat
+++ b/P3D/Content/Data/maps/kolben/servers.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Kolben Tower]}}{"MusicLoop"{str[battletower]}}{"CurrentRegion"{str[Sevii Islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[kolben\BSOD]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[kolben\BSOD]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[10,11]}}{"Position"{intArr[0,0,-1]}}{"TexturePath"{str[kolben]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/lakeofrage.dat b/P3D/Content/Data/maps/lakeofrage.dat
index 4f99524e9..8361b5961 100644
Binary files a/P3D/Content/Data/maps/lakeofrage.dat and b/P3D/Content/Data/maps/lakeofrage.dat differ
diff --git a/P3D/Content/Data/maps/lakeofrage/0.dat b/P3D/Content/Data/maps/lakeofrage/0.dat
index 1af17d2ee..30b0059d9 100644
Binary files a/P3D/Content/Data/maps/lakeofrage/0.dat and b/P3D/Content/Data/maps/lakeofrage/0.dat differ
diff --git a/P3D/Content/Data/maps/lakeofrage/1.dat b/P3D/Content/Data/maps/lakeofrage/1.dat
index 9735bf2c8..471c4767e 100644
Binary files a/P3D/Content/Data/maps/lakeofrage/1.dat and b/P3D/Content/Data/maps/lakeofrage/1.dat differ
diff --git a/P3D/Content/Data/maps/lavender/1.dat b/P3D/Content/Data/maps/lavender/1.dat
index 5427897cd..345b44436 100644
Binary files a/P3D/Content/Data/maps/lavender/1.dat and b/P3D/Content/Data/maps/lavender/1.dat differ
diff --git a/P3D/Content/Data/maps/lavender/2.dat b/P3D/Content/Data/maps/lavender/2.dat
index 2cce93290..4fe1b72c2 100644
Binary files a/P3D/Content/Data/maps/lavender/2.dat and b/P3D/Content/Data/maps/lavender/2.dat differ
diff --git a/P3D/Content/Data/maps/lavender/3.dat b/P3D/Content/Data/maps/lavender/3.dat
index dbdbf28d7..178b849a8 100644
Binary files a/P3D/Content/Data/maps/lavender/3.dat and b/P3D/Content/Data/maps/lavender/3.dat differ
diff --git a/P3D/Content/Data/maps/lavender/cemetary.dat b/P3D/Content/Data/maps/lavender/cemetary.dat
index 6422c0abc..82276afbb 100644
Binary files a/P3D/Content/Data/maps/lavender/cemetary.dat and b/P3D/Content/Data/maps/lavender/cemetary.dat differ
diff --git a/P3D/Content/Data/maps/lavender/center.dat b/P3D/Content/Data/maps/lavender/center.dat
index 3e4826efa..17fbeb24c 100644
Binary files a/P3D/Content/Data/maps/lavender/center.dat and b/P3D/Content/Data/maps/lavender/center.dat differ
diff --git a/P3D/Content/Data/maps/lavender/main.dat b/P3D/Content/Data/maps/lavender/main.dat
index 694aaf099..5f84679db 100644
Binary files a/P3D/Content/Data/maps/lavender/main.dat and b/P3D/Content/Data/maps/lavender/main.dat differ
diff --git a/P3D/Content/Data/maps/lavender/mart.dat b/P3D/Content/Data/maps/lavender/mart.dat
index 594c2a4b0..36bfb28c3 100644
Binary files a/P3D/Content/Data/maps/lavender/mart.dat and b/P3D/Content/Data/maps/lavender/mart.dat differ
diff --git a/P3D/Content/Data/maps/lavender/radio.dat b/P3D/Content/Data/maps/lavender/radio.dat
index 7341079b0..5c0097227 100644
Binary files a/P3D/Content/Data/maps/lavender/radio.dat and b/P3D/Content/Data/maps/lavender/radio.dat differ
diff --git a/P3D/Content/Data/maps/liberty/garden.dat b/P3D/Content/Data/maps/liberty/garden.dat
index cc5a85d61..1b4c3f75a 100644
--- a/P3D/Content/Data/maps/liberty/garden.dat
+++ b/P3D/Content/Data/maps/liberty/garden.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Liberty Garden]}}{"MusicLoop"{str[routemusic7]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BattleMap"{str[liberty\garden.dat,10,2,14]}}{"MapScript"{str[liberty\garden]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BattleMap"{str[liberty\garden.dat,10,2,14]}}{"MapScript"{str[liberty\garden]}}]}}
 
 Grass:
 {"Floor"{ENT[{"Size"{intArr[1,3]}}{"SeasonTexture"{str[Grass]}}{"Position"{intArr[15,1,2]}}{"TexturePath"{str[Routes]}}{"Texture"{rec[96,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/liberty/interior.dat b/P3D/Content/Data/maps/liberty/interior.dat
index 14f551773..8a900273f 100644
--- a/P3D/Content/Data/maps/liberty/interior.dat
+++ b/P3D/Content/Data/maps/liberty/interior.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Liberty Lighthouse]}}{"MusicLoop"{str[darkcave]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[7,3]}}{"Position"{intArr[1,0,12]}}{"TexturePath"{str[park]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/liberty/room.dat b/P3D/Content/Data/maps/liberty/room.dat
index a984a4b34..da2ea24c0 100644
--- a/P3D/Content/Data/maps/liberty/room.dat
+++ b/P3D/Content/Data/maps/liberty/room.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Lighthouse Basement]}}{"MusicLoop"{str[darkcave]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"Weather"{int[1]}}{"MapScript"{str[liberty\room]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"Weather"{int[1]}}{"MapScript"{str[liberty\room]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[7,4]}}{"Position"{intArr[1,0,6]}}{"TexturePath"{str[park]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/lighthouse/lighthouse0.dat b/P3D/Content/Data/maps/lighthouse/lighthouse0.dat
index ae70dbdfa..d81ed5cc5 100644
Binary files a/P3D/Content/Data/maps/lighthouse/lighthouse0.dat and b/P3D/Content/Data/maps/lighthouse/lighthouse0.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/1.dat b/P3D/Content/Data/maps/lostcave/1.dat
index b21b54719..3e26df70c 100644
Binary files a/P3D/Content/Data/maps/lostcave/1.dat and b/P3D/Content/Data/maps/lostcave/1.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/2.dat b/P3D/Content/Data/maps/lostcave/2.dat
index 0e29bad86..c2c1d0fc8 100644
Binary files a/P3D/Content/Data/maps/lostcave/2.dat and b/P3D/Content/Data/maps/lostcave/2.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/3.dat b/P3D/Content/Data/maps/lostcave/3.dat
index 20fce6f71..eec811e1e 100644
Binary files a/P3D/Content/Data/maps/lostcave/3.dat and b/P3D/Content/Data/maps/lostcave/3.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/4.dat b/P3D/Content/Data/maps/lostcave/4.dat
index 4b0a7cb83..f6e35e498 100644
Binary files a/P3D/Content/Data/maps/lostcave/4.dat and b/P3D/Content/Data/maps/lostcave/4.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/5.dat b/P3D/Content/Data/maps/lostcave/5.dat
index d2e3cac58..b0767c31f 100644
Binary files a/P3D/Content/Data/maps/lostcave/5.dat and b/P3D/Content/Data/maps/lostcave/5.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/6.dat b/P3D/Content/Data/maps/lostcave/6.dat
index 1e06dd116..daaba7694 100644
Binary files a/P3D/Content/Data/maps/lostcave/6.dat and b/P3D/Content/Data/maps/lostcave/6.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/7.dat b/P3D/Content/Data/maps/lostcave/7.dat
index 200ea7a97..e2b8ce3a0 100644
Binary files a/P3D/Content/Data/maps/lostcave/7.dat and b/P3D/Content/Data/maps/lostcave/7.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/8.dat b/P3D/Content/Data/maps/lostcave/8.dat
index e2e228c5b..4dcb7b860 100644
Binary files a/P3D/Content/Data/maps/lostcave/8.dat and b/P3D/Content/Data/maps/lostcave/8.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/ent.dat b/P3D/Content/Data/maps/lostcave/ent.dat
index 9b02d075c..44a487a25 100644
Binary files a/P3D/Content/Data/maps/lostcave/ent.dat and b/P3D/Content/Data/maps/lostcave/ent.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/extra1.dat b/P3D/Content/Data/maps/lostcave/extra1.dat
index 8d6f647d5..ff128ca63 100644
Binary files a/P3D/Content/Data/maps/lostcave/extra1.dat and b/P3D/Content/Data/maps/lostcave/extra1.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/extra2.dat b/P3D/Content/Data/maps/lostcave/extra2.dat
index ae0e2af0c..d4125c14f 100644
Binary files a/P3D/Content/Data/maps/lostcave/extra2.dat and b/P3D/Content/Data/maps/lostcave/extra2.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/extra3.dat b/P3D/Content/Data/maps/lostcave/extra3.dat
index c9ba2819b..cecc0d67a 100644
Binary files a/P3D/Content/Data/maps/lostcave/extra3.dat and b/P3D/Content/Data/maps/lostcave/extra3.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/extra4.dat b/P3D/Content/Data/maps/lostcave/extra4.dat
index 45bf502f2..fe04aff8c 100644
Binary files a/P3D/Content/Data/maps/lostcave/extra4.dat and b/P3D/Content/Data/maps/lostcave/extra4.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/ladder.dat b/P3D/Content/Data/maps/lostcave/ladder.dat
index 12432ba5f..682cb7803 100644
Binary files a/P3D/Content/Data/maps/lostcave/ladder.dat and b/P3D/Content/Data/maps/lostcave/ladder.dat differ
diff --git a/P3D/Content/Data/maps/lostcave/selphy.dat b/P3D/Content/Data/maps/lostcave/selphy.dat
index 87ca817b4..d97747e6a 100644
Binary files a/P3D/Content/Data/maps/lostcave/selphy.dat and b/P3D/Content/Data/maps/lostcave/selphy.dat differ
diff --git a/P3D/Content/Data/maps/mahogany.dat b/P3D/Content/Data/maps/mahogany.dat
index ccb86de38..5371a0e38 100644
Binary files a/P3D/Content/Data/maps/mahogany.dat and b/P3D/Content/Data/maps/mahogany.dat differ
diff --git a/P3D/Content/Data/maps/mahogany/0.dat b/P3D/Content/Data/maps/mahogany/0.dat
index cd8188eef..ef46bf0d5 100644
Binary files a/P3D/Content/Data/maps/mahogany/0.dat and b/P3D/Content/Data/maps/mahogany/0.dat differ
diff --git a/P3D/Content/Data/maps/mahogany/center.dat b/P3D/Content/Data/maps/mahogany/center.dat
index 7c54d0a62..c21aafa8a 100644
Binary files a/P3D/Content/Data/maps/mahogany/center.dat and b/P3D/Content/Data/maps/mahogany/center.dat differ
diff --git a/P3D/Content/Data/maps/mahogany/shop.dat b/P3D/Content/Data/maps/mahogany/shop.dat
index 146e9f8e4..d1017f798 100644
Binary files a/P3D/Content/Data/maps/mahogany/shop.dat and b/P3D/Content/Data/maps/mahogany/shop.dat differ
diff --git a/P3D/Content/Data/maps/mainmenu/_mainmenu3.dat b/P3D/Content/Data/maps/mainmenu/_mainmenu3.dat
index a2210b63b..20860dc72 100644
Binary files a/P3D/Content/Data/maps/mainmenu/_mainmenu3.dat and b/P3D/Content/Data/maps/mainmenu/_mainmenu3.dat differ
diff --git a/P3D/Content/Data/maps/mainmenu/mainmenu0.dat b/P3D/Content/Data/maps/mainmenu/mainmenu0.dat
index 0cc00455a..c077178d3 100644
Binary files a/P3D/Content/Data/maps/mainmenu/mainmenu0.dat and b/P3D/Content/Data/maps/mainmenu/mainmenu0.dat differ
diff --git a/P3D/Content/Data/maps/mainmenu/mainmenu1.dat b/P3D/Content/Data/maps/mainmenu/mainmenu1.dat
index c53514bf8..41c4624e2 100644
Binary files a/P3D/Content/Data/maps/mainmenu/mainmenu1.dat and b/P3D/Content/Data/maps/mainmenu/mainmenu1.dat differ
diff --git a/P3D/Content/Data/maps/mainmenu/mainmenu2.dat b/P3D/Content/Data/maps/mainmenu/mainmenu2.dat
index 3fae380e8..5781894b5 100644
Binary files a/P3D/Content/Data/maps/mainmenu/mainmenu2.dat and b/P3D/Content/Data/maps/mainmenu/mainmenu2.dat differ
diff --git a/P3D/Content/Data/maps/mrpokemonhouse.dat b/P3D/Content/Data/maps/mrpokemonhouse.dat
index debb33090..1aab225d5 100644
Binary files a/P3D/Content/Data/maps/mrpokemonhouse.dat and b/P3D/Content/Data/maps/mrpokemonhouse.dat differ
diff --git a/P3D/Content/Data/maps/mtember/braille1.dat b/P3D/Content/Data/maps/mtember/braille1.dat
index 390e6ffc2..92d481e9d 100644
Binary files a/P3D/Content/Data/maps/mtember/braille1.dat and b/P3D/Content/Data/maps/mtember/braille1.dat differ
diff --git a/P3D/Content/Data/maps/mtember/braille2.dat b/P3D/Content/Data/maps/mtember/braille2.dat
index f177f78eb..5b9e9557e 100644
Binary files a/P3D/Content/Data/maps/mtember/braille2.dat and b/P3D/Content/Data/maps/mtember/braille2.dat differ
diff --git a/P3D/Content/Data/maps/mtember/exterior.dat b/P3D/Content/Data/maps/mtember/exterior.dat
index 6b0f47d45..8866555e6 100644
Binary files a/P3D/Content/Data/maps/mtember/exterior.dat and b/P3D/Content/Data/maps/mtember/exterior.dat differ
diff --git a/P3D/Content/Data/maps/mtember/peak.dat b/P3D/Content/Data/maps/mtember/peak.dat
index d12962302..1851891d2 100644
Binary files a/P3D/Content/Data/maps/mtember/peak.dat and b/P3D/Content/Data/maps/mtember/peak.dat differ
diff --git a/P3D/Content/Data/maps/mtember/peakp1.dat b/P3D/Content/Data/maps/mtember/peakp1.dat
index 0c514f660..208f2b424 100644
Binary files a/P3D/Content/Data/maps/mtember/peakp1.dat and b/P3D/Content/Data/maps/mtember/peakp1.dat differ
diff --git a/P3D/Content/Data/maps/mtember/peakp2.dat b/P3D/Content/Data/maps/mtember/peakp2.dat
index 4c33b19a5..2cc0926e0 100644
Binary files a/P3D/Content/Data/maps/mtember/peakp2.dat and b/P3D/Content/Data/maps/mtember/peakp2.dat differ
diff --git a/P3D/Content/Data/maps/mtember/peakp3.dat b/P3D/Content/Data/maps/mtember/peakp3.dat
index 1b186fd86..02c7b11d6 100644
Binary files a/P3D/Content/Data/maps/mtember/peakp3.dat and b/P3D/Content/Data/maps/mtember/peakp3.dat differ
diff --git a/P3D/Content/Data/maps/mtember/secretpath1.dat b/P3D/Content/Data/maps/mtember/secretpath1.dat
index e936e26c7..166f8005d 100644
Binary files a/P3D/Content/Data/maps/mtember/secretpath1.dat and b/P3D/Content/Data/maps/mtember/secretpath1.dat differ
diff --git a/P3D/Content/Data/maps/mtember/secretpath2.dat b/P3D/Content/Data/maps/mtember/secretpath2.dat
index 634ddce1a..f9a7a75eb 100644
Binary files a/P3D/Content/Data/maps/mtember/secretpath2.dat and b/P3D/Content/Data/maps/mtember/secretpath2.dat differ
diff --git a/P3D/Content/Data/maps/mtember/secretpath3.dat b/P3D/Content/Data/maps/mtember/secretpath3.dat
index 56a6d50a2..b2731b59b 100644
Binary files a/P3D/Content/Data/maps/mtember/secretpath3.dat and b/P3D/Content/Data/maps/mtember/secretpath3.dat differ
diff --git a/P3D/Content/Data/maps/mtember/secretpath4.dat b/P3D/Content/Data/maps/mtember/secretpath4.dat
index daeea762d..8fccf481e 100644
Binary files a/P3D/Content/Data/maps/mtember/secretpath4.dat and b/P3D/Content/Data/maps/mtember/secretpath4.dat differ
diff --git a/P3D/Content/Data/maps/mtember/secretpath5.dat b/P3D/Content/Data/maps/mtember/secretpath5.dat
index d6a1537d1..c05314602 100644
Binary files a/P3D/Content/Data/maps/mtember/secretpath5.dat and b/P3D/Content/Data/maps/mtember/secretpath5.dat differ
diff --git a/P3D/Content/Data/maps/mtember/secretpath6.dat b/P3D/Content/Data/maps/mtember/secretpath6.dat
index 1e900999f..ff42db52f 100644
Binary files a/P3D/Content/Data/maps/mtember/secretpath6.dat and b/P3D/Content/Data/maps/mtember/secretpath6.dat differ
diff --git a/P3D/Content/Data/maps/mtmoon/main.dat b/P3D/Content/Data/maps/mtmoon/main.dat
index 0ca358c0e..cd840a118 100644
Binary files a/P3D/Content/Data/maps/mtmoon/main.dat and b/P3D/Content/Data/maps/mtmoon/main.dat differ
diff --git a/P3D/Content/Data/maps/mtmoon/north.dat b/P3D/Content/Data/maps/mtmoon/north.dat
index f5119242b..2261dfdf4 100644
Binary files a/P3D/Content/Data/maps/mtmoon/north.dat and b/P3D/Content/Data/maps/mtmoon/north.dat differ
diff --git a/P3D/Content/Data/maps/mtmoon/shop.dat b/P3D/Content/Data/maps/mtmoon/shop.dat
index b104a1467..1596a3ea1 100644
Binary files a/P3D/Content/Data/maps/mtmoon/shop.dat and b/P3D/Content/Data/maps/mtmoon/shop.dat differ
diff --git a/P3D/Content/Data/maps/mtmoon/south.dat b/P3D/Content/Data/maps/mtmoon/south.dat
index a65145129..c6f1cd611 100644
Binary files a/P3D/Content/Data/maps/mtmoon/south.dat and b/P3D/Content/Data/maps/mtmoon/south.dat differ
diff --git a/P3D/Content/Data/maps/mtmoon/square.dat b/P3D/Content/Data/maps/mtmoon/square.dat
index 97d874f72..646017db8 100644
Binary files a/P3D/Content/Data/maps/mtmoon/square.dat and b/P3D/Content/Data/maps/mtmoon/square.dat differ
diff --git a/P3D/Content/Data/maps/mtmortar/mtmortarbf1.dat b/P3D/Content/Data/maps/mtmortar/mtmortarbf1.dat
index cb81ea45f..6690f58f2 100644
Binary files a/P3D/Content/Data/maps/mtmortar/mtmortarbf1.dat and b/P3D/Content/Data/maps/mtmortar/mtmortarbf1.dat differ
diff --git a/P3D/Content/Data/maps/mtmortar/mtmortarf1.dat b/P3D/Content/Data/maps/mtmortar/mtmortarf1.dat
index 5328763fa..6d9a428c1 100644
Binary files a/P3D/Content/Data/maps/mtmortar/mtmortarf1.dat and b/P3D/Content/Data/maps/mtmortar/mtmortarf1.dat differ
diff --git a/P3D/Content/Data/maps/mtmortar/mtmortarf2.dat b/P3D/Content/Data/maps/mtmortar/mtmortarf2.dat
index 3091f2b97..6bf865bfe 100644
Binary files a/P3D/Content/Data/maps/mtmortar/mtmortarf2.dat and b/P3D/Content/Data/maps/mtmortar/mtmortarf2.dat differ
diff --git a/P3D/Content/Data/maps/mtmortar/mtmortarmain.dat b/P3D/Content/Data/maps/mtmortar/mtmortarmain.dat
index f234930dc..72d4418b9 100644
Binary files a/P3D/Content/Data/maps/mtmortar/mtmortarmain.dat and b/P3D/Content/Data/maps/mtmortar/mtmortarmain.dat differ
diff --git a/P3D/Content/Data/maps/mtsilver/1f.dat b/P3D/Content/Data/maps/mtsilver/1f.dat
index cb56ccdcd..ffb63e47f 100644
--- a/P3D/Content/Data/maps/mtsilver/1f.dat
+++ b/P3D/Content/Data/maps/mtsilver/1f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Mt. Silver]}}{"MusicLoop"{str[lighthouse]}}{"WildPokemon"{bool[1]}}{"CurrentRegion"{str[Kanto]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}{"BattleMap"{str[mtsilver\1f.dat,14,7,15.5]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[2]}}{"Weather"{int[1]}}{"BattleMap"{str[mtsilver\1f.dat,14,7,15.5]}}]}}
 
 Frame:
 Floor:
diff --git a/P3D/Content/Data/maps/mtsilver/2f.dat b/P3D/Content/Data/maps/mtsilver/2f.dat
index 14ea81d09..deb3d22cf 100644
Binary files a/P3D/Content/Data/maps/mtsilver/2f.dat and b/P3D/Content/Data/maps/mtsilver/2f.dat differ
diff --git a/P3D/Content/Data/maps/mtsilver/3f.dat b/P3D/Content/Data/maps/mtsilver/3f.dat
index 01b4d127f..8b01a507d 100644
Binary files a/P3D/Content/Data/maps/mtsilver/3f.dat and b/P3D/Content/Data/maps/mtsilver/3f.dat differ
diff --git a/P3D/Content/Data/maps/mtsilver/center.dat b/P3D/Content/Data/maps/mtsilver/center.dat
index bf11b852e..3205fa9b8 100644
Binary files a/P3D/Content/Data/maps/mtsilver/center.dat and b/P3D/Content/Data/maps/mtsilver/center.dat differ
diff --git a/P3D/Content/Data/maps/mtsilver/expert.dat b/P3D/Content/Data/maps/mtsilver/expert.dat
index a76700c8d..0bfe5c198 100644
Binary files a/P3D/Content/Data/maps/mtsilver/expert.dat and b/P3D/Content/Data/maps/mtsilver/expert.dat differ
diff --git a/P3D/Content/Data/maps/mtsilver/exterior.dat b/P3D/Content/Data/maps/mtsilver/exterior.dat
index c570b1cab..cb3a5478e 100644
Binary files a/P3D/Content/Data/maps/mtsilver/exterior.dat and b/P3D/Content/Data/maps/mtsilver/exterior.dat differ
diff --git a/P3D/Content/Data/maps/mtsilver/moltres.dat b/P3D/Content/Data/maps/mtsilver/moltres.dat
index 7fa419955..ee2c65d94 100644
Binary files a/P3D/Content/Data/maps/mtsilver/moltres.dat and b/P3D/Content/Data/maps/mtsilver/moltres.dat differ
diff --git a/P3D/Content/Data/maps/mtsilver/peak.dat b/P3D/Content/Data/maps/mtsilver/peak.dat
index eba83a858..06ac7e5eb 100644
Binary files a/P3D/Content/Data/maps/mtsilver/peak.dat and b/P3D/Content/Data/maps/mtsilver/peak.dat differ
diff --git a/P3D/Content/Data/maps/mtsilver/side.dat b/P3D/Content/Data/maps/mtsilver/side.dat
index ea1f23137..b75fe67f2 100644
Binary files a/P3D/Content/Data/maps/mtsilver/side.dat and b/P3D/Content/Data/maps/mtsilver/side.dat differ
diff --git a/P3D/Content/Data/maps/mtsilver/snow.dat b/P3D/Content/Data/maps/mtsilver/snow.dat
index ddadce56f..072a31346 100644
Binary files a/P3D/Content/Data/maps/mtsilver/snow.dat and b/P3D/Content/Data/maps/mtsilver/snow.dat differ
diff --git a/P3D/Content/Data/maps/nationalpark/contest.dat b/P3D/Content/Data/maps/nationalpark/contest.dat
index 6433f69a3..6916d3c7e 100644
--- a/P3D/Content/Data/maps/nationalpark/contest.dat
+++ b/P3D/Content/Data/maps/nationalpark/contest.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[National Park]}}{"MusicLoop"{str[bugcontest]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BugCatchingContest"{str[nationalpark\end_contest_menu,nationalpark\sport_balls,Sport Balls]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BugCatchingContest"{str[nationalpark\end_contest_menu,nationalpark\sport_balls,Sport Balls]}}]}}
 
 Floor:
 Grass:
diff --git a/P3D/Content/Data/maps/nationalpark/nationalpark0.dat b/P3D/Content/Data/maps/nationalpark/nationalpark0.dat
index 37cea0e87..ee0c6bb79 100644
--- a/P3D/Content/Data/maps/nationalpark/nationalpark0.dat
+++ b/P3D/Content/Data/maps/nationalpark/nationalpark0.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[National Park]}}{"MusicLoop"{str[nationalpark]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}]}}
 
 Floor:
 Grass:
diff --git a/P3D/Content/Data/maps/nationalpark/nationalpark1.dat b/P3D/Content/Data/maps/nationalpark/nationalpark1.dat
index caccd04fa..e4d3a2b9d 100644
Binary files a/P3D/Content/Data/maps/nationalpark/nationalpark1.dat and b/P3D/Content/Data/maps/nationalpark/nationalpark1.dat differ
diff --git a/P3D/Content/Data/maps/nationalpark/nationalpark2.dat b/P3D/Content/Data/maps/nationalpark/nationalpark2.dat
index 505c79066..0cc3ae782 100644
Binary files a/P3D/Content/Data/maps/nationalpark/nationalpark2.dat and b/P3D/Content/Data/maps/nationalpark/nationalpark2.dat differ
diff --git a/P3D/Content/Data/maps/newgame/intro.dat b/P3D/Content/Data/maps/newgame/intro.dat
index a7ebf0ebd..6fc918740 100644
--- a/P3D/Content/Data/maps/newgame/intro.dat
+++ b/P3D/Content/Data/maps/newgame/intro.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Intro Map]}}{"MusicLoop"{str[RouteMusic1]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 {"Floor"{ENT[{"Size"{intArr[50,40]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[intro]}}{"Texture"{rec[0,0,16,16]}}]}}
 
diff --git a/P3D/Content/Data/maps/newgame/intro0.dat b/P3D/Content/Data/maps/newgame/intro0.dat
index 926994e09..c494a9979 100644
--- a/P3D/Content/Data/maps/newgame/intro0.dat
+++ b/P3D/Content/Data/maps/newgame/intro0.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Intro Map]}}{"MusicLoop"{str[RouteMusic1]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[1]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 Underwater:
 {"Floor"{ENT[{"Size"{intArr[20,6]}}{"Position"{intArr[-2,0,0]}}{"TexturePath"{str[intro]}}{"Texture"{rec[16,32,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/olivine/001.dat b/P3D/Content/Data/maps/olivine/001.dat
index 674d1eb1a..aa522f691 100644
Binary files a/P3D/Content/Data/maps/olivine/001.dat and b/P3D/Content/Data/maps/olivine/001.dat differ
diff --git a/P3D/Content/Data/maps/olivine/002.dat b/P3D/Content/Data/maps/olivine/002.dat
index e2619fcb9..bf44d5f5b 100644
Binary files a/P3D/Content/Data/maps/olivine/002.dat and b/P3D/Content/Data/maps/olivine/002.dat differ
diff --git a/P3D/Content/Data/maps/olivine/003.dat b/P3D/Content/Data/maps/olivine/003.dat
index 3c9eced8a..38ebd2cfb 100644
Binary files a/P3D/Content/Data/maps/olivine/003.dat and b/P3D/Content/Data/maps/olivine/003.dat differ
diff --git a/P3D/Content/Data/maps/olivine/Cafe.dat b/P3D/Content/Data/maps/olivine/Cafe.dat
index f3d5f3365..332e4e6e5 100644
Binary files a/P3D/Content/Data/maps/olivine/Cafe.dat and b/P3D/Content/Data/maps/olivine/Cafe.dat differ
diff --git a/P3D/Content/Data/maps/olivine/center.dat b/P3D/Content/Data/maps/olivine/center.dat
index f23d29ee8..1a77f3432 100644
Binary files a/P3D/Content/Data/maps/olivine/center.dat and b/P3D/Content/Data/maps/olivine/center.dat differ
diff --git a/P3D/Content/Data/maps/olivine/dock.dat b/P3D/Content/Data/maps/olivine/dock.dat
index be4a57d5b..8f58f1264 100644
Binary files a/P3D/Content/Data/maps/olivine/dock.dat and b/P3D/Content/Data/maps/olivine/dock.dat differ
diff --git a/P3D/Content/Data/maps/olivine/dock_entrance.dat b/P3D/Content/Data/maps/olivine/dock_entrance.dat
index 1f587592f..da76ca389 100644
Binary files a/P3D/Content/Data/maps/olivine/dock_entrance.dat and b/P3D/Content/Data/maps/olivine/dock_entrance.dat differ
diff --git a/P3D/Content/Data/maps/olivine/mart.dat b/P3D/Content/Data/maps/olivine/mart.dat
index fda0d7621..ffbe79485 100644
Binary files a/P3D/Content/Data/maps/olivine/mart.dat and b/P3D/Content/Data/maps/olivine/mart.dat differ
diff --git a/P3D/Content/Data/maps/pallet/Blue.dat b/P3D/Content/Data/maps/pallet/Blue.dat
index 1a1d2eac3..c11dac17d 100644
Binary files a/P3D/Content/Data/maps/pallet/Blue.dat and b/P3D/Content/Data/maps/pallet/Blue.dat differ
diff --git a/P3D/Content/Data/maps/pallet/Red1.dat b/P3D/Content/Data/maps/pallet/Red1.dat
index fd9565f4c..2c6d7db56 100644
Binary files a/P3D/Content/Data/maps/pallet/Red1.dat and b/P3D/Content/Data/maps/pallet/Red1.dat differ
diff --git a/P3D/Content/Data/maps/pallet/Red2.dat b/P3D/Content/Data/maps/pallet/Red2.dat
index 809df9c3c..c5d9f3f87 100644
Binary files a/P3D/Content/Data/maps/pallet/Red2.dat and b/P3D/Content/Data/maps/pallet/Red2.dat differ
diff --git a/P3D/Content/Data/maps/pallet/main.dat b/P3D/Content/Data/maps/pallet/main.dat
index c15437333..f60f11dde 100644
Binary files a/P3D/Content/Data/maps/pallet/main.dat and b/P3D/Content/Data/maps/pallet/main.dat differ
diff --git a/P3D/Content/Data/maps/pallet/oaklab.dat b/P3D/Content/Data/maps/pallet/oaklab.dat
index cc8886f73..ba51e665e 100644
Binary files a/P3D/Content/Data/maps/pallet/oaklab.dat and b/P3D/Content/Data/maps/pallet/oaklab.dat differ
diff --git a/P3D/Content/Data/maps/pewter/1.dat b/P3D/Content/Data/maps/pewter/1.dat
index 657a28a9c..61e6eb205 100644
Binary files a/P3D/Content/Data/maps/pewter/1.dat and b/P3D/Content/Data/maps/pewter/1.dat differ
diff --git a/P3D/Content/Data/maps/pewter/2.dat b/P3D/Content/Data/maps/pewter/2.dat
index ac5b6b5ca..f14e29848 100644
Binary files a/P3D/Content/Data/maps/pewter/2.dat and b/P3D/Content/Data/maps/pewter/2.dat differ
diff --git a/P3D/Content/Data/maps/pewter/center.dat b/P3D/Content/Data/maps/pewter/center.dat
index 3d8c44e13..bafa87215 100644
Binary files a/P3D/Content/Data/maps/pewter/center.dat and b/P3D/Content/Data/maps/pewter/center.dat differ
diff --git a/P3D/Content/Data/maps/pewter/main.dat b/P3D/Content/Data/maps/pewter/main.dat
index 43d3da159..128022cea 100644
Binary files a/P3D/Content/Data/maps/pewter/main.dat and b/P3D/Content/Data/maps/pewter/main.dat differ
diff --git a/P3D/Content/Data/maps/pewter/mart.dat b/P3D/Content/Data/maps/pewter/mart.dat
index 445091094..e575fdd9c 100644
Binary files a/P3D/Content/Data/maps/pewter/mart.dat and b/P3D/Content/Data/maps/pewter/mart.dat differ
diff --git a/P3D/Content/Data/maps/pewter/museum.dat b/P3D/Content/Data/maps/pewter/museum.dat
index 045392f47..aba984092 100644
Binary files a/P3D/Content/Data/maps/pewter/museum.dat and b/P3D/Content/Data/maps/pewter/museum.dat differ
diff --git a/P3D/Content/Data/maps/pewter/museum2.dat b/P3D/Content/Data/maps/pewter/museum2.dat
index 6ea609dc4..a47547c6e 100644
Binary files a/P3D/Content/Data/maps/pewter/museum2.dat and b/P3D/Content/Data/maps/pewter/museum2.dat differ
diff --git a/P3D/Content/Data/maps/quest/0.dat b/P3D/Content/Data/maps/quest/0.dat
index 8be8bd194..a9d7d24a9 100644
--- a/P3D/Content/Data/maps/quest/0.dat
+++ b/P3D/Content/Data/maps/quest/0.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Seven Island]}}{"MusicLoop"{str[violet]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[8,8]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[House2]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/1.dat b/P3D/Content/Data/maps/quest/1.dat
index a9d5d5af3..4b99bee54 100644
--- a/P3D/Content/Data/maps/quest/1.dat
+++ b/P3D/Content/Data/maps/quest/1.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Sevault Canyon]}}{"MusicLoop"{str[violet]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[8,8]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[House2]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/canyonent.dat b/P3D/Content/Data/maps/quest/canyonent.dat
index 67c3d9371..19d6ff73d 100644
--- a/P3D/Content/Data/maps/quest/canyonent.dat
+++ b/P3D/Content/Data/maps/quest/canyonent.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Canyon Entrance]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}{"BattleMap"{str[quest\canyonent.dat,12,0,-27]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}{"BattleMap"{str[quest\canyonent.dat,12,0,-27]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[8,12]}}{"Position"{intArr[5,0,4]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/center.dat b/P3D/Content/Data/maps/quest/center.dat
index aaf7f36bd..9c878e8af 100644
--- a/P3D/Content/Data/maps/quest/center.dat
+++ b/P3D/Content/Data/maps/quest/center.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Pokemon Center]}}{"MusicLoop"{str[center]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[1,1]}}{"Position"{intArr[7,0,10]}}{"TexturePath"{str[Center]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/dock.dat b/P3D/Content/Data/maps/quest/dock.dat
index 0692446dd..f128a35b6 100644
--- a/P3D/Content/Data/maps/quest/dock.dat
+++ b/P3D/Content/Data/maps/quest/dock.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Seven Island]}}{"MusicLoop"{str[violet]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,4]}}{"Position"{intArr[0,0,-1]}}{"TexturePath"{str[Gym]}}{"Texture"{rec[112,32,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/mart.dat b/P3D/Content/Data/maps/quest/mart.dat
index 7586c4da1..f5854e901 100644
--- a/P3D/Content/Data/maps/quest/mart.dat
+++ b/P3D/Content/Data/maps/quest/mart.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Pokemon Mart]}}{"MusicLoop"{str[mart]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[10,6]}}{"Position"{intArr[1,0,0]}}{"TexturePath"{str[Mart]}}{"Texture"{rec[0,0,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/offset/east.dat b/P3D/Content/Data/maps/quest/offset/east.dat
index e818840f0..032264089 100644
--- a/P3D/Content/Data/maps/quest/offset/east.dat
+++ b/P3D/Content/Data/maps/quest/offset/east.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Canyon Entrance]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}]}}
 
 Mountain:
 {"Floor"{ENT[{"Size"{intArr[1,49]}}{"Position"{intArr[0,7,0]}}{"TexturePath"{str[Routes]}}{"Texture"{rec[64,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/offset/north.dat b/P3D/Content/Data/maps/quest/offset/north.dat
index 2cf73c0ba..8010c055d 100644
--- a/P3D/Content/Data/maps/quest/offset/north.dat
+++ b/P3D/Content/Data/maps/quest/offset/north.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Canyon Entrance]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}]}}
 
 Mountain:
 {"Floor"{ENT[{"Size"{intArr[4,2]}}{"Position"{intArr[0,2,0]}}{"TexturePath"{str[Routes]}}{"Texture"{rec[64,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/offset/west.dat b/P3D/Content/Data/maps/quest/offset/west.dat
index 362c65735..de705c87f 100644
--- a/P3D/Content/Data/maps/quest/offset/west.dat
+++ b/P3D/Content/Data/maps/quest/offset/west.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Canyon Entrance]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}]}}
 
 Mountain:
 {"Floor"{ENT[{"Size"{intArr[1,12]}}{"Position"{intArr[13,6,0]}}{"TexturePath"{str[Routes]}}{"Texture"{rec[64,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/sevault.dat b/P3D/Content/Data/maps/quest/sevault.dat
index e2c5bf6f5..7333eacce 100644
--- a/P3D/Content/Data/maps/quest/sevault.dat
+++ b/P3D/Content/Data/maps/quest/sevault.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Sevault Canyon]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}{"BattleMap"{str[quest\sevault.dat,19,2,-26.5]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}{"BattleMap"{str[quest\sevault.dat,19,2,-26.5]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[2,7]}}{"Position"{intArr[15,0,74]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/tanoby/dilford.dat b/P3D/Content/Data/maps/quest/tanoby/dilford.dat
index 226760b4f..d58c5c71e 100644
--- a/P3D/Content/Data/maps/quest/tanoby/dilford.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/dilford.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Dilford Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,15]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/tanoby/key.dat b/P3D/Content/Data/maps/quest/tanoby/key.dat
index 4cd0d39d2..3388866c7 100644
--- a/P3D/Content/Data/maps/quest/tanoby/key.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/key.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Tanoby Key]}}{"MusicLoop"{str[diglettscave]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"MapScript"{str[quest\tanoby\keymap]}}{"EnviromentType"{int[2]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[1]}}{"CanFly"{bool[0]}}{"MapScript"{str[quest\tanoby\keymap]}}{"EnvironmentType"{int[2]}}{"Weather"{int[1]}}]}}
 
 Small:
 Floor:
diff --git a/P3D/Content/Data/maps/quest/tanoby/liptoo.dat b/P3D/Content/Data/maps/quest/tanoby/liptoo.dat
index 5b6921cd7..6b6c0536e 100644
--- a/P3D/Content/Data/maps/quest/tanoby/liptoo.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/liptoo.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Liptoo Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,15]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/tanoby/main.dat b/P3D/Content/Data/maps/quest/tanoby/main.dat
index 84105494a..5617d12af 100644
--- a/P3D/Content/Data/maps/quest/tanoby/main.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/main.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Tanoby Ruins]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}{"BattleMap"{str[quest\tanoby\main.dat,106.7,0,3]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}{"BattleMap"{str[quest\tanoby\main.dat,106.7,0,3]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[7,6]}}{"Position"{intArr[8,0,2]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[16,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/tanoby/monean.dat b/P3D/Content/Data/maps/quest/tanoby/monean.dat
index 75f540cd2..cf417a4ad 100644
--- a/P3D/Content/Data/maps/quest/tanoby/monean.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/monean.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Monean Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\moneanmap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\moneanmap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,15]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/tanoby/rixy.dat b/P3D/Content/Data/maps/quest/tanoby/rixy.dat
index 573af827b..fb8b88965 100644
--- a/P3D/Content/Data/maps/quest/tanoby/rixy.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/rixy.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Rixy Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,15]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/tanoby/scufib.dat b/P3D/Content/Data/maps/quest/tanoby/scufib.dat
index 93183777f..17452952d 100644
--- a/P3D/Content/Data/maps/quest/tanoby/scufib.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/scufib.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Scufib Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,15]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/tanoby/viapois.dat b/P3D/Content/Data/maps/quest/tanoby/viapois.dat
index f4db0cca4..d5b6960ad 100644
--- a/P3D/Content/Data/maps/quest/tanoby/viapois.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/viapois.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Viapois Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,15]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/tanoby/weepth.dat b/P3D/Content/Data/maps/quest/tanoby/weepth.dat
index 24f1089d5..32e6b6a95 100644
--- a/P3D/Content/Data/maps/quest/tanoby/weepth.dat
+++ b/P3D/Content/Data/maps/quest/tanoby/weepth.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Weepth Chamber]}}{"MusicLoop"{str[alph]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"WildPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lightning"{int[1]}}]}}
+{"Actions"{LEV[{"RadioChannels"{str[13.5]}}{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[quest\tanoby\chambermap]}}{"Weather"{int[1]}}{"Lighting"{int[1]}}]}}
 
 floors:
 {"Floor"{ENT[{"Size"{intArr[21,15]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[sevii]}}{"Texture"{rec[16,176,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/town.dat b/P3D/Content/Data/maps/quest/town.dat
index 005d61cd1..0f1382af6 100644
--- a/P3D/Content/Data/maps/quest/town.dat
+++ b/P3D/Content/Data/maps/quest/town.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Seven Island]}}{"MusicLoop"{str[violet]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[15,13]}}{"Position"{intArr[3,1,-1]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/double/1f.dat b/P3D/Content/Data/maps/quest/trainertower/double/1f.dat
index 34b69f4e6..6f851ef25 100644
--- a/P3D/Content/Data/maps/quest/trainertower/double/1f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/double/1f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\001]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\001]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/double/2f.dat b/P3D/Content/Data/maps/quest/trainertower/double/2f.dat
index 541edef73..570decbe2 100644
--- a/P3D/Content/Data/maps/quest/trainertower/double/2f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/double/2f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\002]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\002]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/double/3f.dat b/P3D/Content/Data/maps/quest/trainertower/double/3f.dat
index 180c038df..e09f0ebcc 100644
--- a/P3D/Content/Data/maps/quest/trainertower/double/3f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/double/3f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\003]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\003]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/double/4f.dat b/P3D/Content/Data/maps/quest/trainertower/double/4f.dat
index 03a091f0f..765e7ca89 100644
--- a/P3D/Content/Data/maps/quest/trainertower/double/4f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/double/4f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\004]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\004]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/double/5f.dat b/P3D/Content/Data/maps/quest/trainertower/double/5f.dat
index e202afdbb..8511eebd6 100644
--- a/P3D/Content/Data/maps/quest/trainertower/double/5f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/double/5f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\005]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\005]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/double/6f.dat b/P3D/Content/Data/maps/quest/trainertower/double/6f.dat
index c96dde224..c04f678db 100644
--- a/P3D/Content/Data/maps/quest/trainertower/double/6f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/double/6f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\006]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\006]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/double/7f.dat b/P3D/Content/Data/maps/quest/trainertower/double/7f.dat
index 177f5c635..b78197938 100644
--- a/P3D/Content/Data/maps/quest/trainertower/double/7f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/double/7f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\007]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\007]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/double/8f.dat b/P3D/Content/Data/maps/quest/trainertower/double/8f.dat
index 17ebef29a..c51f5456c 100644
--- a/P3D/Content/Data/maps/quest/trainertower/double/8f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/double/8f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\008]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\008]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/ent.dat b/P3D/Content/Data/maps/quest/trainertower/ent.dat
index e9a1540f4..13ea94079 100644
--- a/P3D/Content/Data/maps/quest/trainertower/ent.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/ent.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\entmap]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\entmap]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[19,16]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,64,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/1f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/1f.dat
index 4bf077c1c..b02b742ea 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/1f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/1f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/2f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/2f.dat
index afe04f938..245e442de 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/2f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/2f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/3f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/3f.dat
index d00e47fa4..04fa3efd9 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/3f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/3f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/4f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/4f.dat
index 74f0cc2ce..e99ffb3a6 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/4f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/4f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/5f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/5f.dat
index cfdc2a9b1..afc6ff7dd 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/5f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/5f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/6f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/6f.dat
index 3e1ffb123..d487eff73 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/6f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/6f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/7f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/7f.dat
index 972feacd6..c5960b95b 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/7f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/7f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/knockout/8f.dat b/P3D/Content/Data/maps/quest/trainertower/knockout/8f.dat
index 26ab7818e..52c06c749 100644
--- a/P3D/Content/Data/maps/quest/trainertower/knockout/8f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/knockout/8f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/main.dat b/P3D/Content/Data/maps/quest/trainertower/main.dat
index 8670c7e21..211a12f26 100644
--- a/P3D/Content/Data/maps/quest/trainertower/main.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/main.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[RouteMusic4]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[1]}}{"Lightning"{int[0]}}{"MapScript"{str[quest\tower\mainmap]}}{"BattleMap"{str[quest\trainertower\main.dat,-4,0,17.3]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[1]}}{"Lighting"{int[0]}}{"MapScript"{str[quest\tower\mainmap]}}{"BattleMap"{str[quest\trainertower\main.dat,-4,0,17.3]}}]}}
 
 Floor:
 {"Floor"{ENT[{"SeasonTexture"{str[Grass]}}{"Size"{intArr[9,6]}}{"Position"{intArr[10,0,9]}}{"TexturePath"{str[Cherrygrove]}}{"Texture"{rec[0,16,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/1f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/1f.dat
index a22bd3666..a48142347 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/1f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/1f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/2f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/2f.dat
index 61b49eb71..118d6505a 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/2f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/2f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/3f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/3f.dat
index f8ef86694..b8f504e20 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/3f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/3f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/4f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/4f.dat
index 9e948b137..43120edaf 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/4f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/4f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\m004]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\m004]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/5f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/5f.dat
index 8b17c3457..c973a4332 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/5f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/5f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\m005]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\m005]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/6f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/6f.dat
index 0910bf439..8c7e5f15b 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/6f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/6f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/7f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/7f.dat
index eb3e41550..f7ba8bb98 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/7f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/7f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\m007]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"MapScript"{str[quest\tower\doublesmaps\m007]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/mixed/8f.dat b/P3D/Content/Data/maps/quest/trainertower/mixed/8f.dat
index a9d48a162..546344052 100644
--- a/P3D/Content/Data/maps/quest/trainertower/mixed/8f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/mixed/8f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/single/1f.dat b/P3D/Content/Data/maps/quest/trainertower/single/1f.dat
index 300c745c7..b5d0181ab 100644
--- a/P3D/Content/Data/maps/quest/trainertower/single/1f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/single/1f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/single/2f.dat b/P3D/Content/Data/maps/quest/trainertower/single/2f.dat
index 306393081..06f641eff 100644
--- a/P3D/Content/Data/maps/quest/trainertower/single/2f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/single/2f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/single/3f.dat b/P3D/Content/Data/maps/quest/trainertower/single/3f.dat
index a4c2da702..59f8ed1a5 100644
--- a/P3D/Content/Data/maps/quest/trainertower/single/3f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/single/3f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/single/4f.dat b/P3D/Content/Data/maps/quest/trainertower/single/4f.dat
index 71f507e4b..da9d3d2eb 100644
--- a/P3D/Content/Data/maps/quest/trainertower/single/4f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/single/4f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/single/5f.dat b/P3D/Content/Data/maps/quest/trainertower/single/5f.dat
index 13a7ed0a0..44876987b 100644
--- a/P3D/Content/Data/maps/quest/trainertower/single/5f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/single/5f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/single/6f.dat b/P3D/Content/Data/maps/quest/trainertower/single/6f.dat
index 037733ee1..0240900ba 100644
--- a/P3D/Content/Data/maps/quest/trainertower/single/6f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/single/6f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/single/7f.dat b/P3D/Content/Data/maps/quest/trainertower/single/7f.dat
index d055fc720..640facf4d 100644
--- a/P3D/Content/Data/maps/quest/trainertower/single/7f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/single/7f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/quest/trainertower/single/8f.dat b/P3D/Content/Data/maps/quest/trainertower/single/8f.dat
index 3ee82cdac..697e8c216 100644
--- a/P3D/Content/Data/maps/quest/trainertower/single/8f.dat
+++ b/P3D/Content/Data/maps/quest/trainertower/single/8f.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Trainer Tower]}}{"MusicLoop"{str[gym]}}{"CurrentRegion"{str[sevii islands]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[1]}}{"Weather"{int[1]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[0]}}{"CanDig"{bool[0]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[1]}}{"Weather"{int[1]}}]}}
 
 Floor:
 {"Floor"{ENT[{"Size"{intArr[15,11]}}{"Position"{intArr[0,0,0]}}{"TexturePath"{str[trainertower]}}{"Texture"{rec[0,80,16,16]}}]}}
diff --git a/P3D/Content/Data/maps/rocketbase/rocketbase1.dat b/P3D/Content/Data/maps/rocketbase/rocketbase1.dat
index a73cb87c3..227c85e1d 100644
Binary files a/P3D/Content/Data/maps/rocketbase/rocketbase1.dat and b/P3D/Content/Data/maps/rocketbase/rocketbase1.dat differ
diff --git a/P3D/Content/Data/maps/rocketbase/rocketbase2.dat b/P3D/Content/Data/maps/rocketbase/rocketbase2.dat
index 8cd015b42..3e52c1901 100644
Binary files a/P3D/Content/Data/maps/rocketbase/rocketbase2.dat and b/P3D/Content/Data/maps/rocketbase/rocketbase2.dat differ
diff --git a/P3D/Content/Data/maps/rocketbase/rocketbase3.dat b/P3D/Content/Data/maps/rocketbase/rocketbase3.dat
index f79167e8f..ea8c809a4 100644
Binary files a/P3D/Content/Data/maps/rocketbase/rocketbase3.dat and b/P3D/Content/Data/maps/rocketbase/rocketbase3.dat differ
diff --git a/P3D/Content/Data/maps/rocktunnel/bf1.dat b/P3D/Content/Data/maps/rocktunnel/bf1.dat
index ab6d6ebb5..afdaeca72 100644
Binary files a/P3D/Content/Data/maps/rocktunnel/bf1.dat and b/P3D/Content/Data/maps/rocktunnel/bf1.dat differ
diff --git a/P3D/Content/Data/maps/rocktunnel/bf2.dat b/P3D/Content/Data/maps/rocktunnel/bf2.dat
index 9cc5e64b0..bd31b431d 100644
Binary files a/P3D/Content/Data/maps/rocktunnel/bf2.dat and b/P3D/Content/Data/maps/rocktunnel/bf2.dat differ
diff --git a/P3D/Content/Data/maps/route29.dat b/P3D/Content/Data/maps/route29.dat
index 01390ca42..29752bace 100644
Binary files a/P3D/Content/Data/maps/route29.dat and b/P3D/Content/Data/maps/route29.dat differ
diff --git a/P3D/Content/Data/maps/route30.dat b/P3D/Content/Data/maps/route30.dat
index a8376a8e8..3cf3bd232 100644
Binary files a/P3D/Content/Data/maps/route30.dat and b/P3D/Content/Data/maps/route30.dat differ
diff --git a/P3D/Content/Data/maps/route31.dat b/P3D/Content/Data/maps/route31.dat
index 8fa08b1e8..408668a7f 100644
Binary files a/P3D/Content/Data/maps/route31.dat and b/P3D/Content/Data/maps/route31.dat differ
diff --git a/P3D/Content/Data/maps/route32.dat b/P3D/Content/Data/maps/route32.dat
index 32bf189d4..91a176610 100644
Binary files a/P3D/Content/Data/maps/route32.dat and b/P3D/Content/Data/maps/route32.dat differ
diff --git a/P3D/Content/Data/maps/route32_center.dat b/P3D/Content/Data/maps/route32_center.dat
index a75809d32..57eab0204 100644
Binary files a/P3D/Content/Data/maps/route32_center.dat and b/P3D/Content/Data/maps/route32_center.dat differ
diff --git a/P3D/Content/Data/maps/route33.dat b/P3D/Content/Data/maps/route33.dat
index d55cee887..f578ace77 100644
Binary files a/P3D/Content/Data/maps/route33.dat and b/P3D/Content/Data/maps/route33.dat differ
diff --git a/P3D/Content/Data/maps/route36.dat b/P3D/Content/Data/maps/route36.dat
index 84c074cc9..1288de8bc 100644
Binary files a/P3D/Content/Data/maps/route36.dat and b/P3D/Content/Data/maps/route36.dat differ
diff --git a/P3D/Content/Data/maps/route37.dat b/P3D/Content/Data/maps/route37.dat
index 828bd2b9d..40661b3f2 100644
Binary files a/P3D/Content/Data/maps/route37.dat and b/P3D/Content/Data/maps/route37.dat differ
diff --git a/P3D/Content/Data/maps/route38.dat b/P3D/Content/Data/maps/route38.dat
index 9ad0eb40a..882f7de52 100644
Binary files a/P3D/Content/Data/maps/route38.dat and b/P3D/Content/Data/maps/route38.dat differ
diff --git a/P3D/Content/Data/maps/route39.dat b/P3D/Content/Data/maps/route39.dat
index bbeae2d7d..e5f5c7175 100644
Binary files a/P3D/Content/Data/maps/route39.dat and b/P3D/Content/Data/maps/route39.dat differ
diff --git a/P3D/Content/Data/maps/route39/barn.dat b/P3D/Content/Data/maps/route39/barn.dat
index 26d47b110..98ba85a97 100644
Binary files a/P3D/Content/Data/maps/route39/barn.dat and b/P3D/Content/Data/maps/route39/barn.dat differ
diff --git a/P3D/Content/Data/maps/route39/house.dat b/P3D/Content/Data/maps/route39/house.dat
index efb276f1b..7f452d308 100644
Binary files a/P3D/Content/Data/maps/route39/house.dat and b/P3D/Content/Data/maps/route39/house.dat differ
diff --git a/P3D/Content/Data/maps/routes/berryhouse.dat b/P3D/Content/Data/maps/routes/berryhouse.dat
index 22f507ea2..3e089d6b5 100644
Binary files a/P3D/Content/Data/maps/routes/berryhouse.dat and b/P3D/Content/Data/maps/routes/berryhouse.dat differ
diff --git a/P3D/Content/Data/maps/routes/daycare.dat b/P3D/Content/Data/maps/routes/daycare.dat
index 0aba93691..58a0001b3 100644
Binary files a/P3D/Content/Data/maps/routes/daycare.dat and b/P3D/Content/Data/maps/routes/daycare.dat differ
diff --git a/P3D/Content/Data/maps/routes/route1.dat b/P3D/Content/Data/maps/routes/route1.dat
index 335b1d150..e962ed96e 100644
Binary files a/P3D/Content/Data/maps/routes/route1.dat and b/P3D/Content/Data/maps/routes/route1.dat differ
diff --git a/P3D/Content/Data/maps/routes/route10.dat b/P3D/Content/Data/maps/routes/route10.dat
index 50fb1b3e5..e3762392e 100644
Binary files a/P3D/Content/Data/maps/routes/route10.dat and b/P3D/Content/Data/maps/routes/route10.dat differ
diff --git a/P3D/Content/Data/maps/routes/route10/center.dat b/P3D/Content/Data/maps/routes/route10/center.dat
index 091f1e2a8..0e72896bb 100644
Binary files a/P3D/Content/Data/maps/routes/route10/center.dat and b/P3D/Content/Data/maps/routes/route10/center.dat differ
diff --git a/P3D/Content/Data/maps/routes/route10/powerplant.dat b/P3D/Content/Data/maps/routes/route10/powerplant.dat
index bd4af0e71..130408b7d 100644
Binary files a/P3D/Content/Data/maps/routes/route10/powerplant.dat and b/P3D/Content/Data/maps/routes/route10/powerplant.dat differ
diff --git a/P3D/Content/Data/maps/routes/route11.dat b/P3D/Content/Data/maps/routes/route11.dat
index 6e8a6f77e..beaa8188a 100644
Binary files a/P3D/Content/Data/maps/routes/route11.dat and b/P3D/Content/Data/maps/routes/route11.dat differ
diff --git a/P3D/Content/Data/maps/routes/route12.dat b/P3D/Content/Data/maps/routes/route12.dat
index a44a42b86..eb1173c3d 100644
Binary files a/P3D/Content/Data/maps/routes/route12.dat and b/P3D/Content/Data/maps/routes/route12.dat differ
diff --git a/P3D/Content/Data/maps/routes/route12/fish.dat b/P3D/Content/Data/maps/routes/route12/fish.dat
index 0a53db173..2f4aeb521 100644
Binary files a/P3D/Content/Data/maps/routes/route12/fish.dat and b/P3D/Content/Data/maps/routes/route12/fish.dat differ
diff --git a/P3D/Content/Data/maps/routes/route13.dat b/P3D/Content/Data/maps/routes/route13.dat
index 8a959871b..a537e3a0f 100644
Binary files a/P3D/Content/Data/maps/routes/route13.dat and b/P3D/Content/Data/maps/routes/route13.dat differ
diff --git a/P3D/Content/Data/maps/routes/route14.dat b/P3D/Content/Data/maps/routes/route14.dat
index 3514a49a1..cd34bbcd7 100644
Binary files a/P3D/Content/Data/maps/routes/route14.dat and b/P3D/Content/Data/maps/routes/route14.dat differ
diff --git a/P3D/Content/Data/maps/routes/route15.dat b/P3D/Content/Data/maps/routes/route15.dat
index 0694a366e..f732db6b3 100644
Binary files a/P3D/Content/Data/maps/routes/route15.dat and b/P3D/Content/Data/maps/routes/route15.dat differ
diff --git a/P3D/Content/Data/maps/routes/route16.dat b/P3D/Content/Data/maps/routes/route16.dat
index ff055f7d8..a9b02d40e 100644
Binary files a/P3D/Content/Data/maps/routes/route16.dat and b/P3D/Content/Data/maps/routes/route16.dat differ
diff --git a/P3D/Content/Data/maps/routes/route16/1.dat b/P3D/Content/Data/maps/routes/route16/1.dat
index 26ce5e74a..127f8e66e 100644
Binary files a/P3D/Content/Data/maps/routes/route16/1.dat and b/P3D/Content/Data/maps/routes/route16/1.dat differ
diff --git a/P3D/Content/Data/maps/routes/route17.dat b/P3D/Content/Data/maps/routes/route17.dat
index f0f338433..9cff84de9 100644
Binary files a/P3D/Content/Data/maps/routes/route17.dat and b/P3D/Content/Data/maps/routes/route17.dat differ
diff --git a/P3D/Content/Data/maps/routes/route17offset.dat b/P3D/Content/Data/maps/routes/route17offset.dat
index ba352391b..3bbcc0731 100644
Binary files a/P3D/Content/Data/maps/routes/route17offset.dat and b/P3D/Content/Data/maps/routes/route17offset.dat differ
diff --git a/P3D/Content/Data/maps/routes/route18.dat b/P3D/Content/Data/maps/routes/route18.dat
index 05a9b642e..35918a197 100644
Binary files a/P3D/Content/Data/maps/routes/route18.dat and b/P3D/Content/Data/maps/routes/route18.dat differ
diff --git a/P3D/Content/Data/maps/routes/route18offset.dat b/P3D/Content/Data/maps/routes/route18offset.dat
index 4866ab42b..f72992aaf 100644
Binary files a/P3D/Content/Data/maps/routes/route18offset.dat and b/P3D/Content/Data/maps/routes/route18offset.dat differ
diff --git a/P3D/Content/Data/maps/routes/route19.dat b/P3D/Content/Data/maps/routes/route19.dat
index e3ce5618d..5aff5f5b7 100644
Binary files a/P3D/Content/Data/maps/routes/route19.dat and b/P3D/Content/Data/maps/routes/route19.dat differ
diff --git a/P3D/Content/Data/maps/routes/route2.dat b/P3D/Content/Data/maps/routes/route2.dat
index d7bcdcb4c..bd4db4b75 100644
Binary files a/P3D/Content/Data/maps/routes/route2.dat and b/P3D/Content/Data/maps/routes/route2.dat differ
diff --git a/P3D/Content/Data/maps/routes/route2/1.dat b/P3D/Content/Data/maps/routes/route2/1.dat
index efa78b299..862a80764 100644
Binary files a/P3D/Content/Data/maps/routes/route2/1.dat and b/P3D/Content/Data/maps/routes/route2/1.dat differ
diff --git a/P3D/Content/Data/maps/routes/route2/gate.dat b/P3D/Content/Data/maps/routes/route2/gate.dat
index b4ca014f8..37cf14f1a 100644
Binary files a/P3D/Content/Data/maps/routes/route2/gate.dat and b/P3D/Content/Data/maps/routes/route2/gate.dat differ
diff --git a/P3D/Content/Data/maps/routes/route20.dat b/P3D/Content/Data/maps/routes/route20.dat
index f0d5d09ff..291fa3b02 100644
Binary files a/P3D/Content/Data/maps/routes/route20.dat and b/P3D/Content/Data/maps/routes/route20.dat differ
diff --git a/P3D/Content/Data/maps/routes/route21.dat b/P3D/Content/Data/maps/routes/route21.dat
index 2ccef1e3a..43eef827e 100644
Binary files a/P3D/Content/Data/maps/routes/route21.dat and b/P3D/Content/Data/maps/routes/route21.dat differ
diff --git a/P3D/Content/Data/maps/routes/route22.dat b/P3D/Content/Data/maps/routes/route22.dat
index a6520139f..9bf56ebd3 100644
Binary files a/P3D/Content/Data/maps/routes/route22.dat and b/P3D/Content/Data/maps/routes/route22.dat differ
diff --git a/P3D/Content/Data/maps/routes/route24.dat b/P3D/Content/Data/maps/routes/route24.dat
index 755656565..a3fb539e9 100644
Binary files a/P3D/Content/Data/maps/routes/route24.dat and b/P3D/Content/Data/maps/routes/route24.dat differ
diff --git a/P3D/Content/Data/maps/routes/route25.dat b/P3D/Content/Data/maps/routes/route25.dat
index eb289cf24..c15648d24 100644
Binary files a/P3D/Content/Data/maps/routes/route25.dat and b/P3D/Content/Data/maps/routes/route25.dat differ
diff --git a/P3D/Content/Data/maps/routes/route25/bill.dat b/P3D/Content/Data/maps/routes/route25/bill.dat
index a7560d822..fe505b20a 100644
Binary files a/P3D/Content/Data/maps/routes/route25/bill.dat and b/P3D/Content/Data/maps/routes/route25/bill.dat differ
diff --git a/P3D/Content/Data/maps/routes/route26.dat b/P3D/Content/Data/maps/routes/route26.dat
index de5300f7d..bc9f2c535 100644
Binary files a/P3D/Content/Data/maps/routes/route26.dat and b/P3D/Content/Data/maps/routes/route26.dat differ
diff --git a/P3D/Content/Data/maps/routes/route26/0.dat b/P3D/Content/Data/maps/routes/route26/0.dat
index 8377a4007..f4cdeb72d 100644
Binary files a/P3D/Content/Data/maps/routes/route26/0.dat and b/P3D/Content/Data/maps/routes/route26/0.dat differ
diff --git a/P3D/Content/Data/maps/routes/route26/1.dat b/P3D/Content/Data/maps/routes/route26/1.dat
index 58f386e53..232e2baa8 100644
Binary files a/P3D/Content/Data/maps/routes/route26/1.dat and b/P3D/Content/Data/maps/routes/route26/1.dat differ
diff --git a/P3D/Content/Data/maps/routes/route27.dat b/P3D/Content/Data/maps/routes/route27.dat
index f64aaad88..abce008fe 100644
Binary files a/P3D/Content/Data/maps/routes/route27.dat and b/P3D/Content/Data/maps/routes/route27.dat differ
diff --git a/P3D/Content/Data/maps/routes/route27/1.dat b/P3D/Content/Data/maps/routes/route27/1.dat
index 4306377b7..04b102341 100644
Binary files a/P3D/Content/Data/maps/routes/route27/1.dat and b/P3D/Content/Data/maps/routes/route27/1.dat differ
diff --git a/P3D/Content/Data/maps/routes/route28.dat b/P3D/Content/Data/maps/routes/route28.dat
index 778efb5a7..f2d97a403 100644
--- a/P3D/Content/Data/maps/routes/route28.dat
+++ b/P3D/Content/Data/maps/routes/route28.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Route 28]}}{"MusicLoop"{str[RouteMusic5]}}{"CurrentRegion"{str[Kanto]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnviromentType"{int[0]}}{"Weather"{int[0]}}{"Lightning"{int[0]}}{"BattleMap"{str[routes\route28.dat,10,0,-2]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"CanFly"{bool[1]}}{"EnvironmentType"{int[0]}}{"Weather"{int[0]}}{"Lighting"{int[0]}}{"BattleMap"{str[routes\route28.dat,10,0,-2]}}]}}
 
 Floor:
 Grass:
diff --git a/P3D/Content/Data/maps/routes/route28/0.dat b/P3D/Content/Data/maps/routes/route28/0.dat
index bb4c89700..87e98439a 100644
Binary files a/P3D/Content/Data/maps/routes/route28/0.dat and b/P3D/Content/Data/maps/routes/route28/0.dat differ
diff --git a/P3D/Content/Data/maps/routes/route3.dat b/P3D/Content/Data/maps/routes/route3.dat
index d5fb849a6..9c7900ec2 100644
Binary files a/P3D/Content/Data/maps/routes/route3.dat and b/P3D/Content/Data/maps/routes/route3.dat differ
diff --git a/P3D/Content/Data/maps/routes/route34.dat b/P3D/Content/Data/maps/routes/route34.dat
index 1bb20ac41..c799533a1 100644
Binary files a/P3D/Content/Data/maps/routes/route34.dat and b/P3D/Content/Data/maps/routes/route34.dat differ
diff --git a/P3D/Content/Data/maps/routes/route35.dat b/P3D/Content/Data/maps/routes/route35.dat
index f5122725d..336249655 100644
Binary files a/P3D/Content/Data/maps/routes/route35.dat and b/P3D/Content/Data/maps/routes/route35.dat differ
diff --git a/P3D/Content/Data/maps/routes/route4.dat b/P3D/Content/Data/maps/routes/route4.dat
index b6ef05bd0..4d428506f 100644
Binary files a/P3D/Content/Data/maps/routes/route4.dat and b/P3D/Content/Data/maps/routes/route4.dat differ
diff --git a/P3D/Content/Data/maps/routes/route40.dat b/P3D/Content/Data/maps/routes/route40.dat
index 5a798e3b1..0d6756107 100644
Binary files a/P3D/Content/Data/maps/routes/route40.dat and b/P3D/Content/Data/maps/routes/route40.dat differ
diff --git a/P3D/Content/Data/maps/routes/route41.dat b/P3D/Content/Data/maps/routes/route41.dat
index 8b9418d6b..098184450 100644
Binary files a/P3D/Content/Data/maps/routes/route41.dat and b/P3D/Content/Data/maps/routes/route41.dat differ
diff --git a/P3D/Content/Data/maps/routes/route42.dat b/P3D/Content/Data/maps/routes/route42.dat
index 03d5209b2..58e51edad 100644
Binary files a/P3D/Content/Data/maps/routes/route42.dat and b/P3D/Content/Data/maps/routes/route42.dat differ
diff --git a/P3D/Content/Data/maps/routes/route43.dat b/P3D/Content/Data/maps/routes/route43.dat
index b1e2918cd..70a277293 100644
Binary files a/P3D/Content/Data/maps/routes/route43.dat and b/P3D/Content/Data/maps/routes/route43.dat differ
diff --git a/P3D/Content/Data/maps/routes/route44.dat b/P3D/Content/Data/maps/routes/route44.dat
index 5f7b0a60b..2ec675b12 100644
Binary files a/P3D/Content/Data/maps/routes/route44.dat and b/P3D/Content/Data/maps/routes/route44.dat differ
diff --git a/P3D/Content/Data/maps/routes/route45.dat b/P3D/Content/Data/maps/routes/route45.dat
index f14beed53..4c3ee5b3c 100644
Binary files a/P3D/Content/Data/maps/routes/route45.dat and b/P3D/Content/Data/maps/routes/route45.dat differ
diff --git a/P3D/Content/Data/maps/routes/route46.dat b/P3D/Content/Data/maps/routes/route46.dat
index e37dfaaba..441cf9fda 100644
Binary files a/P3D/Content/Data/maps/routes/route46.dat and b/P3D/Content/Data/maps/routes/route46.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/1.dat b/P3D/Content/Data/maps/routes/route47/1.dat
index ce9afac64..2e8011edb 100644
Binary files a/P3D/Content/Data/maps/routes/route47/1.dat and b/P3D/Content/Data/maps/routes/route47/1.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/2.dat b/P3D/Content/Data/maps/routes/route47/2.dat
index 585805254..125b9deaa 100644
Binary files a/P3D/Content/Data/maps/routes/route47/2.dat and b/P3D/Content/Data/maps/routes/route47/2.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/3.dat b/P3D/Content/Data/maps/routes/route47/3.dat
index fe07e0b2b..959d74b75 100644
Binary files a/P3D/Content/Data/maps/routes/route47/3.dat and b/P3D/Content/Data/maps/routes/route47/3.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/c1.dat b/P3D/Content/Data/maps/routes/route47/c1.dat
index 0660a2c97..a992cc0af 100644
Binary files a/P3D/Content/Data/maps/routes/route47/c1.dat and b/P3D/Content/Data/maps/routes/route47/c1.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/c2.dat b/P3D/Content/Data/maps/routes/route47/c2.dat
index 34d5318dc..157204db8 100644
Binary files a/P3D/Content/Data/maps/routes/route47/c2.dat and b/P3D/Content/Data/maps/routes/route47/c2.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/cb.dat b/P3D/Content/Data/maps/routes/route47/cb.dat
index bcbe49dee..5ba383ce5 100644
Binary files a/P3D/Content/Data/maps/routes/route47/cb.dat and b/P3D/Content/Data/maps/routes/route47/cb.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/embtower/dstone.dat b/P3D/Content/Data/maps/routes/route47/embtower/dstone.dat
index 4baa753b7..00ff8e385 100644
Binary files a/P3D/Content/Data/maps/routes/route47/embtower/dstone.dat and b/P3D/Content/Data/maps/routes/route47/embtower/dstone.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/embtower/kyurem.dat b/P3D/Content/Data/maps/routes/route47/embtower/kyurem.dat
index 32e9aa76c..b9180d422 100644
Binary files a/P3D/Content/Data/maps/routes/route47/embtower/kyurem.dat and b/P3D/Content/Data/maps/routes/route47/embtower/kyurem.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/embtower/lstone.dat b/P3D/Content/Data/maps/routes/route47/embtower/lstone.dat
index 7bcb8addc..ba72b93a3 100644
Binary files a/P3D/Content/Data/maps/routes/route47/embtower/lstone.dat and b/P3D/Content/Data/maps/routes/route47/embtower/lstone.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/embtower/main.dat b/P3D/Content/Data/maps/routes/route47/embtower/main.dat
index a9014bd73..8441186f6 100644
Binary files a/P3D/Content/Data/maps/routes/route47/embtower/main.dat and b/P3D/Content/Data/maps/routes/route47/embtower/main.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/embtower/main2.dat b/P3D/Content/Data/maps/routes/route47/embtower/main2.dat
index e5cdb0f89..90af55a4f 100644
Binary files a/P3D/Content/Data/maps/routes/route47/embtower/main2.dat and b/P3D/Content/Data/maps/routes/route47/embtower/main2.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/embtower/pkyurem.dat b/P3D/Content/Data/maps/routes/route47/embtower/pkyurem.dat
index 20f7670fe..2e16bb2be 100644
Binary files a/P3D/Content/Data/maps/routes/route47/embtower/pkyurem.dat and b/P3D/Content/Data/maps/routes/route47/embtower/pkyurem.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/embtower/reshiram.dat b/P3D/Content/Data/maps/routes/route47/embtower/reshiram.dat
index 2faea25e3..37cb4e22e 100644
Binary files a/P3D/Content/Data/maps/routes/route47/embtower/reshiram.dat and b/P3D/Content/Data/maps/routes/route47/embtower/reshiram.dat differ
diff --git a/P3D/Content/Data/maps/routes/route47/embtower/zekrom.dat b/P3D/Content/Data/maps/routes/route47/embtower/zekrom.dat
index 0323d31a6..fd377d77d 100644
Binary files a/P3D/Content/Data/maps/routes/route47/embtower/zekrom.dat and b/P3D/Content/Data/maps/routes/route47/embtower/zekrom.dat differ
diff --git a/P3D/Content/Data/maps/routes/route48.dat b/P3D/Content/Data/maps/routes/route48.dat
index eddec1d5a..2b4455b5c 100644
Binary files a/P3D/Content/Data/maps/routes/route48.dat and b/P3D/Content/Data/maps/routes/route48.dat differ
diff --git a/P3D/Content/Data/maps/routes/route49.dat b/P3D/Content/Data/maps/routes/route49.dat
index 6628c92a0..49150e9c7 100644
Binary files a/P3D/Content/Data/maps/routes/route49.dat and b/P3D/Content/Data/maps/routes/route49.dat differ
diff --git a/P3D/Content/Data/maps/routes/route5.dat b/P3D/Content/Data/maps/routes/route5.dat
index 895dfa5f3..a9f4a8f9e 100644
Binary files a/P3D/Content/Data/maps/routes/route5.dat and b/P3D/Content/Data/maps/routes/route5.dat differ
diff --git a/P3D/Content/Data/maps/routes/route5/1.dat b/P3D/Content/Data/maps/routes/route5/1.dat
index 656fe5ef7..9c798ab8b 100644
Binary files a/P3D/Content/Data/maps/routes/route5/1.dat and b/P3D/Content/Data/maps/routes/route5/1.dat differ
diff --git a/P3D/Content/Data/maps/routes/route50.dat b/P3D/Content/Data/maps/routes/route50.dat
index d010f70dd..822cce3a0 100644
Binary files a/P3D/Content/Data/maps/routes/route50.dat and b/P3D/Content/Data/maps/routes/route50.dat differ
diff --git a/P3D/Content/Data/maps/routes/route6.dat b/P3D/Content/Data/maps/routes/route6.dat
index 81fe9598a..8088fdb25 100644
Binary files a/P3D/Content/Data/maps/routes/route6.dat and b/P3D/Content/Data/maps/routes/route6.dat differ
diff --git a/P3D/Content/Data/maps/routes/route7.dat b/P3D/Content/Data/maps/routes/route7.dat
index 4bf0ce003..d008edfce 100644
Binary files a/P3D/Content/Data/maps/routes/route7.dat and b/P3D/Content/Data/maps/routes/route7.dat differ
diff --git a/P3D/Content/Data/maps/routes/route8.dat b/P3D/Content/Data/maps/routes/route8.dat
index 9466b85d4..c2b8e831e 100644
Binary files a/P3D/Content/Data/maps/routes/route8.dat and b/P3D/Content/Data/maps/routes/route8.dat differ
diff --git a/P3D/Content/Data/maps/routes/route9.dat b/P3D/Content/Data/maps/routes/route9.dat
index b2765d52c..78306c2eb 100644
Binary files a/P3D/Content/Data/maps/routes/route9.dat and b/P3D/Content/Data/maps/routes/route9.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/0.dat b/P3D/Content/Data/maps/safarizone/areas/0.dat
index 28d6913dc..1ef0f66f9 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/0.dat and b/P3D/Content/Data/maps/safarizone/areas/0.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/1.dat b/P3D/Content/Data/maps/safarizone/areas/1.dat
index f8c65d7f9..eb2225983 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/1.dat and b/P3D/Content/Data/maps/safarizone/areas/1.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/10.dat b/P3D/Content/Data/maps/safarizone/areas/10.dat
index 45c6495d8..9830072de 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/10.dat and b/P3D/Content/Data/maps/safarizone/areas/10.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/11.dat b/P3D/Content/Data/maps/safarizone/areas/11.dat
index 93c4ee74c..3fa7afecc 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/11.dat and b/P3D/Content/Data/maps/safarizone/areas/11.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/12.dat b/P3D/Content/Data/maps/safarizone/areas/12.dat
index fc8e050f0..e40a0ef35 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/12.dat and b/P3D/Content/Data/maps/safarizone/areas/12.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/13.dat b/P3D/Content/Data/maps/safarizone/areas/13.dat
index ab4def3ae..6f9d29093 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/13.dat and b/P3D/Content/Data/maps/safarizone/areas/13.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/14.dat b/P3D/Content/Data/maps/safarizone/areas/14.dat
index 9c93f1cff..a24434ef3 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/14.dat and b/P3D/Content/Data/maps/safarizone/areas/14.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/15.dat b/P3D/Content/Data/maps/safarizone/areas/15.dat
index d46741a12..e13c55fd6 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/15.dat and b/P3D/Content/Data/maps/safarizone/areas/15.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/16.dat b/P3D/Content/Data/maps/safarizone/areas/16.dat
index 952e2f830..3ae655ab6 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/16.dat and b/P3D/Content/Data/maps/safarizone/areas/16.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/17.dat b/P3D/Content/Data/maps/safarizone/areas/17.dat
index 8daa5ee84..526e5c9f3 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/17.dat and b/P3D/Content/Data/maps/safarizone/areas/17.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/18.dat b/P3D/Content/Data/maps/safarizone/areas/18.dat
index 188ee2536..003cf78be 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/18.dat and b/P3D/Content/Data/maps/safarizone/areas/18.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/19.dat b/P3D/Content/Data/maps/safarizone/areas/19.dat
index 3f1c11f79..7608f2149 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/19.dat and b/P3D/Content/Data/maps/safarizone/areas/19.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/2.dat b/P3D/Content/Data/maps/safarizone/areas/2.dat
index b1cc059a0..94b7e2be7 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/2.dat and b/P3D/Content/Data/maps/safarizone/areas/2.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/3.dat b/P3D/Content/Data/maps/safarizone/areas/3.dat
index 172b19d42..a189e7d14 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/3.dat and b/P3D/Content/Data/maps/safarizone/areas/3.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/4.dat b/P3D/Content/Data/maps/safarizone/areas/4.dat
index fa5c2dff5..9ffdee8a9 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/4.dat and b/P3D/Content/Data/maps/safarizone/areas/4.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/5.dat b/P3D/Content/Data/maps/safarizone/areas/5.dat
index a51aa7029..b898f0d66 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/5.dat and b/P3D/Content/Data/maps/safarizone/areas/5.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/6.dat b/P3D/Content/Data/maps/safarizone/areas/6.dat
index 480d9faa7..97fa53730 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/6.dat and b/P3D/Content/Data/maps/safarizone/areas/6.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/7.dat b/P3D/Content/Data/maps/safarizone/areas/7.dat
index 06276f04c..47266ec70 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/7.dat and b/P3D/Content/Data/maps/safarizone/areas/7.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/8.dat b/P3D/Content/Data/maps/safarizone/areas/8.dat
index 5072aa58a..0d6e91c51 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/8.dat and b/P3D/Content/Data/maps/safarizone/areas/8.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/areas/9.dat b/P3D/Content/Data/maps/safarizone/areas/9.dat
index 1b6f33fba..2b7568b80 100644
Binary files a/P3D/Content/Data/maps/safarizone/areas/9.dat and b/P3D/Content/Data/maps/safarizone/areas/9.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/center.dat b/P3D/Content/Data/maps/safarizone/center.dat
index cbcb5950e..4955ad6eb 100644
Binary files a/P3D/Content/Data/maps/safarizone/center.dat and b/P3D/Content/Data/maps/safarizone/center.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/gate.dat b/P3D/Content/Data/maps/safarizone/gate.dat
index 176883373..d63420bb2 100644
Binary files a/P3D/Content/Data/maps/safarizone/gate.dat and b/P3D/Content/Data/maps/safarizone/gate.dat differ
diff --git a/P3D/Content/Data/maps/safarizone/main.dat b/P3D/Content/Data/maps/safarizone/main.dat
index 2396b2aa0..d90e5178e 100644
Binary files a/P3D/Content/Data/maps/safarizone/main.dat and b/P3D/Content/Data/maps/safarizone/main.dat differ
diff --git a/P3D/Content/Data/maps/saffron/center.dat b/P3D/Content/Data/maps/saffron/center.dat
index 239b70230..af3ee76dd 100644
Binary files a/P3D/Content/Data/maps/saffron/center.dat and b/P3D/Content/Data/maps/saffron/center.dat differ
diff --git a/P3D/Content/Data/maps/saffron/copycat1.dat b/P3D/Content/Data/maps/saffron/copycat1.dat
index 87d2ecf99..eee2c2b4b 100644
Binary files a/P3D/Content/Data/maps/saffron/copycat1.dat and b/P3D/Content/Data/maps/saffron/copycat1.dat differ
diff --git a/P3D/Content/Data/maps/saffron/copycat2.dat b/P3D/Content/Data/maps/saffron/copycat2.dat
index 44741645c..a73baf218 100644
Binary files a/P3D/Content/Data/maps/saffron/copycat2.dat and b/P3D/Content/Data/maps/saffron/copycat2.dat differ
diff --git a/P3D/Content/Data/maps/saffron/dojo.dat b/P3D/Content/Data/maps/saffron/dojo.dat
index 70f4eb723..c7107f0ff 100644
Binary files a/P3D/Content/Data/maps/saffron/dojo.dat and b/P3D/Content/Data/maps/saffron/dojo.dat differ
diff --git a/P3D/Content/Data/maps/saffron/main.dat b/P3D/Content/Data/maps/saffron/main.dat
index 623391dd3..a116418db 100644
Binary files a/P3D/Content/Data/maps/saffron/main.dat and b/P3D/Content/Data/maps/saffron/main.dat differ
diff --git a/P3D/Content/Data/maps/saffron/mart.dat b/P3D/Content/Data/maps/saffron/mart.dat
index fd3572d43..2c49fd7f4 100644
Binary files a/P3D/Content/Data/maps/saffron/mart.dat and b/P3D/Content/Data/maps/saffron/mart.dat differ
diff --git a/P3D/Content/Data/maps/saffron/psychic.dat b/P3D/Content/Data/maps/saffron/psychic.dat
index 05cbb41ba..1f9872ebd 100644
Binary files a/P3D/Content/Data/maps/saffron/psychic.dat and b/P3D/Content/Data/maps/saffron/psychic.dat differ
diff --git a/P3D/Content/Data/maps/saffron/rotomroom.dat b/P3D/Content/Data/maps/saffron/rotomroom.dat
index d916a9562..e29ec675b 100644
Binary files a/P3D/Content/Data/maps/saffron/rotomroom.dat and b/P3D/Content/Data/maps/saffron/rotomroom.dat differ
diff --git a/P3D/Content/Data/maps/saffron/silph.dat b/P3D/Content/Data/maps/saffron/silph.dat
index 77e7ce68f..ebaf46f40 100644
Binary files a/P3D/Content/Data/maps/saffron/silph.dat and b/P3D/Content/Data/maps/saffron/silph.dat differ
diff --git a/P3D/Content/Data/maps/saffron/trainstation.dat b/P3D/Content/Data/maps/saffron/trainstation.dat
index 1a8d8ffc1..1d18179a8 100644
Binary files a/P3D/Content/Data/maps/saffron/trainstation.dat and b/P3D/Content/Data/maps/saffron/trainstation.dat differ
diff --git a/P3D/Content/Data/maps/saffron/underground0.dat b/P3D/Content/Data/maps/saffron/underground0.dat
index 024e5287c..f24e26416 100644
Binary files a/P3D/Content/Data/maps/saffron/underground0.dat and b/P3D/Content/Data/maps/saffron/underground0.dat differ
diff --git a/P3D/Content/Data/maps/seafoam/bf1.dat b/P3D/Content/Data/maps/seafoam/bf1.dat
index 8dd05ef90..fcb780566 100644
Binary files a/P3D/Content/Data/maps/seafoam/bf1.dat and b/P3D/Content/Data/maps/seafoam/bf1.dat differ
diff --git a/P3D/Content/Data/maps/seafoam/bf2.dat b/P3D/Content/Data/maps/seafoam/bf2.dat
index 8ec57addf..be87db15e 100644
Binary files a/P3D/Content/Data/maps/seafoam/bf2.dat and b/P3D/Content/Data/maps/seafoam/bf2.dat differ
diff --git a/P3D/Content/Data/maps/seafoam/bf3.dat b/P3D/Content/Data/maps/seafoam/bf3.dat
index 18fe6740c..94117d893 100644
Binary files a/P3D/Content/Data/maps/seafoam/bf3.dat and b/P3D/Content/Data/maps/seafoam/bf3.dat differ
diff --git a/P3D/Content/Data/maps/seafoam/bf4.dat b/P3D/Content/Data/maps/seafoam/bf4.dat
index c70f08488..859844244 100644
Binary files a/P3D/Content/Data/maps/seafoam/bf4.dat and b/P3D/Content/Data/maps/seafoam/bf4.dat differ
diff --git a/P3D/Content/Data/maps/seafoam/entEast.dat b/P3D/Content/Data/maps/seafoam/entEast.dat
index 36453373e..7fa2f1551 100644
Binary files a/P3D/Content/Data/maps/seafoam/entEast.dat and b/P3D/Content/Data/maps/seafoam/entEast.dat differ
diff --git a/P3D/Content/Data/maps/seafoam/entWest.dat b/P3D/Content/Data/maps/seafoam/entWest.dat
index 6886b6b69..2e8841f9b 100644
Binary files a/P3D/Content/Data/maps/seafoam/entWest.dat and b/P3D/Content/Data/maps/seafoam/entWest.dat differ
diff --git a/P3D/Content/Data/maps/slowpokewell/slowpokewell1f.dat b/P3D/Content/Data/maps/slowpokewell/slowpokewell1f.dat
index b57d9c7a3..a73f64c0a 100644
Binary files a/P3D/Content/Data/maps/slowpokewell/slowpokewell1f.dat and b/P3D/Content/Data/maps/slowpokewell/slowpokewell1f.dat differ
diff --git a/P3D/Content/Data/maps/slowpokewell/slowpokewellb1f.dat b/P3D/Content/Data/maps/slowpokewell/slowpokewellb1f.dat
index 378556e5f..384c2892a 100644
Binary files a/P3D/Content/Data/maps/slowpokewell/slowpokewellb1f.dat and b/P3D/Content/Data/maps/slowpokewell/slowpokewellb1f.dat differ
diff --git a/P3D/Content/Data/maps/speedboatscene.dat b/P3D/Content/Data/maps/speedboatscene.dat
index a7b07aad9..b1257ab28 100644
Binary files a/P3D/Content/Data/maps/speedboatscene.dat and b/P3D/Content/Data/maps/speedboatscene.dat differ
diff --git a/P3D/Content/Data/maps/test.dat b/P3D/Content/Data/maps/test.dat
index 907f2b65b..0a8e5c455 100644
Binary files a/P3D/Content/Data/maps/test.dat and b/P3D/Content/Data/maps/test.dat differ
diff --git a/P3D/Content/Data/maps/tohjofalls.dat b/P3D/Content/Data/maps/tohjofalls.dat
index b7d244da6..782110fb6 100644
Binary files a/P3D/Content/Data/maps/tohjofalls.dat and b/P3D/Content/Data/maps/tohjofalls.dat differ
diff --git a/P3D/Content/Data/maps/tohjofalls/hideout.dat b/P3D/Content/Data/maps/tohjofalls/hideout.dat
index 8156689aa..b8e06a075 100644
Binary files a/P3D/Content/Data/maps/tohjofalls/hideout.dat and b/P3D/Content/Data/maps/tohjofalls/hideout.dat differ
diff --git a/P3D/Content/Data/maps/trainmaps/center.dat b/P3D/Content/Data/maps/trainmaps/center.dat
index 4903f7492..33e5fd341 100644
Binary files a/P3D/Content/Data/maps/trainmaps/center.dat and b/P3D/Content/Data/maps/trainmaps/center.dat differ
diff --git a/P3D/Content/Data/maps/trainmaps/fromgoldenrod.dat b/P3D/Content/Data/maps/trainmaps/fromgoldenrod.dat
index e99c167bd..e2a5c1c38 100644
Binary files a/P3D/Content/Data/maps/trainmaps/fromgoldenrod.dat and b/P3D/Content/Data/maps/trainmaps/fromgoldenrod.dat differ
diff --git a/P3D/Content/Data/maps/trainmaps/fromsaffron.dat b/P3D/Content/Data/maps/trainmaps/fromsaffron.dat
index ce3f362d6..714d2f230 100644
Binary files a/P3D/Content/Data/maps/trainmaps/fromsaffron.dat and b/P3D/Content/Data/maps/trainmaps/fromsaffron.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/0/0.dat b/P3D/Content/Data/maps/twirl forest/0/0.dat
index ba947dd0e..7b5aec9ff 100644
Binary files a/P3D/Content/Data/maps/twirl forest/0/0.dat and b/P3D/Content/Data/maps/twirl forest/0/0.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/0/1.dat b/P3D/Content/Data/maps/twirl forest/0/1.dat
index e9c8336a0..5afba0866 100644
Binary files a/P3D/Content/Data/maps/twirl forest/0/1.dat and b/P3D/Content/Data/maps/twirl forest/0/1.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/0/10.dat b/P3D/Content/Data/maps/twirl forest/0/10.dat
index 86973b18f..93bd2ae87 100644
Binary files a/P3D/Content/Data/maps/twirl forest/0/10.dat and b/P3D/Content/Data/maps/twirl forest/0/10.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/0/11.dat b/P3D/Content/Data/maps/twirl forest/0/11.dat
index 77b79d484..dd267c9f4 100644
Binary files a/P3D/Content/Data/maps/twirl forest/0/11.dat and b/P3D/Content/Data/maps/twirl forest/0/11.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/0/15.dat b/P3D/Content/Data/maps/twirl forest/0/15.dat
index 679185d10..2c6f7a522 100644
Binary files a/P3D/Content/Data/maps/twirl forest/0/15.dat and b/P3D/Content/Data/maps/twirl forest/0/15.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/0/2.dat b/P3D/Content/Data/maps/twirl forest/0/2.dat
index 4109f5b80..a081ea876 100644
Binary files a/P3D/Content/Data/maps/twirl forest/0/2.dat and b/P3D/Content/Data/maps/twirl forest/0/2.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/0/3.dat b/P3D/Content/Data/maps/twirl forest/0/3.dat
index 46665be2b..b1413a3f0 100644
Binary files a/P3D/Content/Data/maps/twirl forest/0/3.dat and b/P3D/Content/Data/maps/twirl forest/0/3.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/0/4.dat b/P3D/Content/Data/maps/twirl forest/0/4.dat
index b8a5912b6..b4fe22b67 100644
Binary files a/P3D/Content/Data/maps/twirl forest/0/4.dat and b/P3D/Content/Data/maps/twirl forest/0/4.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/0/5.dat b/P3D/Content/Data/maps/twirl forest/0/5.dat
index ae4f6a734..0afa36fe1 100644
Binary files a/P3D/Content/Data/maps/twirl forest/0/5.dat and b/P3D/Content/Data/maps/twirl forest/0/5.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/0/9.dat b/P3D/Content/Data/maps/twirl forest/0/9.dat
index e01510262..3df51d8b9 100644
Binary files a/P3D/Content/Data/maps/twirl forest/0/9.dat and b/P3D/Content/Data/maps/twirl forest/0/9.dat differ
diff --git a/P3D/Content/Data/maps/twirl forest/main.dat b/P3D/Content/Data/maps/twirl forest/main.dat
index 8ddf9aa87..dbc2e2b34 100644
Binary files a/P3D/Content/Data/maps/twirl forest/main.dat and b/P3D/Content/Data/maps/twirl forest/main.dat differ
diff --git a/P3D/Content/Data/maps/underwatercave/main.dat b/P3D/Content/Data/maps/underwatercave/main.dat
index 6d234c39d..b54a3899f 100644
--- a/P3D/Content/Data/maps/underwatercave/main.dat
+++ b/P3D/Content/Data/maps/underwatercave/main.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Underwater Cave]}}{"MusicLoop"{str[darkcave]}}{"WildPokemon"{bool[1]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"OverworldPokemon"{bool[1]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[3]}}{"MapScript"{str[underwatercave\rocks\puzzlerocks]}}{"Weather"{int[1]}}{"Lightning"{int[3]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[3]}}{"MapScript"{str[underwatercave\rocks\puzzlerocks]}}{"Weather"{int[1]}}{"Lighting"{int[3]}}]}}
 
 	#Replace "PlaceHolderMap.dat" with the respective warping destination.
 
diff --git a/P3D/Content/Data/maps/underwatercave/manaphy.dat b/P3D/Content/Data/maps/underwatercave/manaphy.dat
index 97e15f086..99367ad8e 100644
--- a/P3D/Content/Data/maps/underwatercave/manaphy.dat
+++ b/P3D/Content/Data/maps/underwatercave/manaphy.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Underwater Cave]}}{"MusicLoop"{str[darkcave]}}{"WildPokemon"{bool[1]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"OverworldPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"MapScript"{str[underwatercave\deepseaemblemcheck]}}{"EnviromentType"{int[4]}}{"Weather"{int[4]}}{"Lightning"{int[3]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"MapScript"{str[underwatercave\deepseaemblemcheck]}}{"EnvironmentType"{int[4]}}{"Weather"{int[4]}}{"Lighting"{int[3]}}]}}
 Floor:
 	Normal Floor:
 		{"EntityField"{ENT[{"Size"{intArr[11,11]}}{"Position"{sngArr[0,-0.25,0]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}}
diff --git a/P3D/Content/Data/maps/underwatercave/surface.dat b/P3D/Content/Data/maps/underwatercave/surface.dat
index 2a71dd8d6..eb6205efe 100644
Binary files a/P3D/Content/Data/maps/underwatercave/surface.dat and b/P3D/Content/Data/maps/underwatercave/surface.dat differ
diff --git a/P3D/Content/Data/maps/underwatercave/underwater.dat b/P3D/Content/Data/maps/underwatercave/underwater.dat
index 0dc1ff025..13356dcdc 100644
--- a/P3D/Content/Data/maps/underwatercave/underwater.dat
+++ b/P3D/Content/Data/maps/underwatercave/underwater.dat
@@ -1,5 +1,5 @@
 {"Level"{LEV[{"Name"{str[Underwater Path]}}{"MusicLoop"{str[darkcave]}}{"WildPokemon"{bool[1]}}{"CurrentRegion"{str[sevii islands]}}{"RegionalForm"{str[alola]}}{"OverworldPokemon"{bool[0]}}]}}
-{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[4]}}{"Weather"{int[4]}}{"Lightning"{int[3]}}{"SurfingBattleMap"{str[underwatercave\underwater.dat,-7,0,14]}}]}}
+{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnvironmentType"{int[4]}}{"Weather"{int[4]}}{"Lighting"{int[3]}}{"SurfingBattleMap"{str[underwatercave\underwater.dat,-7,0,14]}}]}}
 
 
 \\Internal Part:
diff --git a/P3D/Content/Data/maps/underwatercave/volcano.dat b/P3D/Content/Data/maps/underwatercave/volcano.dat
index 60ed50f38..120ffb663 100644
Binary files a/P3D/Content/Data/maps/underwatercave/volcano.dat and b/P3D/Content/Data/maps/underwatercave/volcano.dat differ
diff --git a/P3D/Content/Data/maps/unioncave/unioncavebf1.dat b/P3D/Content/Data/maps/unioncave/unioncavebf1.dat
index 40b04d83e..c0a970002 100644
Binary files a/P3D/Content/Data/maps/unioncave/unioncavebf1.dat and b/P3D/Content/Data/maps/unioncave/unioncavebf1.dat differ
diff --git a/P3D/Content/Data/maps/unioncave/unioncavebf2.dat b/P3D/Content/Data/maps/unioncave/unioncavebf2.dat
index 304674813..af5ed61bf 100644
Binary files a/P3D/Content/Data/maps/unioncave/unioncavebf2.dat and b/P3D/Content/Data/maps/unioncave/unioncavebf2.dat differ
diff --git a/P3D/Content/Data/maps/unioncave/unioncavef1.dat b/P3D/Content/Data/maps/unioncave/unioncavef1.dat
index bb5af73c5..39c4965a7 100644
Binary files a/P3D/Content/Data/maps/unioncave/unioncavef1.dat and b/P3D/Content/Data/maps/unioncave/unioncavef1.dat differ
diff --git a/P3D/Content/Data/maps/v_forest/main.dat b/P3D/Content/Data/maps/v_forest/main.dat
index 1f5f86b3e..bed0a0dcc 100644
Binary files a/P3D/Content/Data/maps/v_forest/main.dat and b/P3D/Content/Data/maps/v_forest/main.dat differ
diff --git a/P3D/Content/Data/maps/v_forest/north.dat b/P3D/Content/Data/maps/v_forest/north.dat
index de03f7ea1..93401d1e8 100644
Binary files a/P3D/Content/Data/maps/v_forest/north.dat and b/P3D/Content/Data/maps/v_forest/north.dat differ
diff --git a/P3D/Content/Data/maps/v_forest/south.dat b/P3D/Content/Data/maps/v_forest/south.dat
index 1ff725760..19745662d 100644
Binary files a/P3D/Content/Data/maps/v_forest/south.dat and b/P3D/Content/Data/maps/v_forest/south.dat differ
diff --git a/P3D/Content/Data/maps/vermilion/1.dat b/P3D/Content/Data/maps/vermilion/1.dat
index 3b1ddd33b..b20621933 100644
Binary files a/P3D/Content/Data/maps/vermilion/1.dat and b/P3D/Content/Data/maps/vermilion/1.dat differ
diff --git a/P3D/Content/Data/maps/vermilion/2.dat b/P3D/Content/Data/maps/vermilion/2.dat
index e74247cfa..2fc9e054e 100644
Binary files a/P3D/Content/Data/maps/vermilion/2.dat and b/P3D/Content/Data/maps/vermilion/2.dat differ
diff --git a/P3D/Content/Data/maps/vermilion/3.dat b/P3D/Content/Data/maps/vermilion/3.dat
index 0e4329961..cb49d38a6 100644
Binary files a/P3D/Content/Data/maps/vermilion/3.dat and b/P3D/Content/Data/maps/vermilion/3.dat differ
diff --git a/P3D/Content/Data/maps/vermilion/center.dat b/P3D/Content/Data/maps/vermilion/center.dat
index 02651511a..9fdef6b35 100644
Binary files a/P3D/Content/Data/maps/vermilion/center.dat and b/P3D/Content/Data/maps/vermilion/center.dat differ
diff --git a/P3D/Content/Data/maps/vermilion/dock.dat b/P3D/Content/Data/maps/vermilion/dock.dat
index 9a8d09ea1..d7d026bcf 100644
Binary files a/P3D/Content/Data/maps/vermilion/dock.dat and b/P3D/Content/Data/maps/vermilion/dock.dat differ
diff --git a/P3D/Content/Data/maps/vermilion/dock_entrance.dat b/P3D/Content/Data/maps/vermilion/dock_entrance.dat
index 072ef8d3e..b29b9f946 100644
Binary files a/P3D/Content/Data/maps/vermilion/dock_entrance.dat and b/P3D/Content/Data/maps/vermilion/dock_entrance.dat differ
diff --git a/P3D/Content/Data/maps/vermilion/fan.dat b/P3D/Content/Data/maps/vermilion/fan.dat
index 25d5522d8..db6cc3c83 100644
Binary files a/P3D/Content/Data/maps/vermilion/fan.dat and b/P3D/Content/Data/maps/vermilion/fan.dat differ
diff --git a/P3D/Content/Data/maps/vermilion/main.dat b/P3D/Content/Data/maps/vermilion/main.dat
index fe719e427..4439a02e8 100644
Binary files a/P3D/Content/Data/maps/vermilion/main.dat and b/P3D/Content/Data/maps/vermilion/main.dat differ
diff --git a/P3D/Content/Data/maps/vermilion/mart.dat b/P3D/Content/Data/maps/vermilion/mart.dat
index 7caa061da..c685ad7d5 100644
Binary files a/P3D/Content/Data/maps/vermilion/mart.dat and b/P3D/Content/Data/maps/vermilion/mart.dat differ
diff --git a/P3D/Content/Data/maps/victoryroad/1.dat b/P3D/Content/Data/maps/victoryroad/1.dat
index 098585aa0..2dc322136 100644
Binary files a/P3D/Content/Data/maps/victoryroad/1.dat and b/P3D/Content/Data/maps/victoryroad/1.dat differ
diff --git a/P3D/Content/Data/maps/victoryroad/2.dat b/P3D/Content/Data/maps/victoryroad/2.dat
index 34a6d4fcf..c5dd9e31c 100644
Binary files a/P3D/Content/Data/maps/victoryroad/2.dat and b/P3D/Content/Data/maps/victoryroad/2.dat differ
diff --git a/P3D/Content/Data/maps/victoryroad/3.dat b/P3D/Content/Data/maps/victoryroad/3.dat
index 49462ad89..617e33808 100644
Binary files a/P3D/Content/Data/maps/victoryroad/3.dat and b/P3D/Content/Data/maps/victoryroad/3.dat differ
diff --git a/P3D/Content/Data/maps/violet.dat b/P3D/Content/Data/maps/violet.dat
index 6d7278c10..5970746a9 100644
Binary files a/P3D/Content/Data/maps/violet.dat and b/P3D/Content/Data/maps/violet.dat differ
diff --git a/P3D/Content/Data/maps/violet/001.dat b/P3D/Content/Data/maps/violet/001.dat
index 4c6c6e2db..5fd8a379f 100644
Binary files a/P3D/Content/Data/maps/violet/001.dat and b/P3D/Content/Data/maps/violet/001.dat differ
diff --git a/P3D/Content/Data/maps/violet/002.dat b/P3D/Content/Data/maps/violet/002.dat
index db626fbd1..6b30161e1 100644
Binary files a/P3D/Content/Data/maps/violet/002.dat and b/P3D/Content/Data/maps/violet/002.dat differ
diff --git a/P3D/Content/Data/maps/violet/school.dat b/P3D/Content/Data/maps/violet/school.dat
index fddf10842..ffd988b7b 100644
Binary files a/P3D/Content/Data/maps/violet/school.dat and b/P3D/Content/Data/maps/violet/school.dat differ
diff --git a/P3D/Content/Data/maps/violet/sprouttowerf1.dat b/P3D/Content/Data/maps/violet/sprouttowerf1.dat
index 2eaca4ed7..8b750f69f 100644
Binary files a/P3D/Content/Data/maps/violet/sprouttowerf1.dat and b/P3D/Content/Data/maps/violet/sprouttowerf1.dat differ
diff --git a/P3D/Content/Data/maps/violet/sprouttowerf2.dat b/P3D/Content/Data/maps/violet/sprouttowerf2.dat
index badee695c..3e8a82017 100644
Binary files a/P3D/Content/Data/maps/violet/sprouttowerf2.dat and b/P3D/Content/Data/maps/violet/sprouttowerf2.dat differ
diff --git a/P3D/Content/Data/maps/violet/sprouttowerf3.dat b/P3D/Content/Data/maps/violet/sprouttowerf3.dat
index 95e7f8316..75fde50ee 100644
Binary files a/P3D/Content/Data/maps/violet/sprouttowerf3.dat and b/P3D/Content/Data/maps/violet/sprouttowerf3.dat differ
diff --git a/P3D/Content/Data/maps/violet_center.dat b/P3D/Content/Data/maps/violet_center.dat
index de5c044da..2d97a1313 100644
Binary files a/P3D/Content/Data/maps/violet_center.dat and b/P3D/Content/Data/maps/violet_center.dat differ
diff --git a/P3D/Content/Data/maps/violet_mart.dat b/P3D/Content/Data/maps/violet_mart.dat
index 1ba8b197f..9033c66ab 100644
Binary files a/P3D/Content/Data/maps/violet_mart.dat and b/P3D/Content/Data/maps/violet_mart.dat differ
diff --git a/P3D/Content/Data/maps/violetroute31gate.dat b/P3D/Content/Data/maps/violetroute31gate.dat
index 064731f57..55e4495db 100644
Binary files a/P3D/Content/Data/maps/violetroute31gate.dat and b/P3D/Content/Data/maps/violetroute31gate.dat differ
diff --git a/P3D/Content/Data/maps/viridian/1.dat b/P3D/Content/Data/maps/viridian/1.dat
index fd6c03bea..1ab84de84 100644
Binary files a/P3D/Content/Data/maps/viridian/1.dat and b/P3D/Content/Data/maps/viridian/1.dat differ
diff --git a/P3D/Content/Data/maps/viridian/center.dat b/P3D/Content/Data/maps/viridian/center.dat
index d2b9c9f38..0bde2b4b1 100644
Binary files a/P3D/Content/Data/maps/viridian/center.dat and b/P3D/Content/Data/maps/viridian/center.dat differ
diff --git a/P3D/Content/Data/maps/viridian/main.dat b/P3D/Content/Data/maps/viridian/main.dat
index d1101da02..9a5a1ed57 100644
Binary files a/P3D/Content/Data/maps/viridian/main.dat and b/P3D/Content/Data/maps/viridian/main.dat differ
diff --git a/P3D/Content/Data/maps/viridian/mart.dat b/P3D/Content/Data/maps/viridian/mart.dat
index 0e93dd2a9..bd989ac17 100644
Binary files a/P3D/Content/Data/maps/viridian/mart.dat and b/P3D/Content/Data/maps/viridian/mart.dat differ
diff --git a/P3D/Content/Data/maps/viridian/trainerhouse/arena.dat b/P3D/Content/Data/maps/viridian/trainerhouse/arena.dat
index bfb7d1d1a..d0ada0f4a 100644
Binary files a/P3D/Content/Data/maps/viridian/trainerhouse/arena.dat and b/P3D/Content/Data/maps/viridian/trainerhouse/arena.dat differ
diff --git a/P3D/Content/Data/maps/viridian/trainerhouse/bf.dat b/P3D/Content/Data/maps/viridian/trainerhouse/bf.dat
index 6403434bb..079becd3c 100644
Binary files a/P3D/Content/Data/maps/viridian/trainerhouse/bf.dat and b/P3D/Content/Data/maps/viridian/trainerhouse/bf.dat differ
diff --git a/P3D/Content/Data/maps/viridian/trainerhouse/main.dat b/P3D/Content/Data/maps/viridian/trainerhouse/main.dat
index 1cbefbd5b..59076493b 100644
Binary files a/P3D/Content/Data/maps/viridian/trainerhouse/main.dat and b/P3D/Content/Data/maps/viridian/trainerhouse/main.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/1fne.dat b/P3D/Content/Data/maps/whirlislands/1fne.dat
index f4e6ad796..463fdf759 100644
Binary files a/P3D/Content/Data/maps/whirlislands/1fne.dat and b/P3D/Content/Data/maps/whirlislands/1fne.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/1fnw.dat b/P3D/Content/Data/maps/whirlislands/1fnw.dat
index 305a1841b..e692041eb 100644
Binary files a/P3D/Content/Data/maps/whirlislands/1fnw.dat and b/P3D/Content/Data/maps/whirlislands/1fnw.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/1fse.dat b/P3D/Content/Data/maps/whirlislands/1fse.dat
index 91d6e4c52..aa2f4105e 100644
Binary files a/P3D/Content/Data/maps/whirlislands/1fse.dat and b/P3D/Content/Data/maps/whirlislands/1fse.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/1fsw.dat b/P3D/Content/Data/maps/whirlislands/1fsw.dat
index ca55c6d25..3f5f887f7 100644
Binary files a/P3D/Content/Data/maps/whirlislands/1fsw.dat and b/P3D/Content/Data/maps/whirlislands/1fsw.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/bf1main.dat b/P3D/Content/Data/maps/whirlislands/bf1main.dat
index d463a07a4..e7cbdbeca 100644
Binary files a/P3D/Content/Data/maps/whirlislands/bf1main.dat and b/P3D/Content/Data/maps/whirlislands/bf1main.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/lugia.dat b/P3D/Content/Data/maps/whirlislands/lugia.dat
index ca76a0ebc..0edd0f53d 100644
Binary files a/P3D/Content/Data/maps/whirlislands/lugia.dat and b/P3D/Content/Data/maps/whirlislands/lugia.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/sc1.dat b/P3D/Content/Data/maps/whirlislands/sc1.dat
index c6d19dd62..270971666 100644
Binary files a/P3D/Content/Data/maps/whirlislands/sc1.dat and b/P3D/Content/Data/maps/whirlislands/sc1.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/sc2.dat b/P3D/Content/Data/maps/whirlislands/sc2.dat
index 6a751fcf3..5ef837161 100644
Binary files a/P3D/Content/Data/maps/whirlislands/sc2.dat and b/P3D/Content/Data/maps/whirlislands/sc2.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/sc3.dat b/P3D/Content/Data/maps/whirlislands/sc3.dat
index 48e221a0a..8d5ce1a50 100644
Binary files a/P3D/Content/Data/maps/whirlislands/sc3.dat and b/P3D/Content/Data/maps/whirlislands/sc3.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/sc4.dat b/P3D/Content/Data/maps/whirlislands/sc4.dat
index c6a165e87..90e982aab 100644
Binary files a/P3D/Content/Data/maps/whirlislands/sc4.dat and b/P3D/Content/Data/maps/whirlislands/sc4.dat differ
diff --git a/P3D/Content/Data/maps/whirlislands/wfall.dat b/P3D/Content/Data/maps/whirlislands/wfall.dat
index e73587fb3..123c5b21e 100644
Binary files a/P3D/Content/Data/maps/whirlislands/wfall.dat and b/P3D/Content/Data/maps/whirlislands/wfall.dat differ
diff --git a/P3D/Content/Data/maps/yourroom.dat b/P3D/Content/Data/maps/yourroom.dat
index 3226c0f4f..a23102161 100644
Binary files a/P3D/Content/Data/maps/yourroom.dat and b/P3D/Content/Data/maps/yourroom.dat differ
diff --git a/P3D/Content/SkyDomeResource/AuroraBoralis.png b/P3D/Content/SkyDomeResource/AuroraBoralis.png
deleted file mode 100644
index 453da943f..000000000
Binary files a/P3D/Content/SkyDomeResource/AuroraBoralis.png and /dev/null differ
diff --git a/P3D/Content/SkyDomeResource/AuroraBorealis.png b/P3D/Content/SkyDomeResource/AuroraBorealis.png
new file mode 100644
index 000000000..0cc961146
Binary files /dev/null and b/P3D/Content/SkyDomeResource/AuroraBorealis.png differ
diff --git a/P3D/Content/SkyDomeResource/Cave.png b/P3D/Content/SkyDomeResource/Cave.png
index 5afde2df9..e788d5cf7 100644
Binary files a/P3D/Content/SkyDomeResource/Cave.png and b/P3D/Content/SkyDomeResource/Cave.png differ
diff --git a/P3D/Content/SkyDomeResource/Clouds.png b/P3D/Content/SkyDomeResource/Clouds.png
deleted file mode 100644
index 600e34a9a..000000000
Binary files a/P3D/Content/SkyDomeResource/Clouds.png and /dev/null differ
diff --git a/P3D/Content/SkyDomeResource/Clouds1.png b/P3D/Content/SkyDomeResource/Clouds1.png
deleted file mode 100644
index a1b87da33..000000000
Binary files a/P3D/Content/SkyDomeResource/Clouds1.png and /dev/null differ
diff --git a/P3D/Content/SkyDomeResource/CloudsWeather.png b/P3D/Content/SkyDomeResource/CloudsWeather.png
deleted file mode 100644
index 981442c71..000000000
Binary files a/P3D/Content/SkyDomeResource/CloudsWeather.png and /dev/null differ
diff --git a/P3D/Content/SkyDomeResource/Clouds_Day.png b/P3D/Content/SkyDomeResource/Clouds_Day.png
new file mode 100644
index 000000000..95549bf8a
Binary files /dev/null and b/P3D/Content/SkyDomeResource/Clouds_Day.png differ
diff --git a/P3D/Content/SkyDomeResource/Clouds_Evening.png b/P3D/Content/SkyDomeResource/Clouds_Evening.png
new file mode 100644
index 000000000..0f6825f02
Binary files /dev/null and b/P3D/Content/SkyDomeResource/Clouds_Evening.png differ
diff --git a/P3D/Content/SkyDomeResource/Clouds_Morning.png b/P3D/Content/SkyDomeResource/Clouds_Morning.png
new file mode 100644
index 000000000..a8f1070aa
Binary files /dev/null and b/P3D/Content/SkyDomeResource/Clouds_Morning.png differ
diff --git a/P3D/Content/SkyDomeResource/Clouds_Night.png b/P3D/Content/SkyDomeResource/Clouds_Night.png
new file mode 100644
index 000000000..4d759f8d7
Binary files /dev/null and b/P3D/Content/SkyDomeResource/Clouds_Night.png differ
diff --git a/P3D/Content/SkyDomeResource/Clouds_Weather.png b/P3D/Content/SkyDomeResource/Clouds_Weather.png
new file mode 100644
index 000000000..f16cee6d6
Binary files /dev/null and b/P3D/Content/SkyDomeResource/Clouds_Weather.png differ
diff --git a/P3D/Content/SkyDomeResource/Dark.png b/P3D/Content/SkyDomeResource/Dark.png
index fbc20ccf1..63b6b6561 100644
Binary files a/P3D/Content/SkyDomeResource/Dark.png and b/P3D/Content/SkyDomeResource/Dark.png differ
diff --git a/P3D/Content/SkyDomeResource/Forest.png b/P3D/Content/SkyDomeResource/Forest.png
index 49e767e5c..51d28e257 100644
Binary files a/P3D/Content/SkyDomeResource/Forest.png and b/P3D/Content/SkyDomeResource/Forest.png differ
diff --git a/P3D/Content/SkyDomeResource/Sky_Day.png b/P3D/Content/SkyDomeResource/Sky_Day.png
new file mode 100644
index 000000000..07581ebde
Binary files /dev/null and b/P3D/Content/SkyDomeResource/Sky_Day.png differ
diff --git a/P3D/Content/SkyDomeResource/Sky_Evening.png b/P3D/Content/SkyDomeResource/Sky_Evening.png
new file mode 100644
index 000000000..688086304
Binary files /dev/null and b/P3D/Content/SkyDomeResource/Sky_Evening.png differ
diff --git a/P3D/Content/SkyDomeResource/Sky_Morning.png b/P3D/Content/SkyDomeResource/Sky_Morning.png
new file mode 100644
index 000000000..38c9574ba
Binary files /dev/null and b/P3D/Content/SkyDomeResource/Sky_Morning.png differ
diff --git a/P3D/Content/SkyDomeResource/Sky_Night.png b/P3D/Content/SkyDomeResource/Sky_Night.png
new file mode 100644
index 000000000..24e7653c4
Binary files /dev/null and b/P3D/Content/SkyDomeResource/Sky_Night.png differ
diff --git a/P3D/Content/SkyDomeResource/Stars.png b/P3D/Content/SkyDomeResource/Stars.png
index 9c46a1601..9325ade5c 100644
Binary files a/P3D/Content/SkyDomeResource/Stars.png and b/P3D/Content/SkyDomeResource/Stars.png differ
diff --git a/P3D/Content/SkyDomeResource/SunRise.png b/P3D/Content/SkyDomeResource/SunRise.png
deleted file mode 100644
index 97f0cf466..000000000
Binary files a/P3D/Content/SkyDomeResource/SunRise.png and /dev/null differ
diff --git a/P3D/Content/SkyDomeResource/SunSet.png b/P3D/Content/SkyDomeResource/SunSet.png
deleted file mode 100644
index 191ae7551..000000000
Binary files a/P3D/Content/SkyDomeResource/SunSet.png and /dev/null differ
diff --git a/P3D/Content/SkyDomeResource/Underwater.png b/P3D/Content/SkyDomeResource/Underwater.png
index 2348d5004..6cde3d35a 100644
Binary files a/P3D/Content/SkyDomeResource/Underwater.png and b/P3D/Content/SkyDomeResource/Underwater.png differ
diff --git a/P3D/Content/SkyDomeResource/UnderwaterGround.png b/P3D/Content/SkyDomeResource/UnderwaterGround.png
index d43f3dfdb..e4fbeacc4 100644
Binary files a/P3D/Content/SkyDomeResource/UnderwaterGround.png and b/P3D/Content/SkyDomeResource/UnderwaterGround.png differ
diff --git a/P3D/Content/SkyDomeResource/daycycle.png b/P3D/Content/SkyDomeResource/daycycle.png
index c8cc29219..d413f893c 100644
Binary files a/P3D/Content/SkyDomeResource/daycycle.png and b/P3D/Content/SkyDomeResource/daycycle.png differ
diff --git a/P3D/Content/SkyDomeResource/moon.png b/P3D/Content/SkyDomeResource/moon.png
index b3834a10c..7cf1ece9d 100644
Binary files a/P3D/Content/SkyDomeResource/moon.png and b/P3D/Content/SkyDomeResource/moon.png differ
diff --git a/P3D/Content/SkyDomeResource/sun.png b/P3D/Content/SkyDomeResource/sun.png
index 5398ea9ac..825e3e553 100644
Binary files a/P3D/Content/SkyDomeResource/sun.png and b/P3D/Content/SkyDomeResource/sun.png differ
diff --git a/P3D/Core/GameOptions.vb b/P3D/Core/GameOptions.vb
index 05b31e57b..a64c29a3d 100644
--- a/P3D/Core/GameOptions.vb
+++ b/P3D/Core/GameOptions.vb
@@ -81,7 +81,7 @@
                         End If
                     Case "viewbobbing"
                         Me.ViewBobbing = CBool(value)
-                    Case "lightningenabled"
+                    Case "lightingenabled", "lightningenabled"
                         Me.LightingEnabled = CBool(value)
                     Case "gamepadenabled"
                         Me.GamePadEnabled = CBool(value)
@@ -145,7 +145,7 @@
                 "Language|" & Localization.LanguageSuffix & Environment.NewLine &
                 "ViewBobbing|" & Me.ViewBobbing.ToNumberString() & Environment.NewLine &
                 "GamePadEnabled|" & Me.GamePadEnabled.ToNumberString() & Environment.NewLine &
-                "LightningEnabled|" & Me.LightingEnabled.ToNumberString() & Environment.NewLine &
+                "LightingEnabled|" & Me.LightingEnabled.ToNumberString() & Environment.NewLine &
                 "StartedOfflineGame|" & Me.StartedOfflineGame.ToNumberString() & Environment.NewLine &
                 "PreferMultiSampling|" & Core.GraphicsManager.PreferMultiSampling.ToNumberString() & Environment.NewLine &
                 "ContentPacks|" & ContentPackString & Environment.NewLine &
@@ -176,7 +176,7 @@
             "Language|en" & Environment.NewLine &
             "ViewBobbing|1" & Environment.NewLine &
             "GamePadEnabled|1" & Environment.NewLine &
-            "LightningEnabled|1" & Environment.NewLine &
+            "LightingEnabled|1" & Environment.NewLine &
             "StartedOfflineGame|0" & Environment.NewLine &
             "PreferMultiSampling|1" & Environment.NewLine &
             "ContentPacks|" & Environment.NewLine &
diff --git a/P3D/Input/KeyBindings.vb b/P3D/Input/KeyBindings.vb
index 413b2d2f9..dc75e64e7 100644
--- a/P3D/Input/KeyBindings.vb
+++ b/P3D/Input/KeyBindings.vb
@@ -94,7 +94,7 @@ Public Class KeyBindings
                             EscapeKey = binding
                         Case "onlinestatus"
                             OnlineStatusKey = binding
-                        Case "lightning"
+                        Case "lighting", "lightning"
                             LightKey = binding
                     End Select
                 End If
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index b31a383b7..1eeee953a 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -14056,6 +14056,36 @@
     <Content Include="Content\Pokemon\Sprites\Zygarde_Dog.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\SkyDomeResource\AuroraBorealis.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\SkyDomeResource\Clouds_Day.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\SkyDomeResource\Clouds_Evening.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\SkyDomeResource\Clouds_Morning.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\SkyDomeResource\Clouds_Night.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\SkyDomeResource\Clouds_Weather.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\SkyDomeResource\Sky_Day.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\SkyDomeResource\Sky_Evening.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\SkyDomeResource\Sky_Morning.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\SkyDomeResource\Sky_Night.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Songs\alph.ogg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -23764,21 +23794,9 @@
     <Content Include="Content\Pokemon\Sprites\zygarde.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\SkyDomeResource\AuroraBoralis.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\SkyDomeResource\Cave.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\SkyDomeResource\Clouds.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\SkyDomeResource\Clouds1.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\SkyDomeResource\CloudsWeather.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\SkyDomeResource\Dark.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -23797,12 +23815,6 @@
     <Content Include="Content\SkyDomeResource\sun.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\SkyDomeResource\SunRise.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\SkyDomeResource\SunSet.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\SkyDomeResource\Underwater.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoLevel.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoLevel.vb
index fcde13163..b7cc9292d 100644
--- a/P3D/World/ActionScript/V2/ScriptCommands/DoLevel.vb
+++ b/P3D/World/ActionScript/V2/ScriptCommands/DoLevel.vb
@@ -68,6 +68,10 @@
                     IsReady = True
                 Case "setsafari"
                     Screen.Level.IsSafariZone = CBool(argument)
+                    IsReady = True
+                Case "setdaytime"
+                    Screen.Level.DayTime = CInt(argument)
+                    IsReady = True
             End Select
         End Sub
 
diff --git a/P3D/World/ActionScript/V2/ScriptConstructs/DoLevel.vb b/P3D/World/ActionScript/V2/ScriptConstructs/DoLevel.vb
index cb917b8ec..53b660f93 100644
--- a/P3D/World/ActionScript/V2/ScriptConstructs/DoLevel.vb
+++ b/P3D/World/ActionScript/V2/ScriptConstructs/DoLevel.vb
@@ -23,6 +23,8 @@
                 Case "musicloop"
                     Dim musicloop As String = System.IO.Path.GetFileNameWithoutExtension(Screen.Level.MusicLoop)
                     Return musicloop
+                Case "daytime"
+                    Return Screen.Level.DayTime
             End Select
 
             Return DEFAULTNULL
diff --git a/P3D/World/ActionScript/V2/ScriptLibrary.vb b/P3D/World/ActionScript/V2/ScriptLibrary.vb
index 17aa89654..27ff7f9ce 100644
--- a/P3D/World/ActionScript/V2/ScriptLibrary.vb
+++ b/P3D/World/ActionScript/V2/ScriptLibrary.vb
@@ -204,12 +204,14 @@ Namespace ScriptVersion2
             r(New ScriptCommand("level", "waitforsave", "Makes the level idle until the current saving of an GameJolt save is done."))
             r(New ScriptCommand("level", "reload", "Reloads the current map."))
             r(New ScriptCommand("level", "setsafari", {New ScriptArgument("safari", ScriptArgument.ArgumentTypes.Bool)}.ToList(), "Sets if the current map is a Safari Zone (influences battle style)."))
+            r(New ScriptCommand("level", "setdaytime", {New ScriptArgument("daytime", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Sets the daytime of the current map."))
             ' Constructs:
             r(New ScriptCommand("level", "mapfile", "str", "Returns the mapfile of the currently loaded map.", ",", True))
             r(New ScriptCommand("level", "levelfile", "str", "Returns the mapfile of the currently loaded map.", ",", True))
             r(New ScriptCommand("level", "filename", "str", "Returns only the name of the current map file, without path and extension.", ",", True))
             r(New ScriptCommand("level", "riding", "bool", "Returns if the player is Riding a Pokémon right now.", ",", True))
             r(New ScriptCommand("level", "surfing", "bool", "Returns if the player is Suring on a Pokémon right now.", ",", True))
+            r(New ScriptCommand("level", "daytime", "int", "Returns the daytime of the current map.", ",", True))
         End Sub
 
         Private Shared Sub DoEntity()
diff --git a/P3D/World/Level.vb b/P3D/World/Level.vb
index b5c55cd2b..75163c553 100644
--- a/P3D/World/Level.vb
+++ b/P3D/World/Level.vb
@@ -39,6 +39,7 @@ Public Class Level
     Private _canFly As Boolean = False
     Private _rideType As Integer = 0
     Private _weatherType As Integer = 0
+    Public _DayTime As World.DayTime = World.GetTime
     Private _environmentType As Integer = 0
     Private _wildPokemonGrass As Boolean = True
     Private _wildPokemonFloor As Boolean = False
@@ -343,6 +344,41 @@ Public Class Level
         End Set
     End Property
 
+    ''' <summary>
+    ''' The DayTime on this map.
+    ''' </summary>
+    ''' <remarks>For the day time, look at the DayTime enumeration in World.vb</remarks>
+    Public Property DayTime As Integer
+        Get
+            Select Case Me._DayTime
+                Case World.DayTime.Day
+                    Return 1
+                Case World.DayTime.Night
+                    Return 2
+                Case World.DayTime.Morning
+                    Return 3
+                Case World.DayTime.Evening
+                    Return 4
+                Case Else
+                    Return World.GetTime
+            End Select
+        End Get
+        Set(value As Integer)
+            Select Case value
+                Case 1
+                    Me._DayTime = World.DayTime.Day
+                Case 2
+                    Me._DayTime = World.DayTime.Night
+                Case 3
+                    Me._DayTime = World.DayTime.Morning
+                Case 4
+                    Me._DayTime = World.DayTime.Evening
+                Case Else
+                    Me._DayTime = World.GetTime
+            End Select
+        End Set
+    End Property
+
     ''' <summary>
     ''' The environment type for this map.
     ''' </summary>
diff --git a/P3D/World/LevelLoader.vb b/P3D/World/LevelLoader.vb
index ad78f1bea..bdc3435e5 100644
--- a/P3D/World/LevelLoader.vb
+++ b/P3D/World/LevelLoader.vb
@@ -986,8 +986,8 @@
             Screen.Level.RideType = 0
         End If
 
-        If TagExists(Tags, "EnviromentType") = True Then
-            Screen.Level.EnvironmentType = CInt(GetTag(Tags, "EnviromentType"))
+        If TagExists(Tags, "EnvironmentType") = True Then
+            Screen.Level.EnvironmentType = CInt(GetTag(Tags, "EnvironmentType"))
         Else
             Screen.Level.EnvironmentType = 0
         End If
@@ -998,16 +998,14 @@
             Screen.Level.WeatherType = 0
         End If
 
-        ' It's not my fault, I swear. The keyboard was slippy, I was partly sick, and there was fog on the road and I couldn't see.
-        Dim lightningExists As Boolean = TagExists(Tags, "Lightning")
-        Dim lightingExists As Boolean = TagExists(Tags, "Lighting")
+        If TagExists(Tags, "DayTime") = True Then
+            Screen.Level.DayTime = CInt(GetTag(Tags, "DayTime"))
+        Else
+            Screen.Level.DayTime = 0
+        End If
 
-        If lightningExists = True And lightingExists = True Then
+        If TagExists(Tags, "Lighting") = True Then
             Screen.Level.LightingType = CInt(GetTag(Tags, "Lighting"))
-        ElseIf lightingExists = True Then
-            Screen.Level.LightingType = CInt(GetTag(Tags, "Lighting"))
-        ElseIf lightningExists = True Then
-            Screen.Level.LightingType = CInt(GetTag(Tags, "Lightning"))
         Else
             Screen.Level.LightingType = 1
         End If
@@ -1018,6 +1016,24 @@
             Screen.Level.IsDark = False
         End If
 
+        If Screen.Level.DayTime = World.DayTime.Night Then
+            If World.IsAurora = False Then
+                Dim chance = Random.Next(0, 250)
+                If chance = 0 Then
+                    World.IsAurora = True
+                End If
+            End If
+        Else
+            World.IsAurora = False
+        End If
+
+        If TagExists(Tags, "IsAurora") = True Then
+            World.IsAurora = CBool(GetTag(Tags, "IsAurora"))
+        Else
+            World.IsAurora = False
+        End If
+
+
         If TagExists(Tags, "Terrain") = True Then
             Screen.Level.Terrain.TerrainType = Terrain.FromString(CStr(GetTag(Tags, "Terrain")))
         Else
diff --git a/P3D/World/Lighting.vb b/P3D/World/Lighting.vb
index 71ff233e5..951024204 100644
--- a/P3D/World/Lighting.vb
+++ b/P3D/World/Lighting.vb
@@ -48,15 +48,15 @@ Public Class Lighting
                 Case 0 ' Night
                     refEffect.AmbientLightColor = New Vector3(0.8F)
 
-                    refEffect.DirectionalLight0.DiffuseColor = New Vector3(0.4F, 0.4F, 0.6F)
+                    refEffect.DirectionalLight0.DiffuseColor = New Vector3(-0.4F, -0.4F, -0.6F)
                     refEffect.DirectionalLight0.Direction = Vector3.Normalize(New Vector3(-1.0F, 0.0F, 1.0F))
                     refEffect.DirectionalLight0.SpecularColor = New Vector3(0.0F)
                     refEffect.DirectionalLight0.Enabled = True
                 Case 1 ' Morning
-                    refEffect.AmbientLightColor = New Vector3(0.7F)
+                    refEffect.AmbientLightColor = New Vector3(0.8F)
 
-                    refEffect.DirectionalLight0.DiffuseColor = Color.Orange.ToVector3()
-                    refEffect.DirectionalLight0.Direction = Vector3.Normalize(New Vector3(1.0F, -1.0F, 1.0F))
+                    refEffect.DirectionalLight0.DiffuseColor = New Vector3(-0.45F)
+                    refEffect.DirectionalLight0.Direction = Vector3.Normalize(New Vector3(1.0F, -1.0F, -1.0F))
                     refEffect.DirectionalLight0.SpecularColor = New Vector3(0.0F)
                     refEffect.DirectionalLight0.Enabled = True
                 Case 2 ' Day
@@ -67,10 +67,10 @@ Public Class Lighting
                     refEffect.DirectionalLight0.SpecularColor = New Vector3(0.0F)
                     refEffect.DirectionalLight0.Enabled = True
                 Case 3 ' Evening
-                    refEffect.AmbientLightColor = New Vector3(1.0F)
+                    refEffect.AmbientLightColor = New Vector3(0.8F)
 
                     refEffect.DirectionalLight0.DiffuseColor = New Vector3(-0.45F)
-                    refEffect.DirectionalLight0.Direction = Vector3.Normalize(New Vector3(1.0F, 0.0F, 1.0F))
+                    refEffect.DirectionalLight0.Direction = Vector3.Normalize(New Vector3(-1.0F, 0.0F, 1.0F))
                     refEffect.DirectionalLight0.SpecularColor = New Vector3(0.0F)
                     refEffect.DirectionalLight0.Enabled = True
                 Case Else  'Disable lighting on the effect
@@ -99,6 +99,18 @@ Public Class Lighting
         If Screen.Level.LightingType > 1 And Screen.Level.LightingType < 6 Then ' If the level's lighting type is 2, 3, 4 or 5, set to the respective LightType (set time of day).
             LightType = Screen.Level.LightingType - 2
         End If
+        If Screen.Level.EnvironmentType = World.EnvironmentTypes.Outside Then
+            Select Case Screen.Level.DayTime
+                Case 1
+                    LightType = 2
+                Case 2
+                    LightType = 0
+                Case 3
+                    LightType = 1
+                Case 4
+                    LightType = 3
+            End Select
+        End If
 
         Return LightType
     End Function
diff --git a/P3D/World/SkyDome.vb b/P3D/World/SkyDome.vb
index 644e7b179..50f5a879d 100644
--- a/P3D/World/SkyDome.vb
+++ b/P3D/World/SkyDome.vb
@@ -13,8 +13,8 @@
     Public Sub New()
         SkydomeModel = Core.Content.Load(Of Model)("SkyDomeResource\SkyDome")
 
-        TextureUp = TextureManager.GetTexture("SkyDomeResource\Clouds")
-        TextureDown = TextureManager.GetTexture("SkyDomeResource\Clouds")
+        TextureUp = TextureManager.GetTexture("SkyDomeResource\Sky_Day")
+        TextureDown = TextureManager.GetTexture("SkyDomeResource\Stars")
         TextureSun = TextureManager.GetTexture("SkyDomeResource\sun")
         TextureMoon = TextureManager.GetTexture("SkyDomeResource\moon")
 
@@ -62,18 +62,22 @@
         If Core.GameOptions.GraphicStyle = 1 Then
             If Screen.Level.World.EnvironmentType = World.EnvironmentTypes.Outside Then
                 If World.GetWeatherFromWeatherType(Screen.Level.WeatherType) <> World.Weathers.Fog Then ' Don't render the sky if the weather is set to Fog.
-                    RenderHalf(FOV, MathHelper.PiOver2, CSng(GetUniversePitch() + Math.PI), True, TextureSun, 100, Me.GetSunAlpha()) ' Draw the Sun.
-                    RenderHalf(FOV, MathHelper.PiOver2, CSng(GetUniversePitch()), True, TextureMoon, 100, GetStarsAlpha()) ' Draw the Moon.
-                    RenderHalf(FOV, MathHelper.PiOver2, CSng(GetUniversePitch()), True, TextureDown, 50, GetStarsAlpha()) ' Draw the first half of the stars.
-                    RenderHalf(FOV, MathHelper.PiOver2, CSng(GetUniversePitch()), False, TextureDown, 50, GetStarsAlpha()) ' Draw the second half of the stars.
-                    RenderHalf(FOV, MathHelper.TwoPi - Yaw, 0.0F, True, GetCloudsTexture(), 15, GetCloudAlpha()) ' Draw the back layer of the clouds.
-                    RenderHalf(FOV, Yaw, 0.0F, True, TextureUp, 10, GetCloudAlpha()) ' Draw the front layer of the clouds.
+                    RenderHalf(FOV, Yaw, 0.0F, True, GetSkyTexture(), 16, 1.0F) ' Draw the sky
+                    RenderHalf(FOV, MathHelper.TwoPi, 0.0F, True, TextureDown, 14, GetStarsAlpha()) ' Draw the stars.
+                    RenderHalf(FOV, MathHelper.TwoPi, 0.0F, True, TextureSun, 12, GetSunAlpha()) ' Draw the Sun.
+                    RenderHalf(FOV, MathHelper.TwoPi, 0.0F, True, TextureMoon, 12, GetMoonAlpha()) ' Draw the Moon.
+                    RenderHalf(FOV, MathHelper.TwoPi - Yaw, 0.0F, True, GetCloudsTexture(), 8, GetCloudAlpha) ' Draw the clouds.
                 End If
             Else
-                RenderHalf(FOV, Yaw, 0.0F, True, TextureUp, 8.0F, 1.0F)
-
+                If Screen.Level.World.EnvironmentType = World.EnvironmentTypes.Cave Or Screen.Level.World.EnvironmentType = World.EnvironmentTypes.Forest Then
+                    RenderHalf(FOV, MathHelper.TwoPi, 0.0F, True, TextureUp, 16, 1.0F) ' Draw the sky
+                Else
+                    RenderHalf(FOV, Yaw, 0.0F, True, TextureUp, 16, 1.0F) ' Draw the sky
+                    RenderHalf(FOV, MathHelper.TwoPi, 0.0F, True, TextureSun, 12, GetSunAlpha()) ' Draw the Sun.
+                    RenderHalf(FOV, MathHelper.TwoPi - Yaw, 0.0F, True, TextureManager.GetTexture("SkyDomeResource\Clouds_Day"), 8, GetCloudAlpha()) ' Draw the clouds.
+                End If
                 If Not TextureDown Is Nothing Then
-                    RenderHalf(FOV, Yaw, 0.0F, False, TextureDown, 8.0F, 1.0F)
+                    RenderHalf(FOV, Yaw, 0.0F, False, TextureDown, 16, 1.0F)
                 End If
             End If
         End If
@@ -90,7 +94,7 @@
 
         For Each ModelMesh As ModelMesh In SkydomeModel.Meshes
             For Each BasicEffect As BasicEffect In ModelMesh.Effects
-                BasicEffect.World = Matrix.CreateScale(scale) * Matrix.CreateTranslation(New Vector3(Screen.Camera.Position.X, -5, Screen.Camera.Position.Z)) * Matrix.CreateFromYawPitchRoll(useYaw, usePitch, Roll)
+                BasicEffect.World = Matrix.CreateScale(scale) * Matrix.CreateTranslation(New Vector3(Screen.Camera.Position.X, -2, Screen.Camera.Position.Z)) * Matrix.CreateFromYawPitchRoll(useYaw, usePitch, Roll)
 
                 BasicEffect.View = Screen.Camera.View
                 BasicEffect.Projection = Matrix.CreatePerspectiveFieldOfView(MathHelper.ToRadians(FOV), Core.GraphicsDevice.Viewport.AspectRatio, 0.01, 10000)
@@ -139,7 +143,19 @@
         If shader = True Then
             Return LastEntityColor
         Else
-            Return LastSkyColor
+            If World.IsAurora = True Then
+                Return New Color(64, 101, 164)
+            End If
+            Select Case Screen.Level.DayTime
+                Case 1
+                    Return New Color(48, 200, 248)
+                Case 2
+                    Return New Color(40, 88, 136)
+                Case 3
+                    Return New Color(168, 224, 248)
+                Case 4
+                    Return New Color(192, 152, 184)
+            End Select
         End If
     End Function
 
@@ -161,63 +177,125 @@
     End Sub
 
     Private Function GetCloudAlpha() As Single
-        Select Case Screen.Level.World.CurrentMapWeather
-            Case World.Weathers.Rain, World.Weathers.Blizzard, World.Weathers.Thunderstorm
-                Return 0.6F
-            Case World.Weathers.Snow, World.Weathers.Ash
-                Return 0.4F
-            Case World.Weathers.Clear
-                Return 0.1F
-        End Select
-        Return 0.0F
+        If Screen.Level.World.EnvironmentType = World.EnvironmentTypes.Outside And World.IsAurora = False Then
+            Return 1.0F
+        Else
+            Return 0.0F
+        End If
+    End Function
+
+    Private Function GetMoonAlpha() As Single
+        If Screen.Level.World.EnvironmentType = World.EnvironmentTypes.Outside And World.IsAurora = False Then
+            Select Case Screen.Level.DayTime
+                Case 1
+                    Return 0.0F
+                Case 2
+                    Return 1.0F
+                Case 3
+                    Return 0.0F
+                Case 4
+                    Return 1.0F
+                Case Else
+                    Return 0.0F
+            End Select
+        Else
+            Return 0.0F
+        End If
     End Function
 
     Private Function GetStarsAlpha() As Single
-        Dim progress As Integer = GetTimeValue()
-
-        If progress < 360 Or progress > 1080 Then
-            Dim dP As Integer = progress
-            If dP < 360 Then
-                dP = 720 - dP * 2
-            ElseIf dP > 1080 Then
-                dP = 720 - (1440 - dP) * 2
-            End If
-
-            Dim alpha As Single = CDec(dP / 720) * 0.7F
-            Return alpha
+        If Screen.Level.World.EnvironmentType = World.EnvironmentTypes.Outside And World.IsAurora = False Then
+            Select Case Screen.Level.DayTime
+                Case 1
+                    Return 0.0F
+                Case 2
+                    Return 1.0F
+                Case 3
+                    Return 0.0F
+                Case 4
+                    Return 0.0F
+                Case Else
+                    Return 0.0F
+            End Select
         Else
             Return 0.0F
         End If
     End Function
 
     Private Function GetSunAlpha() As Single
-        Dim progress As Integer = GetTimeValue()
-
-        If progress >= 1080 And progress < 1140 Then
-            ' Between 6:00:00 PM and 7:00:00 PM, the Sun will fade away with 60 stages:
-            Dim i As Single = progress - 1080
-            Dim percent As Single = i / 60 * 100
-
-            Return 1.0F - percent / 100.0F
-        ElseIf progress >= 300 And progress < 360 Then
-            ' Between 5:00:00 AM and 6:00:00 Am, the Sun will fade in with 60 stages:
-            Dim i As Single = progress - 300
-            Dim percent As Single = i / 60 * 100
-
-            Return percent / 100.0F
-        ElseIf progress >= 1140 Or progress < 300 Then
-            ' Between 7:00:00 PM and 5:00:00 AM, the Sun will be invisible:
-            Return 0.0F
+        If Screen.Level.World.EnvironmentType = World.EnvironmentTypes.Outside And World.IsAurora = False Then
+            Select Case Screen.Level.DayTime
+                Case 1
+                    Return 1.0F
+                Case 2
+                    Return 0.0F
+                Case 3
+                    Return 1.0F
+                Case 4
+                    Return 0.0F
+                Case Else
+                    Return 0.0F
+            End Select
         Else
-            ' Between 6:00:00 AM and 6:00:00 PM, the Sun will be fully visible:
-            Return 1.0F
+            Return 0.0F
         End If
     End Function
 
     Private Function GetCloudsTexture() As Texture2D
+        Dim time As World.DayTime = World.GetTime
+
         Select Case Screen.Level.World.CurrentMapWeather
             Case World.Weathers.Rain, World.Weathers.Blizzard, World.Weathers.Thunderstorm, World.Weathers.Snow
-                Return TextureManager.GetTexture("SkyDomeResource\CloudsWeather")
+                Return TextureManager.GetTexture("SkyDomeResource\Clouds_Weather")
+            Case World.Weathers.Clear
+                Select Case Screen.Level.DayTime
+                    Case 1
+                        Return TextureManager.GetTexture("SkyDomeResource\Clouds_Day")
+                    Case 2
+                        Return TextureManager.GetTexture("SkyDomeResource\Clouds_Night")
+                    Case 3
+                        Return TextureManager.GetTexture("SkyDomeResource\Clouds_Morning")
+                    Case 4
+                        Return TextureManager.GetTexture("SkyDomeResource\Clouds_Evening")
+                End Select
+                If time = World.DayTime.Morning Then
+                    Return TextureManager.GetTexture("SkyDomeResource\Clouds_Morning")
+                ElseIf time = World.DayTime.Day Then
+                    Return TextureManager.GetTexture("SkyDomeResource\Clouds_Day")
+                ElseIf time = World.DayTime.Evening Then
+                    Return TextureManager.GetTexture("SkyDomeResource\Clouds_Evening")
+                Else
+                    Return TextureManager.GetTexture("SkyDomeResource\Clouds_Night")
+                End If
+        End Select
+        Return Nothing
+    End Function
+    Private Function GetSkyTexture() As Texture2D
+        If World.IsAurora Then
+            Return TextureManager.GetTexture("SkyDomeResource\AuroraBorealis")
+        End If
+        Select Case Screen.Level.DayTime
+            Case 1
+                Return TextureManager.GetTexture("SkyDomeResource\Sky_Day")
+            Case 2
+                Return TextureManager.GetTexture("SkyDomeResource\Sky_Night")
+            Case 3
+                Return TextureManager.GetTexture("SkyDomeResource\Sky_Morning")
+            Case 4
+                Return TextureManager.GetTexture("SkyDomeResource\Sky_Evening")
+        End Select
+        Dim time As World.DayTime = World.GetTime
+        Select Case Screen.Level.World.CurrentMapWeather
+            Case World.Weathers.Clear
+                If time = World.DayTime.Morning Then
+                    Return TextureManager.GetTexture("SkyDomeResource\Sky_Morning")
+                ElseIf time = World.DayTime.Day Then
+                    Return TextureManager.GetTexture("SkyDomeResource\Sky_Day")
+                ElseIf time = World.DayTime.Evening Then
+                    Return TextureManager.GetTexture("SkyDomeResource\Sky_Evening")
+                Else
+                    Return TextureManager.GetTexture("SkyDomeResource\Sky_Night")
+                End If
         End Select
         Return TextureUp
     End Function
diff --git a/P3D/World/World.vb b/P3D/World/World.vb
index 588358ae7..87932c0d2 100644
--- a/P3D/World/World.vb
+++ b/P3D/World/World.vb
@@ -418,7 +418,7 @@ endsub:
     Public CurrentMapWeather As Weathers = Weathers.Clear
 
     Public EnvironmentType As EnvironmentTypes = EnvironmentTypes.Outside
-    Public UseLightning As Boolean = False
+    Public UseLighting As Boolean = False
 
     Public Sub New(ByVal EnvironmentType As Integer, ByVal WeatherType As Integer)
         Initialize(EnvironmentType, WeatherType)
@@ -498,31 +498,31 @@ endsub:
         Select Case EnvironmentType
             Case 0 ' Overworld
                 Me.EnvironmentType = EnvironmentTypes.Outside
-                Me.UseLightning = True
+                Me.UseLighting = True
             Case 1 ' Permanent Day
                 Me.EnvironmentType = EnvironmentTypes.Inside
-                Me.UseLightning = False
+                Me.UseLighting = False
             Case 2 ' Cave
                 Me.EnvironmentType = EnvironmentTypes.Cave
                 If WeatherType = 0 Then
                     Me.CurrentMapWeather = Weathers.Clear
                 End If
-                Me.UseLightning = False
+                Me.UseLighting = False
             Case 3 ' Permanent Night
                 Me.EnvironmentType = EnvironmentTypes.Dark
                 If WeatherType = 0 Then
                     Me.CurrentMapWeather = Weathers.Clear
                 End If
-                Me.UseLightning = False
+                Me.UseLighting = False
             Case 4 ' Underwater
                 Me.EnvironmentType = EnvironmentTypes.Underwater
                 If WeatherType = 0 Then
                     Me.CurrentMapWeather = Weathers.Underwater
                 End If
-                Me.UseLightning = True
+                Me.UseLighting = True
             Case 5 ' Forest
                 Me.EnvironmentType = EnvironmentTypes.Forest
-                Me.UseLightning = True
+                Me.UseLighting = True
         End Select
 
         SetWeatherLevelColor()
@@ -586,16 +586,11 @@ endsub:
             Case EnvironmentTypes.Outside
                 Core.BackgroundColor = GetWeatherBackgroundColor(SkyDome.GetDaytimeColor(False))
                 Screen.Effect.FogColor = Core.BackgroundColor.ToVector3()
-                If IsAurora = True Then
-                    Screen.SkyDome.TextureUp = TextureManager.GetTexture("SkyDomeResource\AuroraBoralis")
-                Else
-                    Screen.SkyDome.TextureUp = TextureManager.GetTexture("SkyDomeResource\Clouds1")
-                End If
                 Screen.SkyDome.TextureDown = TextureManager.GetTexture("SkyDomeResource\Stars")
             Case EnvironmentTypes.Inside
-                Core.BackgroundColor = GetWeatherBackgroundColor(New Color(173, 216, 255))
+                Core.BackgroundColor = New Color(56, 56, 56)
                 Screen.Effect.FogColor = Core.BackgroundColor.ToVector3()
-                Screen.SkyDome.TextureUp = TextureManager.GetTexture("SkyDomeResource\Clouds")
+                Screen.SkyDome.TextureUp = Nothing
                 Screen.SkyDome.TextureDown = Nothing
             Case EnvironmentTypes.Dark
                 Core.BackgroundColor = GetWeatherBackgroundColor(New Color(29, 29, 50))
@@ -603,17 +598,17 @@ endsub:
                 Screen.SkyDome.TextureUp = TextureManager.GetTexture("SkyDomeResource\Dark")
                 Screen.SkyDome.TextureDown = Nothing
             Case EnvironmentTypes.Cave
-                Core.BackgroundColor = GetWeatherBackgroundColor(New Color(34, 19, 12))
+                Core.BackgroundColor = GetWeatherBackgroundColor(New Color(72, 64, 64))
                 Screen.Effect.FogColor = Core.BackgroundColor.ToVector3()
                 Screen.SkyDome.TextureUp = TextureManager.GetTexture("SkyDomeResource\Cave")
                 Screen.SkyDome.TextureDown = Nothing
             Case EnvironmentTypes.Underwater
-                Core.BackgroundColor = GetWeatherBackgroundColor(New Color(19, 54, 117))
+                Core.BackgroundColor = GetWeatherBackgroundColor(New Color(40, 88, 128))
                 Screen.Effect.FogColor = Core.BackgroundColor.ToVector3()
                 Screen.SkyDome.TextureUp = TextureManager.GetTexture("SkyDomeResource\Underwater")
                 Screen.SkyDome.TextureDown = TextureManager.GetTexture("SkyDomeResource\UnderwaterGround")
             Case EnvironmentTypes.Forest
-                Core.BackgroundColor = GetWeatherBackgroundColor(New Color(30, 66, 21))
+                Core.BackgroundColor = GetWeatherBackgroundColor(New Color(48, 80, 48))
                 Screen.Effect.FogColor = Core.BackgroundColor.ToVector3()
                 Screen.SkyDome.TextureUp = TextureManager.GetTexture("SkyDomeResource\Forest")
                 Screen.SkyDome.TextureDown = Nothing