Fixed BGM bug when ending surfing and immediately triggering a trainer battle with an intro BGM, fixed events making all other events check if they trigger after the event moves, fixed Neutralizing Gas triggering twice upon fainting

Data/Scripts/004_Game classes/006_Game_Character.rb

@@ -817,7 +817,7 @@ class Game_Character
     oldDirection = @direction
     @direction = dir
     @stop_count = 0
-    pbCheckEventTriggerAfterTurning if dir != oldDirection
+    check_event_trigger_after_turning if dir != oldDirection
   end
 
   def turn_down;  turn_generic(2); end

Data/Scripts/004_Game classes/007_Game_Event.rb

@@ -139,16 +139,6 @@ class Game_Event < Game_Character
     return false
   end
 
-  def pbCheckEventTriggerAfterTurning
-    return if $game_system.map_interpreter.running? || @starting
-    return if @trigger != 2   # Event touch
-    return if !@event.name[/(?:sight|trainer)\((\d+)\)/i]
-    distance = $~[1].to_i
-    return if !pbEventCanReachPlayer?(self, $game_player, distance)
-    return if jumping? || over_trigger?
-    start
-  end
-
   def check_event_trigger_touch(dir)
     return if $game_system.map_interpreter.running?
     return if @trigger != 2   # Event touch
@@ -167,6 +157,32 @@ class Game_Event < Game_Character
     start
   end
 
+  def check_event_trigger_after_turning
+    return if $game_system.map_interpreter.running? || @starting
+    return if @trigger != 2   # Not Event Touch
+    return if !self.name[/(?:sight|trainer)\((\d+)\)/i]
+    distance = $~[1].to_i
+    return if !pbEventCanReachPlayer?(self, $game_player, distance)
+    return if jumping? || over_trigger?
+    start
+  end
+
+  def check_event_trigger_after_moving
+    return if $game_system.map_interpreter.running? || @starting
+    return if @trigger != 2   # Not Event Touch
+    if self.name[/(?:sight|trainer)\((\d+)\)/i]
+      distance = $~[1].to_i
+      return if !pbEventCanReachPlayer?(self, $game_player, distance)
+    elsif self.name[/counter\((\d+)\)/i]
+      distance = $~[1].to_i
+      return if !pbEventFacesPlayer?(self, $game_player, distance)
+    else
+      return
+    end
+    return if jumping? || over_trigger?
+    start
+  end
+
   def check_event_trigger_auto
     case @trigger
     when 2   # Event touch
@@ -263,7 +279,7 @@ class Game_Event < Game_Character
     @moveto_happened = false
     last_moving = moving?
     super
-    $game_player.pbCheckEventTriggerFromDistance([2]) if !moving? && last_moving
+    check_event_trigger_after_moving if !moving? && last_moving
     if @need_refresh
       @need_refresh = false
       refresh

Data/Scripts/004_Game classes/008_Game_Player.rb

@@ -313,7 +313,7 @@ class Game_Player < Game_Character
     return result
   end
 
-  def pbCheckEventTriggerAfterTurning; end
+  def check_event_trigger_after_turning; end
 
   def pbCheckEventTriggerFromDistance(triggers)
     events = pbTriggeredTrainerEvents(triggers)