diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 8e67182ba..826e1e8a6 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 86c848c5e..7bb619832 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map328.rxdata b/Data/Map328.rxdata
index ce38335c4..63c34e978 100644
Binary files a/Data/Map328.rxdata and b/Data/Map328.rxdata differ
diff --git a/Data/Map601.rxdata b/Data/Map601.rxdata
index 84068503d..ec0321cce 100644
Binary files a/Data/Map601.rxdata and b/Data/Map601.rxdata differ
diff --git a/Data/Map734.rxdata b/Data/Map734.rxdata
index 14aecb9a1..3ccdfea75 100644
Binary files a/Data/Map734.rxdata and b/Data/Map734.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 0d0c1d963..71592ebfa 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
index d6c3e6cd2..7fb33738f 100644
--- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
+++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
@@ -781,6 +781,9 @@ def pbTransferSurfing(mapid, xcoord, ycoord, direction = $game_player.direction)
     $game_map.autoplay
     $game_map.refresh
   }
+  $PokemonGlobal.surfing = true
+  $PokemonGlobal.diving = false
+  pbUpdateVehicle
 end
 
 Events.onAction += proc { |_sender, _e|
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 3b08383a0..0172c574b 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index a005fc327..ba9820343 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ