Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases

Data/Scripts/001_Settings.rb

@@ -5,8 +5,8 @@
 #==============================================================================#
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION = '6.2.0'
-  GAME_VERSION_NUMBER = "6.2.0"
+  GAME_VERSION = '6.2.3'
+  GAME_VERSION_NUMBER = "6.2.3"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18

Data/Scripts/001_Technical/002_RubyUtilities.rb

@@ -2,7 +2,7 @@
 # class Object
 #===============================================================================
 class Object
-  alias full_inspect inspect
+  alias full_inspect inspect unless method_defined?(:full_inspect)
 
   def inspect
     return "#<#{self.class}>"

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

@@ -36,6 +36,7 @@ class Game_Map
   attr_reader :display_x # display x-coordinate * 128
   attr_reader :display_y # display y-coordinate * 128
   attr_accessor :need_refresh # refresh request flag
+  attr_accessor :scroll_direction
 
   TILE_WIDTH = 32
   TILE_HEIGHT = 32

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

@@ -178,6 +178,12 @@ class Game_Player < Game_Character
     self.map.display_y = y * Game_Map::REAL_RES_Y - SCREEN_CENTER_Y
   end
 
+
+  def isCentered()
+    x_centered = self.map.display_x == x * Game_Map::REAL_RES_X - SCREEN_CENTER_X
+    y_centered = self.map.display_y == y * Game_Map::REAL_RES_Y - SCREEN_CENTER_Y
+    return x_centered && y_centered
+  end
   #-----------------------------------------------------------------------------
   # * Move to Designated Position
   #     x : x-coordinate

Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb

@@ -41,9 +41,9 @@ end
 
 
 class Spriteset_Map
-  alias _animationSprite_initialize initialize
-  alias _animationSprite_update update
-  alias _animationSprite_dispose dispose
+  alias _animationSprite_initialize initialize unless method_defined?(:_animationSprite_initialize)
+  alias _animationSprite_update update unless method_defined?(:_animationSprite_update)
+  alias _animationSprite_dispose dispose unless method_defined?(:_animationSprite_dispose)
 
   def initialize(map=nil)
     @usersprites=[]

Data/Scripts/005_Sprites/009_Sprite_DynamicShadows.rb

@@ -7,19 +7,19 @@
 class Sprite_Shadow < RPG::Sprite
   attr_accessor :character
 
-  def initialize(viewport, character = nil,params=[])
+  def initialize(viewport, character = nil, params = [])
     super(viewport)
     @source       = params[0]
-    @anglemin     = (params.size>1) ? params[1] : 0
-    @anglemax     = (params.size>2) ? params[2] : 0
-    @self_opacity = (params.size>4) ? params[4] : 100
-    @distancemax  = (params.size>3) ? params[3] : 350
+    @anglemin     = (params.size > 1) ? params[1] : 0
+    @anglemax     = (params.size > 2) ? params[2] : 0
+    @self_opacity = (params.size > 4) ? params[4] : 100
+    @distancemax  = (params.size > 3) ? params[3] : 350
     @character    = character
     update
   end
 
   def dispose
-    @chbitmap.dispose if @chbitmap
+    @chbitmap&.dispose
     super
   end
 
@@ -35,19 +35,18 @@ class Sprite_Shadow < RPG::Sprite
       @tile_id        = @character.tile_id
       @character_name = @character.character_name
       @character_hue  = @character.character_hue
+      @chbitmap&.dispose
       if @tile_id >= 384
-        @chbitmap.dispose if @chbitmap
         @chbitmap = pbGetTileBitmap(@character.map.tileset_name,
-           @tile_id, @character.character_hue)
+                                    @tile_id, @character.character_hue)
         self.src_rect.set(0, 0, 32, 32)
         @ch = 32
         @cw = 32
         self.ox = 16
         self.oy = 32
       else
-        @chbitmap.dispose if @chbitmap
-        @chbitmap = AnimatedBitmap.new(
-           'Graphics/Characters/'+@character.character_name,@character.character_hue)
+        @chbitmap = AnimatedBitmap.new('Graphics/Characters/' + @character.character_name,
+                                       @character.character_hue)
         @cw = @chbitmap.width / 4
         @ch = @chbitmap.height / 4
         self.ox = @cw / 2
@@ -75,8 +74,8 @@ class Sprite_Shadow < RPG::Sprite
       self.src_rect.set(sx, sy, @cw, @ch)
     end
     self.x = ScreenPosHelper.pbScreenX(@character)
-    self.y = ScreenPosHelper.pbScreenY(@character)-5
-    self.z = ScreenPosHelper.pbScreenZ(@character,@ch)-1
+    self.y = ScreenPosHelper.pbScreenY(@character) - 5
+    self.z = ScreenPosHelper.pbScreenZ(@character, @ch) - 1
     self.zoom_x = ScreenPosHelper.pbScreenZoomX(@character)
     self.zoom_y = ScreenPosHelper.pbScreenZoomY(@character)
     self.blend_type = @character.blend_type
@@ -89,10 +88,10 @@ class Sprite_Shadow < RPG::Sprite
     @deltax = ScreenPosHelper.pbScreenX(@source) - self.x
     @deltay = ScreenPosHelper.pbScreenY(@source) - self.y
     self.color = Color.new(0, 0, 0)
-    @distance = ((@deltax ** 2) + (@deltay ** 2))
-    self.opacity = @self_opacity * 13000 / ((@distance * 370 / @distancemax) + 6000)
+    @distance = ((@deltax**2) + (@deltay**2))
+    self.opacity = @self_opacity * 13_000 / ((@distance * 370 / @distancemax) + 6000)
     self.angle = 57.3 * Math.atan2(@deltax, @deltay)
-    @angle_trigo = self.angle+90
+    @angle_trigo = self.angle + 90
     @angle_trigo += 360 if @angle_trigo < 0
     if @anglemin != 0 || @anglemax != 0
       if (@angle_trigo < @anglemin || @angle_trigo > @anglemax) && @anglemin < @anglemax
@@ -124,7 +123,7 @@ end
 # ? CLASS Sprite_Character edit
 #===================================================
 class Sprite_Character < RPG::Sprite
-  alias :shadow_initialize :initialize
+  alias shadow_initialize initialize unless method_defined?(:shadow_initialize)
 
   def initialize(viewport, character = nil)
     @ombrelist = []
@@ -132,37 +131,33 @@ class Sprite_Character < RPG::Sprite
     shadow_initialize(viewport, @character)
   end
 
-  def setShadows(map,shadows)
+  def setShadows(map, shadows)
     if character.is_a?(Game_Event) && shadows.length > 0
-      params = XPML_read(map,"Shadow",@character,4)
+      params = XPML_read(map, "Shadow", @character, 4)
       if params != nil
-        for i in 0...shadows.size
-          @ombrelist.push(Sprite_Shadow.new(viewport, @character, shadows[i]))
+        shadows.each do |shadow|
+          @ombrelist.push(Sprite_Shadow.new(viewport, @character, shadows))
         end
       end
     end
     if character.is_a?(Game_Player) && shadows.length > 0
-      for i in 0...shadows.size
-        @ombrelist.push(Sprite_Shadow.new(viewport, $game_player, shadows[i]))
+      shadows.each do |shadow|
+        @ombrelist.push(Sprite_Shadow.new(viewport, $game_player, shadow))
       end
     end
     update
   end
 
   def clearShadows
-    @ombrelist.each { |s| s.dispose if s }
+    @ombrelist.each { |s| s&.dispose }
     @ombrelist.clear
   end
 
-  alias shadow_update update
+  alias shadow_update update unless method_defined?(:shadow_update)
 
   def update
     shadow_update
-    if @ombrelist.length>0
-      for i in 0...@ombrelist.size
-        @ombrelist[i].update
-      end
-    end
+    @ombrelist.each { |ombre| ombre.update }
   end
 end
 
@@ -183,24 +178,24 @@ end
 class Spriteset_Map
   attr_accessor :shadows
 
-  alias shadow_initialize initialize
-  def initialize(map=nil)
+  alias shadow_initialize initialize unless method_defined?(:shadow_initialize)
+
+  def initialize(map = nil)
     @shadows = []
     warn = false
     map = $game_map if !map
-    for k in map.events.keys.sort
+    map.events.keys.sort.each do |k|
       ev = map.events[k]
-      warn = true if (ev.list != nil && ev.list.length > 0 &&
-         ev.list[0].code == 108 &&
-         (ev.list[0].parameters == ["s"] || ev.list[0].parameters == ["o"]))
-      params = XPML_read(map,"Shadow Source", ev, 4)
+      warn = true if ev.list != nil && ev.list.length > 0 && ev.list[0].code == 108 &&
+                     (ev.list[0].parameters == ["s"] || ev.list[0].parameters == ["o"])
+      params = XPML_read(map, "Shadow Source", ev, 4)
       @shadows.push([ev] + params) if params != nil
     end
     if warn == true
       p "Warning : At least one event on this map uses the obsolete way to add shadows"
     end
     shadow_initialize(map)
-    for sprite in @character_sprites
+    @character_sprites.each do |sprite|
       sprite.setShadows(map, @shadows)
     end
     $scene.spritesetGlobal.playersprite.setShadows(map, @shadows)
@@ -228,31 +223,31 @@ end
 #   p XPML_read("third", event_id) -> [3]
 #   p XPML_read("forth", event_id) -> nil
 #===================================================
-def XPML_read(map,markup,event,max_param_number=0)
+def XPML_read(map, markup, event, max_param_number = 0)
   parameter_list = nil
-  return nil if !event || event.list == nil
-    for i in 0...event.list.size
-      if event.list[i].code == 108 &&
-         event.list[i].parameters[0].downcase == "begin " + markup.downcase
-        parameter_list = [] if parameter_list == nil
-        for j in i+1...event.list.size
-          if event.list[j].code == 108
-            parts = event.list[j].parameters[0].split
-            if parts.size != 1 && parts[0].downcase != "begin"
-              if parts[1].to_i != 0 || parts[1] == "0"
-                parameter_list.push(parts[1].to_i)
-              else
-                parameter_list.push(parts[1])
-              end
+  return nil if !event || event.list.nil?
+  event.list.size.times do |i|
+    if event.list[i].code == 108 &&
+       event.list[i].parameters[0].downcase == "begin " + markup.downcase
+      parameter_list = [] if parameter_list.nil?
+      ((i + 1)...event.list.size).each do |j|
+        if event.list[j].code == 108
+          parts = event.list[j].parameters[0].split
+          if parts.size != 1 && parts[0].downcase != "begin"
+            if parts[1].to_i != 0 || parts[1] == "0"
+              parameter_list.push(parts[1].to_i)
             else
-              return parameter_list
+              parameter_list.push(parts[1])
             end
           else
             return parameter_list
           end
-          return parameter_list if max_param_number != 0 && j == i + max_param_number
+        else
+          return parameter_list
         end
+        return parameter_list if max_param_number != 0 && j == i + max_param_number
       end
     end
+  end
   return parameter_list
 end

Data/Scripts/005_Sprites/010_ParticleEngine.rb

@@ -2,36 +2,36 @@
 # Based on version 2 by Near Fantastica, 04.01.06
 # In turn based on the Particle Engine designed by PinkMan
 class Particle_Engine
-  def initialize(viewport=nil,map=nil)
+  def initialize(viewport = nil, map = nil)
     @map       = (map) ? map : $game_map
     @viewport  = viewport
     @effect    = []
     @disposed  = false
     @firsttime = true
     @effects   = {
-       # PinkMan's Effects
-       "fire"         => Particle_Engine::Fire,
-       "smoke"        => Particle_Engine::Smoke,
-       "teleport"     => Particle_Engine::Teleport,
-       "spirit"       => Particle_Engine::Spirit,
-       "explosion"    => Particle_Engine::Explosion,
-       "aura"         => Particle_Engine::Aura,
-       # BlueScope's Effects
-       "soot"         => Particle_Engine::Soot,
-       "sootsmoke"    => Particle_Engine::SootSmoke,
-       "rocket"       => Particle_Engine::Rocket,
-       "fixteleport"  => Particle_Engine::FixedTeleport,
-       "smokescreen"  => Particle_Engine::Smokescreen,
-       "flare"        => Particle_Engine::Flare,
-       "splash"       => Particle_Engine::Splash,
-       # By Peter O.
-       "starteleport" => Particle_Engine::StarTeleport
+      # PinkMan's Effects
+      "fire"         => Particle_Engine::Fire,
+      "smoke"        => Particle_Engine::Smoke,
+      "teleport"     => Particle_Engine::Teleport,
+      "spirit"       => Particle_Engine::Spirit,
+      "explosion"    => Particle_Engine::Explosion,
+      "aura"         => Particle_Engine::Aura,
+      # BlueScope's Effects
+      "soot"         => Particle_Engine::Soot,
+      "sootsmoke"    => Particle_Engine::SootSmoke,
+      "rocket"       => Particle_Engine::Rocket,
+      "fixteleport"  => Particle_Engine::FixedTeleport,
+      "smokescreen"  => Particle_Engine::Smokescreen,
+      "flare"        => Particle_Engine::Flare,
+      "splash"       => Particle_Engine::Splash,
+      # By Peter O.
+      "starteleport" => Particle_Engine::StarTeleport
     }
   end
 
   def dispose
     return if disposed?
-    for particle in @effect
+    @effect.each do |particle|
       next if particle.nil?
       particle.dispose
     end
@@ -54,47 +54,46 @@ class Particle_Engine
     @effect.delete_at(event.id)
   end
 
-  def realloc_effect(event,particle)
+  def realloc_effect(event, particle)
     type = pbEventCommentInput(event, 1, "Particle Engine Type")
     if type.nil?
-      particle.dispose if particle
+      particle&.dispose
       return nil
     end
     type = type[0].downcase
     cls = @effects[type]
     if cls.nil?
-      particle.dispose if particle
+      particle&.dispose
       return nil
     end
     if !particle || !particle.is_a?(cls)
-      particle.dispose if particle
-      particle = cls.new(event,@viewport)
+      particle&.dispose
+      particle = cls.new(event, @viewport)
     end
     return particle
   end
 
   def pbParticleEffect(event)
-    return realloc_effect(event,nil)
+    return realloc_effect(event, nil)
   end
 
   def update
     if @firsttime
       @firsttime = false
-      for event in @map.events.values
+      @map.events.values.each do |event|
         remove_effect(event)
         add_effect(event)
       end
     end
-    for i in 0...@effect.length
-      particle = @effect[i]
+    @effect.each_with_index do |particle, i|
       next if particle.nil?
       if particle.event.pe_refresh
         event = particle.event
         event.pe_refresh = false
-        particle = realloc_effect(event,particle)
+        particle = realloc_effect(event, particle)
         @effect[i] = particle
       end
-      particle.update if particle
+      particle&.update
     end
   end
 end
@@ -136,7 +135,7 @@ class ParticleSprite
   end
 
   def dispose
-    @sprite.dispose if @sprite
+    @sprite&.dispose
   end
 
   def bitmap=(value)
@@ -153,21 +152,21 @@ class ParticleSprite
   def update
     w = Graphics.width
     h = Graphics.height
-    if !@sprite && @x>=@minleft && @y>=@mintop && @x<w && @y<h
+    if !@sprite && @x >= @minleft && @y >= @mintop && @x < w && @y < h
       @sprite = Sprite.new(@viewport)
-    elsif @sprite && (@x<@minleft || @y<@mintop || @x>=w || @y>=h)
+    elsif @sprite && (@x < @minleft || @y < @mintop || @x >= w || @y >= h)
       @sprite.dispose
       @sprite = nil
     end
     if @sprite
-      @sprite.x          = @x if @sprite.x!=@x
+      @sprite.x          = @x if @sprite.x != @x
       @sprite.x          -= @ox
-      @sprite.y          = @y if @sprite.y!=@y
+      @sprite.y          = @y if @sprite.y != @y
       @sprite.y          -= @oy
-      @sprite.z          = @z if @sprite.z!=@z
-      @sprite.opacity    = @opacity if @sprite.opacity!=@opacity
-      @sprite.blend_type = @blend_type if @sprite.blend_type!=@blend_type
-      @sprite.bitmap     = @bitmap if @sprite.bitmap!=@bitmap
+      @sprite.z          = @z if @sprite.z != @z
+      @sprite.opacity    = @opacity if @sprite.opacity != @opacity
+      @sprite.blend_type = @blend_type if @sprite.blend_type != @blend_type
+      @sprite.bitmap     = @bitmap if @sprite.bitmap != @bitmap
     end
   end
 end
@@ -177,7 +176,7 @@ end
 class ParticleEffect_Event < ParticleEffect
   attr_accessor :event
 
-  def initialize(event,viewport=nil)
+  def initialize(event, viewport = nil)
     @event     = event
     @viewport  = viewport
     @particles = []
@@ -185,24 +184,24 @@ class ParticleEffect_Event < ParticleEffect
   end
 
   def setParameters(params)
-    @randomhue,@leftright,@fade,
-    @maxparticless,@hue,@slowdown,
-    @ytop,@ybottom,@xleft,@xright,
-    @xgravity,@ygravity,@xoffset,@yoffset,
-    @opacityvar,@originalopacity = params
+    @randomhue, @leftright, @fade,
+    @maxparticless, @hue, @slowdown,
+    @ytop, @ybottom, @xleft, @xright,
+    @xgravity, @ygravity, @xoffset, @yoffset,
+    @opacityvar, @originalopacity = params
   end
 
-  def loadBitmap(filename,hue)
-    key = [filename,hue]
+  def loadBitmap(filename, hue)
+    key = [filename, hue]
     bitmap = @bitmaps[key]
     if !bitmap || bitmap.disposed?
-      bitmap = AnimatedBitmap.new("Graphics/Fogs/"+filename,hue).deanimate
+      bitmap = AnimatedBitmap.new("Graphics/Fogs/" + filename, hue).deanimate
       @bitmaps[key] = bitmap
     end
     return bitmap
   end
 
-  def initParticles(filename,opacity,zOffset=0,blendtype=1)
+  def initParticles(filename, opacity, zOffset = 0, blendtype = 1)
     @particles = []
     @particlex = []
     @particley = []
@@ -217,20 +216,20 @@ class ParticleEffect_Event < ParticleEffect
     @zoffset   = zOffset
     @bmwidth   = 32
     @bmheight  = 32
-    for i in 0...@maxparticless
+    @maxparticless.times do |i|
       @particlex[i] = -@xoffset
       @particley[i] = -@yoffset
       @particles[i] = ParticleSprite.new(@viewport)
       @particles[i].bitmap = loadBitmap(filename, @hue) if filename
-      if i==0 && @particles[i].bitmap
+      if i == 0 && @particles[i].bitmap
         @bmwidth  = @particles[i].bitmap.width
         @bmheight = @particles[i].bitmap.height
       end
       @particles[i].blend_type = blendtype
       @particles[i].y = @startingy
       @particles[i].x = @startingx
-      @particles[i].z = self.z+zOffset
-      @opacity[i] = rand(opacity/4)
+      @particles[i].z = self.z + zOffset
+      @opacity[i] = rand(opacity / 4)
       @particles[i].opacity = @opacity[i]
       @particles[i].update
     end
@@ -253,29 +252,29 @@ class ParticleEffect_Event < ParticleEffect
     newRealY = @event.real_y
     @startingx = selfX + @xoffset
     @startingy = selfY + @yoffset
-    @__offsetx = (@real_x==newRealX) ? 0 : selfX-@screen_x
-    @__offsety = (@real_y==newRealY) ? 0 : selfY-@screen_y
+    @__offsetx = (@real_x == newRealX) ? 0 : selfX - @screen_x
+    @__offsety = (@real_y == newRealY) ? 0 : selfY - @screen_y
     @screen_x = selfX
     @screen_y = selfY
     @real_x = newRealX
     @real_y = newRealY
-    if @opacityvar>0 && @viewport
-      opac = 255.0/@opacityvar
-      minX = opac*(-@xgravity*1.0 / @slowdown).floor + @startingx
-      maxX = opac*(@xgravity*1.0 / @slowdown).floor + @startingx
-      minY = opac*(-@ygravity*1.0 / @slowdown).floor + @startingy
+    if @opacityvar > 0 && @viewport
+      opac = 255.0 / @opacityvar
+      minX = (opac * (-@xgravity.to_f / @slowdown).floor) + @startingx
+      maxX = (opac * (@xgravity.to_f / @slowdown).floor) + @startingx
+      minY = (opac * (-@ygravity.to_f / @slowdown).floor) + @startingy
       maxY = @startingy
       minX -= @bmwidth
       minY -= @bmheight
       maxX += @bmwidth
       maxY += @bmheight
-      if maxX<0 || maxY<0 || minX>=Graphics.width || minY>=Graphics.height
+      if maxX < 0 || maxY < 0 || minX >= Graphics.width || minY >= Graphics.height
 #        echo "skipped"
         return
       end
     end
-    particleZ = selfZ+@zoffset
-    for i in 0...@maxparticless
+    particleZ = selfZ + @zoffset
+    @maxparticless.times do |i|
       @particles[i].z = particleZ
       if @particles[i].y <= @ytop
         @particles[i].y = @startingy + @yoffset
@@ -309,14 +308,12 @@ class ParticleEffect_Event < ParticleEffect
           @particlex[i] = 0.0
           @particley[i] = 0.0
         end
-      else
-        if @opacity[i] <= 0
-          @opacity[i] = 250
-          @particles[i].y = @startingy + @yoffset
-          @particles[i].x = @startingx + @xoffset
-          @particlex[i] = 0.0
-          @particley[i] = 0.0
-        end
+      elsif @opacity[i] <= 0
+        @opacity[i] = 250
+        @particles[i].y = @startingy + @yoffset
+        @particles[i].x = @startingx + @xoffset
+        @particlex[i] = 0.0
+        @particley[i] = 0.0
       end
       calcParticlePos(i)
       if @randomhue == 1
@@ -333,26 +330,26 @@ class ParticleEffect_Event < ParticleEffect
   def calcParticlePos(i)
     @leftright = rand(2)
     if @leftright == 1
-      xo = -@xgravity*1.0 / @slowdown
+      xo = -@xgravity.to_f / @slowdown
     else
-      xo = @xgravity*1.0 / @slowdown
+      xo = @xgravity.to_f / @slowdown
     end
-    yo = -@ygravity*1.0 / @slowdown
+    yo = -@ygravity.to_f / @slowdown
     @particlex[i] += xo
     @particley[i] += yo
     @particlex[i] -= @__offsetx
     @particley[i] -= @__offsety
     @particlex[i] = @particlex[i].floor
     @particley[i] = @particley[i].floor
-    @particles[i].x = @particlex[i]+@startingx+@xoffset
-    @particles[i].y = @particley[i]+@startingy+@yoffset
+    @particles[i].x = @particlex[i] + @startingx + @xoffset
+    @particles[i].y = @particley[i] + @startingy + @yoffset
   end
 
   def dispose
-    for particle in @particles
+    @particles.each do |particle|
       particle.dispose
     end
-    for bitmap in @bitmaps.values
+    @bitmaps.values.each do |bitmap|
       bitmap.dispose
     end
     @particles.clear
@@ -363,34 +360,34 @@ end
 
 
 class Particle_Engine::Fire < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([0,0,1,20,40,0.5,-64,
-       Graphics.height,-64,Graphics.width,0.5,0.10,-5,-13,30,0])
-    initParticles("particle",250)
+    setParameters([0, 0, 1, 20, 40, 0.5, -64,
+                   Graphics.height, -64, Graphics.width, 0.5, 0.10, -5, -13, 30, 0])
+    initParticles("particle", 250)
   end
 end
 
 
 
 class Particle_Engine::Smoke < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([0,0,0,80,20,0.5,-64,
-       Graphics.height,-64,Graphics.width,0.5,0.10,-5,-15,5,80])
-    initParticles("smoke",250)
+    setParameters([0, 0, 0, 80, 20, 0.5, -64,
+                   Graphics.height, -64, Graphics.width, 0.5, 0.10, -5, -15, 5, 80])
+    initParticles("smoke", 250)
   end
 end
 
 
 
 class Particle_Engine::Teleport < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([1,1,1,10,rand(360),1,-64,
-       Graphics.height,-64,Graphics.width,0,3,-8,-15,20,0])
-    initParticles("wideportal",250)
-    for i in 0...@maxparticless
+    setParameters([1, 1, 1, 10, rand(360), 1, -64,
+                   Graphics.height, -64, Graphics.width, 0, 3, -8, -15, 20, 0])
+    initParticles("wideportal", 250)
+    @maxparticless.times do |i|
       @particles[i].ox = 16
       @particles[i].oy = 16
     end
@@ -400,56 +397,56 @@ end
 
 
 class Particle_Engine::Spirit < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([1,0,1,20,rand(360),0.5,-64,
-       Graphics.height,-64,Graphics.width,0.5,0.10,-5,-13,30,0])
-    initParticles("particle",250)
+    setParameters([1, 0, 1, 20, rand(360), 0.5, -64,
+                   Graphics.height, -64, Graphics.width, 0.5, 0.10, -5, -13, 30, 0])
+    initParticles("particle", 250)
   end
 end
 
 
 
 class Particle_Engine::Explosion < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-     setParameters([0,0,1,20,0,0.5,-64,
-        Graphics.height,-64,Graphics.width,0.5,0.10,-5,-13,30,0])
-    initParticles("explosion",250)
+    setParameters([0, 0, 1, 20, 0, 0.5, -64,
+                   Graphics.height, -64, Graphics.width, 0.5, 0.10, -5, -13, 30, 0])
+    initParticles("explosion", 250)
   end
 end
 
 
 
 class Particle_Engine::Aura < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([0,0,1,20,0,1,-64,
-       Graphics.height,-64,Graphics.width,2,2,-5,-13,30,0])
-    initParticles("particle",250)
+    setParameters([0, 0, 1, 20, 0, 1, -64,
+                   Graphics.height, -64, Graphics.width, 2, 2, -5, -13, 30, 0])
+    initParticles("particle", 250)
   end
 end
 
 
 
 class Particle_Engine::Soot < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([0,0,0,20,0,0.5,-64,
-       Graphics.height,-64,Graphics.width,0.5,0.10,-5,-15,5,80])
-    initParticles("smoke",100,0,2)
+    setParameters([0, 0, 0, 20, 0, 0.5, -64,
+                   Graphics.height, -64, Graphics.width, 0.5, 0.10, -5, -15, 5, 80])
+    initParticles("smoke", 100, 0, 2)
   end
 end
 
 
 
 class Particle_Engine::SootSmoke < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([0,0,0,30,0,0.5,-64,
-       Graphics.height,-64,Graphics.width,0.5,0.10,-5,-15,5,80])
-    initParticles("smoke",100,0)
-    for i in 0...@maxparticless
+    setParameters([0, 0, 0, 30, 0, 0.5, -64,
+                   Graphics.height, -64, Graphics.width, 0.5, 0.10, -5, -15, 5, 80])
+    initParticles("smoke", 100, 0)
+    @maxparticless.times do |i|
       @particles[i].blend_type = rand(6) < 3 ? 1 : 2
     end
   end
@@ -458,23 +455,23 @@ end
 
 
 class Particle_Engine::Rocket < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([0,0,0,60,0,0.5,-64,
-       Graphics.height,-64,Graphics.width,0.5,0,-5,-15,5,80])
-    initParticles("smoke",100,-1)
+    setParameters([0, 0, 0, 60, 0, 0.5, -64,
+                   Graphics.height, -64, Graphics.width, 0.5, 0, -5, -15, 5, 80])
+    initParticles("smoke", 100, -1)
   end
 end
 
 
 
 class Particle_Engine::FixedTeleport < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([1,0,1,10,rand(360),1,
-       -Graphics.height,Graphics.height,0,Graphics.width,0,3,-8,-15,20,0])
-    initParticles("wideportal",250)
-    for i in 0...@maxparticless
+    setParameters([1, 0, 1, 10, rand(360), 1,
+                   -Graphics.height, Graphics.height, 0, Graphics.width, 0, 3, -8, -15, 20, 0])
+    initParticles("wideportal", 250)
+    @maxparticless.times do |i|
       @particles[i].ox = 16
       @particles[i].oy = 16
     end
@@ -485,12 +482,12 @@ end
 
 # By Peter O.
 class Particle_Engine::StarTeleport < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([0,0,1,10,0,1,
-       -Graphics.height,Graphics.height,0,Graphics.width,0,3,-8,-15,10,0])
-    initParticles("star",250)
-    for i in 0...@maxparticless
+    setParameters([0, 0, 1, 10, 0, 1,
+                   -Graphics.height, Graphics.height, 0, Graphics.width, 0, 3, -8, -15, 10, 0])
+    initParticles("star", 250)
+    @maxparticless.times do |i|
       @particles[i].ox = 48
       @particles[i].oy = 48
     end
@@ -500,64 +497,64 @@ end
 
 
 class Particle_Engine::Smokescreen < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([0,0,0,250,0,0.2,-64,
-       Graphics.height,-64,Graphics.width,0.8,0.8,-5,-15,5,80])
-    initParticles(nil,100)
-    for i in 0...@maxparticless
+    setParameters([0, 0, 0, 250, 0, 0.2, -64,
+                   Graphics.height, -64, Graphics.width, 0.8, 0.8, -5, -15, 5, 80])
+    initParticles(nil, 100)
+    @maxparticless.times do |i|
       rnd = rand(3)
-      @opacity[i] = (rnd==0) ? 1 : 100
-      filename = (rnd==0) ? "explosionsmoke" : "smoke"
+      @opacity[i] = (rnd == 0) ? 1 : 100
+      filename = (rnd == 0) ? "explosionsmoke" : "smoke"
       @particles[i].bitmap = loadBitmap(filename, @hue)
     end
   end
 
   def calcParticlePos(i)
-    if @randomhue==1
-      filename = (rand(3)==0) ? "explosionsmoke" : "smoke"
+    if @randomhue == 1
+      filename = (rand(3) == 0) ? "explosionsmoke" : "smoke"
       @particles[i].bitmap = loadBitmap(filename, @hue)
     end
     multiple = 1.7
-    xgrav = @xgravity*multiple/@slowdown
-    xgrav = -xgrav if (rand(2)==1)
-    ygrav = @ygravity*multiple/@slowdown
-    ygrav = -ygrav if (rand(2)==1)
+    xgrav = @xgravity * multiple / @slowdown
+    xgrav = -xgrav if rand(2) == 1
+    ygrav = @ygravity * multiple / @slowdown
+    ygrav = -ygrav if rand(2) == 1
     @particlex[i] += xgrav
     @particley[i] += ygrav
     @particlex[i] -= @__offsetx
     @particley[i] -= @__offsety
     @particlex[i] = @particlex[i].floor
     @particley[i] = @particley[i].floor
-    @particles[i].x = @particlex[i]+@startingx+@xoffset
-    @particles[i].y = @particley[i]+@startingy+@yoffset
+    @particles[i].x = @particlex[i] + @startingx + @xoffset
+    @particles[i].y = @particley[i] + @startingy + @yoffset
   end
 end
 
 
 
 class Particle_Engine::Flare < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([0,0,1,30,10,1,-64,
-       Graphics.height,-64,Graphics.width,2,2,-5,-12,30,0])
-    initParticles("particle",255)
+    setParameters([0, 0, 1, 30, 10, 1, -64,
+                   Graphics.height, -64, Graphics.width, 2, 2, -5, -12, 30, 0])
+    initParticles("particle", 255)
   end
 end
 
 
 
 class Particle_Engine::Splash < ParticleEffect_Event
-  def initialize(event,viewport)
+  def initialize(event, viewport)
     super
-    setParameters([0,0,1,30,255,1,-64,
-       Graphics.height,-64,Graphics.width,4,2,-5,-12,30,0])
-    initParticles("smoke",50)
+    setParameters([0, 0, 1, 30, 255, 1, -64,
+                   Graphics.height, -64, Graphics.width, 4, 2, -5, -12, 30, 0])
+    initParticles("smoke", 50)
   end
 
   def update
     super
-    for i in 0...@maxparticless
+    @maxparticless.times do |i|
       @particles[i].opacity = 50
       @particles[i].update
     end
@@ -569,8 +566,9 @@ end
 class Game_Event < Game_Character
   attr_accessor :pe_refresh
 
-  alias nf_particles_game_map_initialize initialize
-  def initialize(map_id,event,map=nil)
+  alias nf_particles_game_map_initialize initialize unless method_defined?(:nf_particles_game_map_initialize)
+
+  def initialize(map_id, event, map = nil)
     @pe_refresh = false
     begin
       nf_particles_game_map_initialize(map_id, event, map)
@@ -579,7 +577,8 @@ class Game_Event < Game_Character
     end
   end
 
-  alias nf_particles_game_map_refresh refresh
+  alias nf_particles_game_map_refresh refresh unless method_defined?(:nf_particles_game_map_refresh)
+
   def refresh
     nf_particles_game_map_refresh
     @pe_refresh = true

Data/Scripts/005_Sprites/013_Sprite_Player_Offsets.rb

@@ -1,5 +1,8 @@
 
 #[FRAME1 [x,y]],[FRAME2 [x,y], etc.]
+#
+# exact number of pixels that the sprite needs to be moved for each frame
+# add 2 pixels on even frames
 module Outfit_Offsets
   BASE_OFFSET = [[0, 0], [0, 0], [0, 0], [0, 0]]
 
@@ -24,4 +27,8 @@ module Outfit_Offsets
   BIKE_OFFSETS_RIGHT = [[4, -4], [2, -2], [4, -4], [6, -2]]
   BIKE_OFFSETS_UP = [[0, -2], [-2, 0], [0, -2], [2, 0]]
 
+  FISH_OFFSETS_DOWN = [[0, -6], [0, -2], [0, -8], [2, -6]]
+  FISH_OFFSETS_LEFT = [[0, -8], [-6, -6], [0, -8], [2, -8]]
+  FISH_OFFSETS_RIGHT = [[0, -8], [6, -6], [0, -8], [-2, -8]]
+  FISH_OFFSETS_UP = [[0, -6], [0, -6], [0, -6], [2, -4]]
 end

Data/Scripts/005_Sprites/013_Sprite_Wearable.rb

@@ -28,6 +28,31 @@ class Sprite_Wearable < RPG::Sprite
     @sprite.y  += offsets_array[current_frame][1]
   end
 
+  def adjustPositionForScreenScrolling
+    return if !$game_map.scrolling? && !@was_just_scrolling
+    if $game_map.scrolling?
+      @was_just_scrolling=true
+    else
+      @was_just_scrolling=false
+    end
+    offset_x = 0
+    offset_y = 0
+    case $game_map.scroll_direction
+    when DIRECTION_RIGHT
+      offset_x=-8
+    when DIRECTION_LEFT
+      offset_x=8
+    when DIRECTION_UP
+      offset_y=8
+      @sprite.z+=50 #weird layering glitch for some reason otherwise. It's reset to the correct value in the next animation frame
+    when DIRECTION_DOWN
+      offset_y=-8
+    end
+    @sprite.x+=offset_x
+    @sprite.y+=offset_y
+  end
+
+
   def set_sprite_position(action, direction, current_frame)
     @sprite.x = @player_sprite.x - @player_sprite.ox
     @sprite.y = @player_sprite.y - @player_sprite.oy
@@ -72,20 +97,33 @@ class Sprite_Wearable < RPG::Sprite
       elsif direction == DIRECTION_UP
         apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_UP,current_frame)
       end
+    when "fish"
+      if direction == DIRECTION_DOWN
+        apply_sprite_offset(Outfit_Offsets::FISH_OFFSETS_DOWN,current_frame)
+      elsif direction == DIRECTION_LEFT
+        apply_sprite_offset( Outfit_Offsets::FISH_OFFSETS_LEFT,current_frame)
+      elsif direction == DIRECTION_RIGHT
+        apply_sprite_offset( Outfit_Offsets::FISH_OFFSETS_RIGHT,current_frame)
+      elsif direction == DIRECTION_UP
+        apply_sprite_offset( Outfit_Offsets::FISH_OFFSETS_UP,current_frame)
+      end
     else
       @sprite.x = @player_sprite.x - @player_sprite.ox
       @sprite.y = @player_sprite.y - @player_sprite.oy
     end
+    adjustPositionForScreenScrolling()
+
     @sprite.y -= 2 if current_frame % 2 == 1
   end
 
-  def animate(action)
+
+  def animate(action, frame=nil)
     @action = action
-    current_frame = @player_sprite.character.pattern
+    current_frame = @player_sprite.character.pattern if !frame
     direction = @player_sprite.character.direction
     crop_spritesheet(direction)
-    set_sprite_position(@action, direction, current_frame)
     adjust_layer()
+    set_sprite_position(@action, direction, current_frame)
   end
 
   def update(action, filename,color)

Data/Scripts/005_Sprites/014_Sprite_Hat.rb

@@ -6,56 +6,56 @@ class Sprite_Hat < Sprite_Wearable
 
   end
 
-  def set_sprite_position(action, direction, current_frame)
-    @sprite.x = @player_sprite.x - @player_sprite.ox
-    @sprite.y = @player_sprite.y - @player_sprite.oy
-    case action
-    when "run"
-      if direction == DIRECTION_DOWN
-        apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_DOWN, current_frame)
-      elsif direction == DIRECTION_LEFT
-        apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_LEFT, current_frame)
-      elsif direction == DIRECTION_RIGHT
-        apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_RIGHT, current_frame)
-      elsif direction == DIRECTION_UP
-        apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_UP, current_frame)
-      end
-    when "surf"
-      if direction == DIRECTION_DOWN
-        apply_sprite_offset(Outfit_Offsets::SURF_OFFSETS_DOWN,current_frame)
-      elsif direction == DIRECTION_LEFT
-        apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_LEFT,current_frame)
-      elsif direction == DIRECTION_RIGHT
-        apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_RIGHT,current_frame)
-      elsif direction == DIRECTION_UP
-        apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_UP,current_frame)
-      end
-    when "dive"
-      if direction == DIRECTION_DOWN
-        apply_sprite_offset(Outfit_Offsets::DIVE_OFFSETS_DOWN,current_frame)
-      elsif direction == DIRECTION_LEFT
-        apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_LEFT,current_frame)
-      elsif direction == DIRECTION_RIGHT
-        apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_RIGHT,current_frame)
-      elsif direction == DIRECTION_UP
-        apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_UP,current_frame)
-      end
-    when "bike"
-      if direction == DIRECTION_DOWN
-        apply_sprite_offset(Outfit_Offsets::BIKE_OFFSETS_DOWN,current_frame)
-      elsif direction == DIRECTION_LEFT
-        apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_LEFT,current_frame)
-      elsif direction == DIRECTION_RIGHT
-        apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_RIGHT,current_frame)
-      elsif direction == DIRECTION_UP
-        apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_UP,current_frame)
-      end
-    else
-      @sprite.x = @player_sprite.x - @player_sprite.ox
-      @sprite.y = @player_sprite.y - @player_sprite.oy
-    end
-    @sprite.y -= 2 if current_frame % 2 == 1
-  end
+  # def set_sprite_position(action, direction, current_frame)
+  #   @sprite.x = @player_sprite.x - @player_sprite.ox
+  #   @sprite.y = @player_sprite.y - @player_sprite.oy
+  #   case action
+  #   when "run"
+  #     if direction == DIRECTION_DOWN
+  #       apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_DOWN, current_frame)
+  #     elsif direction == DIRECTION_LEFT
+  #       apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_LEFT, current_frame)
+  #     elsif direction == DIRECTION_RIGHT
+  #       apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_RIGHT, current_frame)
+  #     elsif direction == DIRECTION_UP
+  #       apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_UP, current_frame)
+  #     end
+  #   when "surf"
+  #     if direction == DIRECTION_DOWN
+  #       apply_sprite_offset(Outfit_Offsets::SURF_OFFSETS_DOWN,current_frame)
+  #     elsif direction == DIRECTION_LEFT
+  #       apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_LEFT,current_frame)
+  #     elsif direction == DIRECTION_RIGHT
+  #       apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_RIGHT,current_frame)
+  #     elsif direction == DIRECTION_UP
+  #       apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_UP,current_frame)
+  #     end
+  #   when "dive"
+  #     if direction == DIRECTION_DOWN
+  #       apply_sprite_offset(Outfit_Offsets::DIVE_OFFSETS_DOWN,current_frame)
+  #     elsif direction == DIRECTION_LEFT
+  #       apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_LEFT,current_frame)
+  #     elsif direction == DIRECTION_RIGHT
+  #       apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_RIGHT,current_frame)
+  #     elsif direction == DIRECTION_UP
+  #       apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_UP,current_frame)
+  #     end
+  #   when "bike"
+  #     if direction == DIRECTION_DOWN
+  #       apply_sprite_offset(Outfit_Offsets::BIKE_OFFSETS_DOWN,current_frame)
+  #     elsif direction == DIRECTION_LEFT
+  #       apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_LEFT,current_frame)
+  #     elsif direction == DIRECTION_RIGHT
+  #       apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_RIGHT,current_frame)
+  #     elsif direction == DIRECTION_UP
+  #       apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_UP,current_frame)
+  #     end
+  #   else
+  #     @sprite.x = @player_sprite.x - @player_sprite.ox
+  #     @sprite.y = @player_sprite.y - @player_sprite.oy
+  #   end
+  #   @sprite.y -= 2 if current_frame % 2 == 1
+  # end
 
 end
 

Data/Scripts/005_Sprites/016_Sprite_Player.rb

@@ -17,6 +17,7 @@ class Sprite_Player < Sprite_Character
     getClothedPlayerSprite(true)
   end
 
+
   def updateCharacterBitmap
     skinTone = $Trainer.skin_tone ? $Trainer.skin_tone : 0
     baseBitmapFilename = getBaseOverworldSpriteFilename(@character_name, skinTone)
@@ -78,9 +79,7 @@ class Sprite_Player < Sprite_Character
     return baseBitmap
   end
 
-  def positionHair(baseBitmap, hairBirmap, offset)
-    baseBitmap.blt(offset[0], offset[1], hairBirmap, hairBirmap.rect)
-  end
+
 
 
   def update

Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb

@@ -177,7 +177,7 @@ class PokeBattle_Scene
     sprite.setBitmapDirectly(generate_front_trainer_sprite_bitmap())
     sprite.zoom_x=2
     sprite.zoom_y=2
-    sprite.z=30 + idxTrainer
+    sprite.z=100 + idxTrainer
 
     sprite.mirror =true
     @sprites["player_#{idxTrainer + 1}"] = sprite

Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb

@@ -72,9 +72,11 @@ end
 
 def applyRoamWeather()
   return if $game_screen.weather_type != :None
-  currently_roaming = $PokemonGlobal.roamPosition.keys
+  currently_roaming = getAllCurrentlyRoamingPokemon()
   currently_roaming.each do |roamer_id|
-    roamerOnCurrentMap = $PokemonGlobal.roamPosition[roamer_id] == $game_map.map_id
+    roamer_switch = Settings::ROAMING_SPECIES[roamer_id][2]
+    roamer_active = $game_switches[roamer_switch]
+    roamerOnCurrentMap = $PokemonGlobal.roamPosition[roamer_id] == $game_map.map_id && roamer_active
     if roamerOnCurrentMap
       return if $PokemonGlobal.roamPokemonCaught[roamer_id]
       weather = Settings::ROAMING_SPECIES[roamer_id][6]

Data/Scripts/013_Items/002_Item_Effects.rb

@@ -244,7 +244,7 @@ ItemHandlers::UseInField.copy(:BICYCLE, :RACEBIKE)
 
 ItemHandlers::UseInField.add(:OLDROD, proc { |item|
   notCliff = $game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player)
-  if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff)
+  if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) || $PokemonGlobal.surfing
     pbMessage(_INTL("Can't use that here."))
     next 0
   end
@@ -257,7 +257,7 @@ ItemHandlers::UseInField.add(:OLDROD, proc { |item|
 
 ItemHandlers::UseInField.add(:GOODROD, proc { |item|
   notCliff = $game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player)
-  if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff)
+  if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) || $PokemonGlobal.surfing
     pbMessage(_INTL("Can't use that here."))
     next 0
   end
@@ -270,7 +270,7 @@ ItemHandlers::UseInField.add(:GOODROD, proc { |item|
 
 ItemHandlers::UseInField.add(:SUPERROD, proc { |item|
   notCliff = $game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player)
-  if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff)
+  if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) || $PokemonGlobal.surfing
     pbMessage(_INTL("Can't use that here."))
     next 0
   end
@@ -1075,6 +1075,8 @@ ItemHandlers::UseOnPokemon.add(:ABILITYCAPSULE, proc { |item, pkmn, scene|
   if scene.pbConfirm(_INTL("Would you like to change {1}'s Ability to {2}?",
                            pkmn.name, newabilname))
     pkmn.ability_index = newabil
+    pkmn.ability = GameData::Ability.get((newabil == 0) ? abil1 : abil2).id
+
     #pkmn.ability = GameData::Ability.get((newabil == 0) ? abil1 : abil2).id
 	  scene.pbHardRefresh
     scene.pbDisplay(_INTL("{1}'s Ability changed to {2}!", pkmn.name, newabilname))

Data/Scripts/013_Items/004_1_PokeradarUI.rb

@@ -10,7 +10,7 @@ class PokeRadar_UI
 
   ICON_LINE_END = 450
 
-  GRAPHICS_Z = 99999
+  GRAPHICS_Z = 99998
 
   def initialize(seenPokemon = [], unseenPokemon = [], rarePokemon = [])
     @seen_pokemon = seenPokemon

Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb

@@ -18,6 +18,9 @@ def pbLoadTrainer(tr_type, tr_name, tr_version = 0)
   raise _INTL("Trainer type {1} does not exist.", tr_type) if !tr_type_data
   tr_type = tr_type_data.id
   trainer_data = getTrainersDataMode.try_get(tr_type, tr_name, tr_version)
+  if !trainer_data
+    trainer_data = GameData::Trainer.try_get(tr_type, tr_name, tr_version)
+  end
   return (trainer_data) ? trainer_data.to_trainer : nil
 end
 

Data/Scripts/016_UI/020_UI_PokeMart.rb

@@ -587,6 +587,7 @@ class PokemonMartScreen
     @scene.pbStartBuyScene(@stock,@adapter)
     item=nil
     loop do
+      pbWait(4)
       item=@scene.pbChooseBuyItem
       break if !item
       quantity=0

Data/Scripts/016_UI/022_UI_PurifyChamber.rb

@@ -5,7 +5,7 @@ class Player < Trainer
   attr_accessor :has_snag_machine
   attr_accessor :seen_purify_chamber
 
-  alias __shadowPkmn__initialize initialize
+  alias __shadowPkmn__initialize initialize unless method_defined?(:__shadowPkmn__initialize)
   def initialize(name, trainer_type)
     __shadowPkmn__initialize(name, trainer_type)
     @has_snag_machine    = false

Data/Scripts/025-Randomizer/randomizer gym leader edit.rb

@@ -41,17 +41,17 @@ def Kernel.initRandomTypeArray()
   $game_variables[VAR_GYM_TYPES_ARRAY] = $game_switches[SWITCH_RANDOMIZED_GYM_TYPES] ? typesArray : GYM_TYPES_ARRAY
 end
 
-def setRivalStarter(starter1, starter2, starter3, choice)
-  starters = [starter1, starter2, starter3]
-  starters.delete_at(choice)
-  if starters[0] > NB_POKEMON || starters[1] > NB_POKEMON
-    rivalStarter = starters[0]
-  else
-    rivalStarter = starters[0] * NB_POKEMON + starters[1]
-  end
-  pbSet(VAR_RIVAL_STARTER, rivalStarter)
-  $game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
-end
+# def setRivalStarter(starter1, starter2, starter3, choice)
+#   starters = [starter1, starter2, starter3]
+#   starters.delete_at(choice)
+#   if starters[0] > NB_POKEMON || starters[1] > NB_POKEMON
+#     rivalStarter = starters[0]
+#   else
+#     rivalStarter = starters[0] * NB_POKEMON + starters[1]
+#   end
+#   pbSet(VAR_RIVAL_STARTER, rivalStarter)
+#   $game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
+# end
 
 def setRivalStarterSpecific(rivalStarter)
   pbSet(VAR_RIVAL_STARTER, rivalStarter)
@@ -734,13 +734,13 @@ def fixRivalStarter()
   end
   starterChoice = pbGet(7)
 
-  s1 = $PokemonGlobal.psuedoBSTHash[1]
-  s2 = $PokemonGlobal.psuedoBSTHash[4]
-  s3 = $PokemonGlobal.psuedoBSTHash[7]
-  setRivalStarter(s3, s2, s1, starterChoice)
-
+  setRivalStarter(0, 1) if starterChoice == 2
+  setRivalStarter(0, 2) if starterChoice == 1
+  setRivalStarter(1, 2) if starterChoice == 0
+  setRivalStarter(0, 1) if starterChoice > 2
+  echoln pbGet(VAR_RIVAL_STARTER)
   #evolve en fct des badges
-  rivalStarter = pbGet(250)
+  rivalStarter = pbGet(VAR_RIVAL_STARTER)
 
   if $game_switches[68] #beat blue cerulean
     rivalStarter = evolveBody(rivalStarter)

Data/Scripts/051_AddOns/GameplayUtils.rb

@@ -176,11 +176,11 @@ end
 
 
 def playPokeFluteAnimation
-  return if $Trainer.outfit != 0
-  $game_player.setDefaultCharName("players/pokeflute", 0, false)
-  Graphics.update
-  Input.update
-  pbUpdateSceneMap
+  # return if $Trainer.outfit != 0
+  # $game_player.setDefaultCharName("players/pokeflute", 0, false)
+  # Graphics.update
+  # Input.update
+  # pbUpdateSceneMap
 end
 
 def restoreDefaultCharacterSprite(charset_number = 0)
@@ -1110,6 +1110,7 @@ def setRivalStarter(starterIndex1,starterIndex2)
     starter = GameData::Species.get(starterSpecies.get_baby_species(false)).id_number
   end
   pbSet(VAR_RIVAL_STARTER,starter)
+  $game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
   return starter
 end
 

Data/Scripts/051_AddOns/HiddenAbilityMaps.rb

@@ -27,7 +27,7 @@ Events.onWildPokemonCreate+=proc {|sender,e|
   if player_on_hidden_ability_map || isAlwaysHiddenAbilityMap($game_map.map_id)
     pokemon=e[0]
     chosenAbility = pokemon.getAbilityList.sample #format: [[:ABILITY, index],...]
-    #pokemon.ability = chosenAbility[0]
+    pokemon.ability = chosenAbility[0]
     pokemon.ability_index = chosenAbility[1]
   end
 }

Data/Scripts/051_AddOns/MultiSaves.rb

@@ -64,7 +64,7 @@ def migrateOldSavesToCharacterCustomization()
     $Trainer.unlocked_hairstyles = [Settings::DEFAULT_OUTFIT_MALE, Settings::DEFAULT_OUTFIT_FEMALE]
   end
 
-  if !$Trainer.clothes || !$Trainer.hair || !$Trainer.hat
+  if !$Trainer.clothes || !$Trainer.hair #|| !$Trainer.hat
     setupStartingOutfit()
   end
 end

Data/Scripts/051_AddOns/New Balls.rb

@@ -30,7 +30,9 @@ next catchRate
 })
 BallHandlers::OnCatch.add(:ABILITYBALL,proc{|ball,battle,pokemon|
   species = getSpecies(dexNum(pokemon))
-  pokemon.ability_index= getAbilityIndexFromID(species.hidden_abilities[-1],pokemon)
+  ability = species.hidden_abilities[-1]
+  pokemon.ability = ability
+  pokemon.ability_index= getAbilityIndexFromID(ability,pokemon)
 })
 
 #VIRUS BALL 27  - give pokerus

Data/Scripts/051_AddOns/New Items effects.rb

@@ -1868,13 +1868,27 @@ ItemHandlers::UseInField.add(:DEVONSCOPE, proc { |item|
 #TRACKER (for roaming legendaries)
 ItemHandlers::UseInField.add(:REVEALGLASS, proc { |item|
   track_pokemon()
+  next true
 })
 ItemHandlers::UseFromBag.add(:REVEALGLASS, proc { |item|
   track_pokemon()
+  next true
 })
 
+def getAllCurrentlyRoamingPokemon
+  currently_roaming = []
+  Settings::ROAMING_SPECIES.each_with_index do |data, i|
+    next if !GameData::Species.exists?(data[0])
+    next if data[2] > 0 && !$game_switches[data[2]]   # Isn't roaming
+    next if $PokemonGlobal.roamPokemon[i] == true   # Roaming Pokémon has been caught
+    currently_roaming << i
+  end
+  return currently_roaming
+end
+
 def track_pokemon()
-  currently_roaming = $PokemonGlobal.roamPosition.keys
+  currently_roaming = getAllCurrentlyRoamingPokemon()
+  echoln currently_roaming
   weather_data = []
   mapinfos = $RPGVX ? load_data("Data/MapInfos.rvdata") : load_data("Data/MapInfos.rxdata")
   currently_roaming.each do |roamer_id|
@@ -1891,12 +1905,11 @@ def track_pokemon()
     end
     weather_data << forecast_msg if forecast_msg && !weather_data.include?(forecast_msg)
   end
-
+  weather_data << _INTL("No unusual weather patterns have been detected.") if weather_data.empty?
   weather_data.each do |message|
     Kernel.pbMessage(message)
   end
 
-
   # nbRoaming = 0
   # if Settings::ROAMING_SPECIES.length == 0
   #   Kernel.pbMessage(_INTL("No roaming Pokémon defined."))

Data/VERSION

@@ -1 +1 @@
-6.1
+6.2