From c55f1f0a2afe871811a4488fcb0edd47bf600a2a Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Thu, 9 Dec 2021 23:30:52 +0000
Subject: [PATCH] =?UTF-8?q?Follower=20checks=20when=20using=20some=20items?=
 =?UTF-8?q?/moves=20in=20the=20field=20are=20now=20more=20specific,=20whic?=
 =?UTF-8?q?h=20should=20help=20following=20Pok=C3=A9mon=20scripts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Data/Scripts/004_Game classes/009_Game_Player.rb       |  8 ++++++++
 Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb | 10 +++++-----
 Data/Scripts/013_Items/001_Item_Utilities.rb           |  2 +-
 Data/Scripts/013_Items/002_Item_Effects.rb             |  6 +++---
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Data/Scripts/004_Game classes/009_Game_Player.rb b/Data/Scripts/004_Game classes/009_Game_Player.rb
index cad59a448..f408eefda 100644
--- a/Data/Scripts/004_Game classes/009_Game_Player.rb	
+++ b/Data/Scripts/004_Game classes/009_Game_Player.rb	
@@ -36,6 +36,14 @@ class Game_Player < Game_Character
     return $PokemonGlobal.followers.length > 0
   end
 
+  def can_map_transfer_with_follower?
+    return $PokemonGlobal.followers.length == 0
+  end
+
+  def can_ride_vehicle_with_follower?
+    return $PokemonGlobal.followers.length == 0
+  end
+
   def can_run?
     return false if $game_temp.in_menu || $game_temp.in_battle ||
                     @move_route_forcing || $game_temp.message_window_showing ||
diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
index f3413e2ef..4f85f8bc3 100644
--- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
+++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
@@ -257,7 +257,7 @@ HiddenMoveHandlers::CanUseMove.add(:DIG,proc { |move,pkmn,showmsg|
     pbMessage(_INTL("Can't use that here.")) if showmsg
     next false
   end
-  if $game_player.has_follower?
+  if $game_player.can_map_transfer_with_follower?
     pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg
     next false
   end
@@ -501,7 +501,7 @@ HiddenMoveHandlers::UseMove.add(:FLASH,proc { |move,pokemon|
 def pbCanFly?(pkmn = nil, show_messages = false)
   return false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_FLY, show_messages)
   return false if !$DEBUG && !pkmn && !$player.get_pokemon_with_move(:FLY)
-  if $game_player.has_follower?
+  if $game_player.can_map_transfer_with_follower?
     pbMessage(_INTL("It can't be used when you have someone with you.")) if show_messages
     return false
   end
@@ -731,7 +731,7 @@ HiddenMoveHandlers::UseMove.add(:STRENGTH,proc { |move,pokemon|
 #===============================================================================
 def pbSurf
   return false if $game_player.pbFacingEvent
-  return false if $game_player.has_follower?
+  return false if $game_player.can_ride_vehicle_with_follower?
   move = :SURF
   movefinder = $player.get_pokemon_with_move(move)
   if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF,false) || (!$DEBUG && !movefinder)
@@ -808,7 +808,7 @@ HiddenMoveHandlers::CanUseMove.add(:SURF,proc { |move,pkmn,showmsg|
     pbMessage(_INTL("You're already surfing.")) if showmsg
     next false
   end
-  if $game_player.has_follower?
+  if $game_player.can_ride_vehicle_with_follower?
     pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg
     next false
   end
@@ -904,7 +904,7 @@ HiddenMoveHandlers::CanUseMove.add(:TELEPORT,proc { |move,pkmn,showmsg|
     pbMessage(_INTL("Can't use that here.")) if showmsg
     next false
   end
-  if $game_player.has_follower?
+  if $game_player.can_map_transfer_with_follower?
     pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg
     next false
   end
diff --git a/Data/Scripts/013_Items/001_Item_Utilities.rb b/Data/Scripts/013_Items/001_Item_Utilities.rb
index 1dc32bec0..11fa75ab6 100644
--- a/Data/Scripts/013_Items/001_Item_Utilities.rb
+++ b/Data/Scripts/013_Items/001_Item_Utilities.rb
@@ -454,7 +454,7 @@ def pbBikeCheck
     pbMessage(_INTL("Can't use that here."))
     return false
   end
-  if $game_player.has_follower?
+  if $game_player.can_ride_vehicle_with_follower?
     pbMessage(_INTL("It can't be used when you have someone with you."))
     return false
   end
diff --git a/Data/Scripts/013_Items/002_Item_Effects.rb b/Data/Scripts/013_Items/002_Item_Effects.rb
index b6a65488a..1afaae082 100644
--- a/Data/Scripts/013_Items/002_Item_Effects.rb
+++ b/Data/Scripts/013_Items/002_Item_Effects.rb
@@ -21,7 +21,7 @@ ItemHandlers::UseFromBag.add(:HONEY,proc { |item|
 })
 
 ItemHandlers::UseFromBag.add(:ESCAPEROPE,proc { |item|
-  if $game_player.has_follower?
+  if $game_player.can_map_transfer_with_follower?
     pbMessage(_INTL("It can't be used when you have someone with you."))
     next 0
   end
@@ -77,7 +77,7 @@ ItemHandlers::ConfirmUseInField.add(:ESCAPEROPE,proc { |item|
     pbMessage(_INTL("Can't use that here."))
     next false
   end
-  if $game_player.has_follower?
+  if $game_player.can_map_transfer_with_follower?
     pbMessage(_INTL("It can't be used when you have someone with you."))
     next false
   end
@@ -168,7 +168,7 @@ ItemHandlers::UseInField.add(:ESCAPEROPE,proc { |item|
     pbMessage(_INTL("Can't use that here."))
     next false
   end
-  if $game_player.has_follower?
+  if $game_player.can_map_transfer_with_follower?
     pbMessage(_INTL("It can't be used when you have someone with you."))
     next false
   end