diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 065a7e253..8e67182ba 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index c6e152721..69752b6ed 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map196.rxdata b/Data/Map196.rxdata
index 893bc1ab8..481d5223c 100644
Binary files a/Data/Map196.rxdata and b/Data/Map196.rxdata differ
diff --git a/Data/Map437.rxdata b/Data/Map437.rxdata
index 8652018d9..6baff2717 100644
Binary files a/Data/Map437.rxdata and b/Data/Map437.rxdata differ
diff --git a/Data/Map528.rxdata b/Data/Map528.rxdata
index 480f58b0f..5c31c81b6 100644
Binary files a/Data/Map528.rxdata and b/Data/Map528.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index c3b1716e2..63bd26b2f 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts.rxdata b/Data/Scripts.rxdata
index 8c540d5ef..6b564aa8f 100644
Binary files a/Data/Scripts.rxdata and b/Data/Scripts.rxdata differ
diff --git a/Data/Scripts/004_Game classes/007_Game_Character.rb b/Data/Scripts/004_Game classes/007_Game_Character.rb
index d534dbc2b..2fc2ddda0 100644
--- a/Data/Scripts/004_Game classes/007_Game_Character.rb	
+++ b/Data/Scripts/004_Game classes/007_Game_Character.rb	
@@ -222,6 +222,14 @@ class Game_Character
   #=============================================================================
   # Passability
   #=============================================================================
+  def pbFacingTerrainTag(dir = nil)
+    dir = self.direction if !dir
+    return $MapFactory.getFacingTerrainTag(dir, self) if $MapFactory
+    facing = pbFacingTile(dir, self)
+    return $game_map.terrain_tag(facing[1], facing[2])
+  end
+
+
   def passable?(x, y, d, strict = false)
     new_x = x + (d == 6 ? 1 : d == 4 ? -1 : 0)
     new_y = y + (d == 2 ? 1 : d == 8 ? -1 : 0)
diff --git a/Data/Scripts/004_Game classes/008_Game_Event.rb b/Data/Scripts/004_Game classes/008_Game_Event.rb
index 40965fdc3..b825175f3 100644
--- a/Data/Scripts/004_Game classes/008_Game_Event.rb	
+++ b/Data/Scripts/004_Game classes/008_Game_Event.rb	
@@ -130,6 +130,7 @@ class Game_Event < Game_Character
     return @map_id == $game_map.map_id && at_coordinate?($game_player.x, $game_player.y)
   end
 
+
   def over_trigger?
     return false if @character_name != "" && !@through
     return false if @event.name[/hiddenitem/i]
diff --git a/Data/Scripts/004_Game classes/009_Game_Player.rb b/Data/Scripts/004_Game classes/009_Game_Player.rb
index 3bb7751ba..3a188ecbf 100644
--- a/Data/Scripts/004_Game classes/009_Game_Player.rb	
+++ b/Data/Scripts/004_Game classes/009_Game_Player.rb	
@@ -143,12 +143,7 @@ class Game_Player < Game_Character
     return nil
   end
 
-  def pbFacingTerrainTag(dir = nil)
-    dir = self.direction if !dir
-    return $MapFactory.getFacingTerrainTag(dir, self) if $MapFactory
-    facing = pbFacingTile(dir, self)
-    return $game_map.terrain_tag(facing[1], facing[2])
-  end
+
 
   #-----------------------------------------------------------------------------
   # * Passable Determinants
diff --git a/Data/Scripts/010_Data/001_Hardcoded data/012_Weather.rb b/Data/Scripts/010_Data/001_Hardcoded data/012_Weather.rb
index 3ce90e331..ad7deaffd 100644
--- a/Data/Scripts/010_Data/001_Hardcoded data/012_Weather.rb	
+++ b/Data/Scripts/010_Data/001_Hardcoded data/012_Weather.rb	
@@ -9,7 +9,8 @@
 # For the tone_proc, strength goes from 0 to RPG::Weather::MAX_SPRITES (60) and
 # will typically be the maximum.
 module GameData
-  class Weather
+  class
+  Weather
     attr_reader :id
     attr_reader :id_number
     attr_reader :real_name
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 0db618dc3..809e0fc34 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 9873e9ae6..8d34a0eef 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ