Merged Events and EncounterModifier into module EventHandlers

Data/Scripts/004_Game classes/001_Switches and Variables/001_Game_Temp.rb

@@ -9,7 +9,7 @@ class Game_Temp
   attr_accessor :menu_calling             # menu calling flag
   attr_accessor :ready_menu_calling       # ready menu calling flag
   attr_accessor :debug_calling            # debug calling flag
-  attr_accessor :interact_calling         # trigger Events.onAction flag
+  attr_accessor :interact_calling         # EventHandlers.trigger(:on_player_interact) flag
   attr_accessor :battle_abort             # battle flag: interrupt (unused)
   attr_accessor :title_screen_calling     # return to title screen flag
   attr_accessor :common_event_id          # common event ID to start

Data/Scripts/004_Game classes/004_Game_Map.rb

@@ -57,7 +57,7 @@ class Game_Map
     self.display_x        = 0
     self.display_y        = 0
     @need_refresh         = false
-    Events.onMapCreate.trigger(self, map_id, @map, tileset)
+    EventHandlers.trigger(:on_game_map_setup, map_id, @map, tileset)
     @events               = {}
     @map.events.keys.each do |i|
       @events[i]          = Game_Event.new(@map_id, @map.events[i], self)

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

@@ -145,16 +145,16 @@ class PokemonMapFactory
   end
 
   def setMapChanging(newID, newMap)
-    Events.onMapChanging.trigger(self, newID, newMap)
+    EventHandlers.trigger(:on_leave_map, newID, newMap)
   end
 
   def setMapChanged(prevMap)
-    Events.onMapChange.trigger(self, prevMap)
+    EventHandlers.trigger(:on_enter_map, prevMap)
     @mapChanged = true
   end
 
   def setSceneStarted(scene)
-    Events.onMapSceneChange.trigger(self, scene, @mapChanged)
+    EventHandlers.trigger(:on_map_or_spriteset_change, scene, @mapChanged)
     @mapChanged = false
   end
 

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

@@ -382,7 +382,7 @@ class Game_Character
   def triggerLeaveTile
     if @oldX && @oldY && @oldMap &&
        (@oldX != self.x || @oldY != self.y || @oldMap != self.map.map_id)
-      Events.onLeaveTile.trigger(self, self, @oldMap, @oldX, @oldY)
+      EventHandlers.trigger(:on_leave_tile, self, @oldMap, @oldX, @oldY)
     end
     @oldX = self.x
     @oldY = self.y
@@ -918,7 +918,7 @@ class Game_Character
     end
     # End of a step, so perform events that happen at this time
     if !jumping? && !moving?
-      Events.onStepTakenFieldMovement.trigger(self, self)
+      EventHandlers.trigger(:on_step_taken, self)
       calculate_bush_depth
       @stopped_this_frame = true
     elsif !@moved_last_frame || @stopped_last_frame   # Started a new step

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

@@ -141,7 +141,7 @@ class Game_Player < Game_Character
     old_direction = @direction
     super(dir)
     if @direction != old_direction && !@move_route_forcing && !pbMapInterpreterRunning?
-      Events.onChangeDirection.trigger(self, self)
+      EventHandlers.trigger(:on_player_change_direction)
       $game_temp.encounter_triggered = false if !keep_enc_indicator
     end
   end