diff --git a/floor/cobblesto1.arc b/floor/cobblesto1.arc
index a83867f33..c1bf5dbb4 100644
--- a/floor/cobblesto1.arc
+++ b/floor/cobblesto1.arc
@@ -7,4 +7,5 @@ editable 8
 smoothlevel 30
 smoothface cobblesto2.111 empty_S.111
 magicmap yellow
+move_block boat swim
 end
diff --git a/floor/cobblesto2.arc b/floor/cobblesto2.arc
index a5f8415bf..a64646c9c 100644
--- a/floor/cobblesto2.arc
+++ b/floor/cobblesto2.arc
@@ -7,4 +7,5 @@ editable 8
 smoothlevel 30
 smoothface cobblesto1.111 empty_S.111
 magicmap grey
+move_block boat swim
 end
diff --git a/ground/Wood/brush.arc b/ground/Wood/brush.arc
index 08844008a..707f2e5bb 100644
--- a/ground/Wood/brush.arc
+++ b/ground/Wood/brush.arc
@@ -11,4 +11,5 @@ editable 8
 is_floor 1
 smoothlevel 40
 smoothface brush.111 grass_S.111
+move_block boat swim
 end
diff --git a/ground/Wood/cyanbrush.arc b/ground/Wood/cyanbrush.arc
index 4ceb45515..ff0b9835f 100644
--- a/ground/Wood/cyanbrush.arc
+++ b/ground/Wood/cyanbrush.arc
@@ -11,4 +11,5 @@ editable 8
 is_floor 1
 smoothlevel 45
 smoothface cyanbrush.111 cyangrass_S.111
+move_block boat swim
 end
diff --git a/ground/Wood/darkforest.arc b/ground/Wood/darkforest.arc
index baa72e2b0..44ecb38be 100644
--- a/ground/Wood/darkforest.arc
+++ b/ground/Wood/darkforest.arc
@@ -12,4 +12,5 @@ editable 8
 is_floor 1
 smoothface darkforest.111 darkforest_S.111
 smoothlevel 136
+move_block boat swim
 end
diff --git a/ground/Wood/evergreens.arc b/ground/Wood/evergreens.arc
index 190fb7d51..903dddc3c 100644
--- a/ground/Wood/evergreens.arc
+++ b/ground/Wood/evergreens.arc
@@ -11,4 +11,5 @@ editable 8
 is_floor 1
 smoothface evergreens.111 evergreens_S.111
 smoothlevel 135
+move_block boat swim
 end
diff --git a/ground/Wood/evergreens_2.arc b/ground/Wood/evergreens_2.arc
index 6ae620d71..ddd2c3eb7 100644
--- a/ground/Wood/evergreens_2.arc
+++ b/ground/Wood/evergreens_2.arc
@@ -11,4 +11,5 @@ is_wooded 1
 editable 8
 smoothlevel 125
 smoothface evergreens_1.111 empty_S.111
+move_block boat swim
 end
diff --git a/ground/Wood/jungle_1.arc b/ground/Wood/jungle_1.arc
index b18c46b88..d859050c6 100644
--- a/ground/Wood/jungle_1.arc
+++ b/ground/Wood/jungle_1.arc
@@ -13,4 +13,5 @@ smoothface jungle_1.111 jungle_S.111
 is_wooded 1
 editable 8
 is_floor 1
+move_block boat swim
 end
diff --git a/ground/Wood/jungle_2.arc b/ground/Wood/jungle_2.arc
index 8b7a89ecc..861308388 100644
--- a/ground/Wood/jungle_2.arc
+++ b/ground/Wood/jungle_2.arc
@@ -13,4 +13,5 @@ smoothlevel 128
 smoothface jungle_2.111 jungle_S.111
 editable 8
 is_floor 1
+move_block boat swim
 end
diff --git a/ground/Wood/treed_hills.arc b/ground/Wood/treed_hills.arc
index 692c8b1fa..a756f031b 100644
--- a/ground/Wood/treed_hills.arc
+++ b/ground/Wood/treed_hills.arc
@@ -12,4 +12,5 @@ is_floor 1
 smoothlevel 130
 smoothface treed_hills.111 hills_S.111
 magicmap green
+move_block boat swim
 end
diff --git a/ground/Wood/woods_1.arc b/ground/Wood/woods_1.arc
index c548603d3..4eaf77231 100644
--- a/ground/Wood/woods_1.arc
+++ b/ground/Wood/woods_1.arc
@@ -11,4 +11,5 @@ editable 8
 is_floor 1
 smoothface woods_1.111 sgrass_S.111
 smoothlevel 127
+move_block boat swim
 end
diff --git a/ground/Wood/woods_2.arc b/ground/Wood/woods_2.arc
index 1806510d1..f8d319ad7 100644
--- a/ground/Wood/woods_2.arc
+++ b/ground/Wood/woods_2.arc
@@ -12,4 +12,5 @@ editable 8
 is_floor 1
 smoothface woods_2.111 woods_2_S.111
 smoothlevel 127
+move_block boat swim
 end
diff --git a/ground/Wood/woods_3.arc b/ground/Wood/woods_3.arc
index d01c9b1b0..18e32a988 100644
--- a/ground/Wood/woods_3.arc
+++ b/ground/Wood/woods_3.arc
@@ -13,4 +13,5 @@ editable 8
 visibility 100
 smoothface woods_3.111 sgrass_S.111
 smoothlevel 127
+move_block boat swim
 end
diff --git a/ground/Wood/woods_4.arc b/ground/Wood/woods_4.arc
index bb43193a3..943e80e32 100644
--- a/ground/Wood/woods_4.arc
+++ b/ground/Wood/woods_4.arc
@@ -11,4 +11,5 @@ is_wooded 1
 editable 8
 smoothlevel 12
 smoothface woods_4.111 grass_S.111
+move_block boat swim
 end
diff --git a/ground/Wood/woods_5.arc b/ground/Wood/woods_5.arc
index 3ccbcae16..83db0b0f3 100644
--- a/ground/Wood/woods_5.arc
+++ b/ground/Wood/woods_5.arc
@@ -10,4 +10,5 @@ is_wooded 1
 color_fg green
 editable 8
 visibility 100
+move_block boat swim
 end
diff --git a/ground/beach.arc b/ground/beach.arc
index 5dd517bd3..e68a5f0da 100644
--- a/ground/beach.arc
+++ b/ground/beach.arc
@@ -11,4 +11,5 @@ is_floor 1
 smoothlevel 10
 editable 8
 smoothface beach.111 beach_S.111
+move_block boat swim
 end
diff --git a/ground/deep_sea.arc b/ground/deep_sea.arc
index aa4cdd455..d8de08294 100644
--- a/ground/deep_sea.arc
+++ b/ground/deep_sea.arc
@@ -20,4 +20,5 @@ no_pick 1
 is_water 1
 editable 8
 is_floor 1
+move_block all -boat
 end
diff --git a/ground/desert.arc b/ground/desert.arc
index 82f42198a..8ffb59b9c 100644
--- a/ground/desert.arc
+++ b/ground/desert.arc
@@ -12,4 +12,5 @@ is_floor 1
 smoothlevel 37
 editable 8
 smoothface desert.111 desert_S.111
+move_block boat swim
 end
diff --git a/ground/farmland.arc b/ground/farmland.arc
index 9170e94c3..39228faf6 100644
--- a/ground/farmland.arc
+++ b/ground/farmland.arc
@@ -10,4 +10,5 @@ slow_move 1
 smoothlevel 35
 smoothface farmland.111 empty_S.111
 editable 8
+move_block boat swim
 end
diff --git a/ground/grass.arc b/ground/grass.arc
index 0cac19905..f50d12afe 100644
--- a/ground/grass.arc
+++ b/ground/grass.arc
@@ -11,6 +11,7 @@ is_wooded 1
 editable 8
 smoothlevel 40
 smoothface grass.111 grass_S.111
+move_block boat swim
 end
 Object grass_only
 name grass
@@ -25,4 +26,5 @@ is_wooded 1
 editable 8
 smoothlevel 40
 smoothface grass.111 grass_S.111
+move_block boat swim
 end
diff --git a/ground/grasspond.arc b/ground/grasspond.arc
index 7749fee7c..a36c8c8e1 100644
--- a/ground/grasspond.arc
+++ b/ground/grasspond.arc
@@ -11,4 +11,5 @@ editable 8
 is_floor 1
 smoothlevel 40
 smoothface grasspond.111 grass_S.111
+move_block boat swim
 end
diff --git a/ground/hills.arc b/ground/hills.arc
index 8089d452f..a8ae2f728 100644
--- a/ground/hills.arc
+++ b/ground/hills.arc
@@ -11,4 +11,5 @@ is_floor 1
 smoothlevel 59
 magicmap khaki
 smoothface hills.111 hills_S.111
+move_block boat swim
 end
diff --git a/ground/hillsrocky.arc b/ground/hillsrocky.arc
index bc1ee5a0e..f7138a5cb 100644
--- a/ground/hillsrocky.arc
+++ b/ground/hillsrocky.arc
@@ -12,4 +12,5 @@ is_floor 1
 smoothlevel 60
 smoothface hillsrocky.111 hillsrocky_S.111
 magicmap brown
+move_block boat swim
 end
diff --git a/ground/lava.arc b/ground/lava.arc
index 164ece699..1b1c09be3 100644
--- a/ground/lava.arc
+++ b/ground/lava.arc
@@ -30,6 +30,7 @@ duration 60
 dam 3
 is_floor 1
 editable 8
+move_block boat swim
 end
 #
 Object permanent_lava
@@ -63,4 +64,5 @@ hp 1
 dam 3
 editable 8
 is_floor 1
+move_block boat swim
 end
diff --git a/ground/marsh.arc b/ground/marsh.arc
index da6579114..21164d878 100644
--- a/ground/marsh.arc
+++ b/ground/marsh.arc
@@ -13,4 +13,5 @@ smoothlevel 9
 editable 8
 is_floor 1
 smoothface marsh.111 marsh_S.111
+move_block boat swim
 end
diff --git a/ground/sea.arc b/ground/sea.arc
index 43a664534..0c7a1acbf 100644
--- a/ground/sea.arc
+++ b/ground/sea.arc
@@ -15,7 +15,7 @@ smoothface sea.114 sea_S.114
 color_fg light_blue
 color_bg blue
 speed 0.2
-no_pass 1
+move_block all -boat
 no_pick 1
 is_water 1
 editable 8
diff --git a/ground/shallow_sea.arc b/ground/shallow_sea.arc
index 66e8ad66d..c19806899 100644
--- a/ground/shallow_sea.arc
+++ b/ground/shallow_sea.arc
@@ -20,4 +20,5 @@ no_pick 1
 is_water 1
 editable 8
 is_floor 1
+move_block all
 end
diff --git a/ground/steppe.arc b/ground/steppe.arc
index 3df8a8f30..092c66ba7 100644
--- a/ground/steppe.arc
+++ b/ground/steppe.arc
@@ -8,4 +8,5 @@ editable 8
 smoothlevel 27
 magicmap khaki
 smoothface steppe.111 steppe_S.111
+move_block boat swim
 end
diff --git a/ground/steppelight.arc b/ground/steppelight.arc
index c8aea2f98..cfe3a7219 100644
--- a/ground/steppelight.arc
+++ b/ground/steppelight.arc
@@ -7,4 +7,5 @@ is_wooded 1
 is_floor 1
 editable 8
 magicmap khaki
+move_block boat swim
 end
diff --git a/ground/swamp.arc b/ground/swamp.arc
index 61b934019..943684b26 100644
--- a/ground/swamp.arc
+++ b/ground/swamp.arc
@@ -13,4 +13,5 @@ editable 8
 smoothlevel 9
 smoothface swamp.111 swamp_S.111
 is_floor 1
+move_block boat swim
 end
diff --git a/ground/thorns.arc b/ground/thorns.arc
index 29c83a73a..a67f14f06 100644
--- a/ground/thorns.arc
+++ b/ground/thorns.arc
@@ -17,4 +17,5 @@ attacktype 1
 speed 0.2
 dam 3
 editable 8
+move_block boat swim
 end
diff --git a/ground/volcano.arc b/ground/volcano.arc
index 742a24b3c..261e63fb5 100644
--- a/ground/volcano.arc
+++ b/ground/volcano.arc
@@ -11,6 +11,7 @@ slow_move 15
 is_hilly 1
 speed -0.02
 editable 40
+move_block boat swim
 end
 More
 Object active_volcano_2
@@ -26,4 +27,5 @@ no_pick 1
 slow_move 15
 is_hilly 1
 speed -0.02
+move_block boat swim
 end
diff --git a/ground/wasteland.arc b/ground/wasteland.arc
index b1e8bcb95..49fe20ca8 100644
--- a/ground/wasteland.arc
+++ b/ground/wasteland.arc
@@ -2,7 +2,7 @@ Object wasteland
 face wasteland.111
 blocksview 1
 no_pick 1
-no_pass 1
+move_block all
 color_fg blue
 is_floor 1
 editable 8