diff --git a/P3D/Content/Data/Scripts/diamonddive/bigdown.dat b/P3D/Content/Data/Scripts/diamonddive/bigdown.dat
index 2129f8a8c..f1b04e6a2 100644
Binary files a/P3D/Content/Data/Scripts/diamonddive/bigdown.dat and b/P3D/Content/Data/Scripts/diamonddive/bigdown.dat differ
diff --git a/P3D/Content/Data/Scripts/diamonddive/bigup.dat b/P3D/Content/Data/Scripts/diamonddive/bigup.dat
index b92cd1034..ce563198f 100644
Binary files a/P3D/Content/Data/Scripts/diamonddive/bigup.dat and b/P3D/Content/Data/Scripts/diamonddive/bigup.dat differ
diff --git a/P3D/Content/Data/Scripts/diamonddive/normaldown.dat b/P3D/Content/Data/Scripts/diamonddive/normaldown.dat
index f4c01ec65..5b91fb440 100644
Binary files a/P3D/Content/Data/Scripts/diamonddive/normaldown.dat and b/P3D/Content/Data/Scripts/diamonddive/normaldown.dat differ
diff --git a/P3D/Content/Data/Scripts/diamonddive/normalup.dat b/P3D/Content/Data/Scripts/diamonddive/normalup.dat
index 5a6a4b35f..42c319bc0 100644
Binary files a/P3D/Content/Data/Scripts/diamonddive/normalup.dat and b/P3D/Content/Data/Scripts/diamonddive/normalup.dat differ
diff --git a/P3D/Entites/Enviroment/Waterfall.vb b/P3D/Entites/Enviroment/Waterfall.vb
index 128e67a50..f9ebf0f17 100644
--- a/P3D/Entites/Enviroment/Waterfall.vb
+++ b/P3D/Entites/Enviroment/Waterfall.vb
@@ -213,11 +213,13 @@
             End While
 
             s = "version=2" & Environment.NewLine &
+                "@player.preventmovement" & Environment.NewLine &
                 "@player.stopmovement" & Environment.NewLine &
                 "@player.move(2)" & Environment.NewLine &
                 "@player.setmovement(0,-1,0)" & Environment.NewLine &
                 "@player.move(" & Steps & ")" & Environment.NewLine &
                 "@player.resetmovement" & Environment.NewLine &
+                "@player.allowmovement" & Environment.NewLine &
                 ":end"
 
             CType(Core.CurrentScreen, OverworldScreen).ActionScript.StartScript(s, 2)
@@ -261,6 +263,7 @@
                 End If
             End While
             s = "version=2" & Environment.NewLine &
+                "@player.preventmovement" & Environment.NewLine &
                 "@player.stopmovement" & Environment.NewLine &
                 "@pokemon.cry(" & pNumber & ")" & Environment.NewLine &
                 "@sound.play(select)" & Environment.NewLine &
@@ -269,6 +272,7 @@
                 "@player.move(" & Steps & ")" & Environment.NewLine &
                 "@player.resetmovement" & Environment.NewLine &
                 "@player.move(2)" & Environment.NewLine &
+                "@player.allowmovement" & Environment.NewLine &
                 ":end"
 
             PlayerStatistics.Track("Waterfall used", 1)