diff --git a/Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb b/Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb index 642c18275..c5fdc7435 100644 --- a/Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb +++ b/Data/Scripts/011_Battle/007_Other battle types/001_SafariBattle.rb @@ -47,7 +47,7 @@ class Battle::FakeBattler end def opposes?(i) - i = i.index if i.is_a?(FakeBattler) + i = i.index if i.is_a?(Battle::FakeBattler) return (@index&1)!=(i&1) end diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb index 4f85f8bc3..5b4172d9b 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.can_map_transfer_with_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.can_map_transfer_with_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.can_ride_vehicle_with_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.can_ride_vehicle_with_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.can_map_transfer_with_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 11fa75ab6..8c40567e5 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.can_ride_vehicle_with_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 1afaae082..d8a42623c 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.can_map_transfer_with_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.can_map_transfer_with_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.can_map_transfer_with_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