Update 6.8

Data/Scripts/010_Data/001_Hardcoded data/001_GrowthRate.rb

@@ -61,7 +61,7 @@ module GameData
     # @param exp [Integer] an Exp amount
     # @return [Integer] the level of a Pokémon that has the given Exp amount
     def level_from_exp(exp)
-      return ArgumentError.new("Exp amount #{level} is invalid.") if !exp || exp < 0
+      return ArgumentError.new("Exp amount #{exp} is invalid.") if !exp || exp < 0
       max = GrowthRate.max_level
       return max if exp >= maximum_exp
       for level in 1..max

Data/Scripts/010_Data/001_Hardcoded data/011_TerrainTag.rb

@@ -21,22 +21,29 @@ module GameData
     attr_reader :must_walk
     attr_reader :ignore_passability
 
-    #oricorio
+    attr_reader :acroBike
+
+
+    # oricorio
     attr_reader :flowerRed
     attr_reader :flowerPink
     attr_reader :flowerYellow
     attr_reader :flowerBlue
     attr_reader :flower
 
+    #common objects
     attr_reader :trashcan
+    attr_reader :chair
+
+    attr_reader :chair
+
     attr_reader :sharpedoObstacle
-    attr_reader :underwater #only visible when diving
+    attr_reader :underwater # only visible when diving
 
     attr_reader :secretBase_tree
     attr_reader :secretBase_cave
     attr_reader :secretBase_bush
 
-
     DATA = {}
 
     extend ClassMethods
@@ -74,7 +81,7 @@ module GameData
       @ice = hash[:ice] || false
       @waterCurrent = hash[:waterCurrent] || false
       @bridge = hash[:bridge] || false
-      @shows_reflections =   hash[:shows_reflections]      || false
+      @shows_reflections = hash[:shows_reflections] || false
       @must_walk = hash[:must_walk] || false
       @ignore_passability = hash[:ignore_passability] || false
       @ignore_passability = hash[:ignore_passability] || false
@@ -85,7 +92,11 @@ module GameData
       @flowerBlue = hash[:flowerBlue] || false
       @flower = hash[:flower] || false
       @trashcan = hash[:trashcan] || false
-      @sharpedoObstacle = hash[:sharpedoObstacle] || false
+
+      @acroBike = hash[:acroBike] || false
+      @chair = hash[:chair] || false
+
+      @sharpedoObstacle = hash[:chair] || false
       @underwater = hash[:underwater] || false
 
       @secretBase_tree = hash[:secretBase_tree] || false
@@ -156,8 +167,6 @@ GameData::TerrainTag.register({
                                 :battle_environment => :MovingWater
                               })
 
-
-
 GameData::TerrainTag.register({
                                 :id => :Water,
                                 :id_number => 7,
@@ -306,7 +315,7 @@ GameData::TerrainTag.register({
                                 :can_surf => true,
                                 :can_fish => true,
                                 :battle_environment => :StillWater,
-                                :shows_reflections      => true
+                                :shows_reflections => true
                               })
 
 GameData::TerrainTag.register({
@@ -316,7 +325,6 @@ GameData::TerrainTag.register({
                                 :underwater => true,
                               })
 
-
 GameData::TerrainTag.register({
                                 :id => :Secretbase_Tree,
                                 :id_number => 29,
@@ -333,4 +341,22 @@ GameData::TerrainTag.register({
                                 :id => :Secretbase_Bush,
                                 :id_number => 31,
                                 :secretBase_bush => true,
+                              })
+
+GameData::TerrainTag.register({
+                                :id => :Chair,
+                                :id_number => 32,
+                                :chair => true
+                              })
+
+GameData::TerrainTag.register({
+                                :id => :Stairs,
+                                :id_number => 33,
+                                :must_walk => true
+                              })
+
+GameData::TerrainTag.register({
+                                :id => :AcroBike,
+                                :id_number => 34,
+                                :acroBike => true,
                               })

Data/Scripts/010_Data/001_Hardcoded data/012_Weather.rb

@@ -191,4 +191,26 @@ GameData::Weather.register({
  :tone_proc        => proc { |strength|
    next Tone.new(64, 64, 32, 0)
  }
-})
+})
+
+GameData::Weather.register({
+   :id               => :Ash,
+   :id_number        => 12,
+   :graphics         => [["ash_1", "ash_2", "ash_3"]],
+   :particle_delta_x => 20,
+   :particle_delta_y => 100,
+   :tone_proc        => proc { |strength|
+     next Tone.new(strength / 2, strength / 2, strength / 2, 0)
+   }
+ })
+
+GameData::Weather.register({  #Used underwater
+     :id               => :Bubbles,
+     :id_number        => 13,
+     :graphics         => [["bubble_1", "bubble_2", "bubble_3"]],
+     :particle_delta_x => 20,
+     :particle_delta_y => 40,
+     :tone_proc        => proc { |strength|
+       next Tone.new(strength / 2, strength / 2, strength / 2, 0)
+     }
+   })

Data/Scripts/010_Data/001_Hardcoded data/013_EncounterType.rb

@@ -55,6 +55,7 @@ GameData::EncounterType.register({
    :old_slots      => [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]
   })
 
+
 GameData::EncounterType.register({
   :id             => :LandDay,
   :type           => :land,

Data/Scripts/010_Data/001_Hardcoded data/014_Environment.rb

@@ -129,3 +129,9 @@ GameData::Environment.register({
   :id   => :UltraSpace,
   :name => _INTL("Ultra Space")
 })
+
+GameData::Environment.register({
+  :id   => :Bridge,
+  :name => _INTL("Bridge"),
+  :battle_base => "Bridge"
+})