From 6542d505a63fb62266bd79d37b2cf1c7f26d122e Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Sun, 7 Aug 2022 16:07:37 +0100
Subject: [PATCH] The player now dismounts the Bicycle after various map
 transfers

---
 .../001_Overworld visuals/003_Overworld_MapTransitionAnims.rb  | 2 ++
 Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb         | 3 +++
 .../001_Battle Frontier/001_Challenge_BattleChallenge.rb       | 1 +
 Data/Scripts/018_Alternate battle modes/001_SafariZone.rb      | 1 +
 Data/Scripts/018_Alternate battle modes/002_BugContest.rb      | 1 +
 5 files changed, 8 insertions(+)

diff --git a/Data/Scripts/012_Overworld/001_Overworld visuals/003_Overworld_MapTransitionAnims.rb b/Data/Scripts/012_Overworld/001_Overworld visuals/003_Overworld_MapTransitionAnims.rb
index 2b0a99d6f..884d12981 100644
--- a/Data/Scripts/012_Overworld/001_Overworld visuals/003_Overworld_MapTransitionAnims.rb	
+++ b/Data/Scripts/012_Overworld/001_Overworld visuals/003_Overworld_MapTransitionAnims.rb	
@@ -101,6 +101,7 @@ def pbStartOver(gameover = false)
     $game_temp.player_new_x         = $PokemonGlobal.pokecenterX
     $game_temp.player_new_y         = $PokemonGlobal.pokecenterY
     $game_temp.player_new_direction = $PokemonGlobal.pokecenterDirection
+    pbDismountBike
     $scene.transfer_player if $scene.is_a?(Scene_Map)
     $game_map.refresh
   else
@@ -126,6 +127,7 @@ def pbStartOver(gameover = false)
       $game_temp.player_new_x         = homedata[1]
       $game_temp.player_new_y         = homedata[2]
       $game_temp.player_new_direction = homedata[3]
+      pbDismountBike
       $scene.transfer_player if $scene.is_a?(Scene_Map)
       $game_map.refresh
     else
diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
index 2eec1841b..395225545 100644
--- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
+++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
@@ -283,6 +283,7 @@ HiddenMoveHandlers::UseMove.add(:DIG, proc { |move, pokemon|
       $game_temp.player_new_x         = escape[1]
       $game_temp.player_new_y         = escape[2]
       $game_temp.player_new_direction = escape[3]
+      pbDismountBike
       $scene.transfer_player
       $game_map.autoplay
       $game_map.refresh
@@ -535,6 +536,7 @@ def pbFlyToNewLocation(pkmn = nil, move = :FLY)
     $game_temp.player_new_y         = $game_temp.fly_destination[2]
     $game_temp.player_new_direction = 2
     $game_temp.fly_destination = nil
+    pbDismountBike
     $scene.transfer_player
     $game_map.autoplay
     $game_map.refresh
@@ -940,6 +942,7 @@ HiddenMoveHandlers::UseMove.add(:TELEPORT, proc { |move, pokemon|
     $game_temp.player_new_x         = healing[1]
     $game_temp.player_new_y         = healing[2]
     $game_temp.player_new_direction = 2
+    pbDismountBike
     $scene.transfer_player
     $game_map.autoplay
     $game_map.refresh
diff --git a/Data/Scripts/018_Alternate battle modes/001_Battle Frontier/001_Challenge_BattleChallenge.rb b/Data/Scripts/018_Alternate battle modes/001_Battle Frontier/001_Challenge_BattleChallenge.rb
index eeabe45b2..e10f5c9ad 100644
--- a/Data/Scripts/018_Alternate battle modes/001_Battle Frontier/001_Challenge_BattleChallenge.rb	
+++ b/Data/Scripts/018_Alternate battle modes/001_Battle Frontier/001_Challenge_BattleChallenge.rb	
@@ -234,6 +234,7 @@ class BattleChallengeData
       $game_temp.player_new_x         = @start[1]
       $game_temp.player_new_y         = @start[2]
       $game_temp.player_new_direction = 8
+      pbDismountBike
       $scene.transfer_player
     end
   end
diff --git a/Data/Scripts/018_Alternate battle modes/001_SafariZone.rb b/Data/Scripts/018_Alternate battle modes/001_SafariZone.rb
index 26d8830ec..6b60d6992 100644
--- a/Data/Scripts/018_Alternate battle modes/001_SafariZone.rb	
+++ b/Data/Scripts/018_Alternate battle modes/001_SafariZone.rb	
@@ -33,6 +33,7 @@ class SafariState
         $game_temp.player_new_x         = @start[1]
         $game_temp.player_new_y         = @start[2]
         $game_temp.player_new_direction = 2
+        pbDismountBike
         $scene.transfer_player
       }
     end
diff --git a/Data/Scripts/018_Alternate battle modes/002_BugContest.rb b/Data/Scripts/018_Alternate battle modes/002_BugContest.rb
index 3d4390980..2833e5981 100644
--- a/Data/Scripts/018_Alternate battle modes/002_BugContest.rb	
+++ b/Data/Scripts/018_Alternate battle modes/002_BugContest.rb	
@@ -164,6 +164,7 @@ class BugContestState
         $game_temp.player_new_x         = @start[1]
         $game_temp.player_new_y         = @start[2]
         $game_temp.player_new_direction = @start[3]
+        pbDismountBike
         $scene.transfer_player
         $game_map.need_refresh = true   # in case player moves to the same map
       }