diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 7967a5432..41edc8e26 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index ece08c031..a311b9b5e 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 2249bec14..901f2bb2b 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 9bb30211c..1e9f13efe 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index 004ee903d..be622f513 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index 3e62ba6d2..fe767fa0b 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/Map056.rxdata b/Data/Map056.rxdata
index 65969ff39..030b16aac 100644
Binary files a/Data/Map056.rxdata and b/Data/Map056.rxdata differ
diff --git a/Data/Map060.rxdata b/Data/Map060.rxdata
index 780063924..21bfaf28d 100644
Binary files a/Data/Map060.rxdata and b/Data/Map060.rxdata differ
diff --git a/Data/Map159.rxdata b/Data/Map159.rxdata
index 1de9a44bf..ef51ad835 100644
Binary files a/Data/Map159.rxdata and b/Data/Map159.rxdata differ
diff --git a/Data/Map237.rxdata b/Data/Map237.rxdata
index 659cf8c01..041082424 100644
Binary files a/Data/Map237.rxdata and b/Data/Map237.rxdata differ
diff --git a/Data/Map240.rxdata b/Data/Map240.rxdata
index 444bd9c3b..da0bfbc15 100644
Binary files a/Data/Map240.rxdata and b/Data/Map240.rxdata differ
diff --git a/Data/Map256.rxdata b/Data/Map256.rxdata
index b5fcb280e..6d9643c90 100644
Binary files a/Data/Map256.rxdata and b/Data/Map256.rxdata differ
diff --git a/Data/Map278.rxdata b/Data/Map278.rxdata
index 4f26c4117..448ea918c 100644
Binary files a/Data/Map278.rxdata and b/Data/Map278.rxdata differ
diff --git a/Data/Map338.rxdata b/Data/Map338.rxdata
index 644118abf..33fbe8b32 100644
Binary files a/Data/Map338.rxdata and b/Data/Map338.rxdata differ
diff --git a/Data/Map460.rxdata b/Data/Map460.rxdata
index 5cd099445..4a081b1bc 100644
Binary files a/Data/Map460.rxdata and b/Data/Map460.rxdata differ
diff --git a/Data/Map482.rxdata b/Data/Map482.rxdata
index 18b5b4647..b33ff6081 100644
Binary files a/Data/Map482.rxdata and b/Data/Map482.rxdata differ
diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata
index 72dc94af5..1f251b4d1 100644
Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ
diff --git a/Data/Map755.rxdata b/Data/Map755.rxdata
index 68c1a80a5..8b9a91b30 100644
Binary files a/Data/Map755.rxdata and b/Data/Map755.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 4c2845770..dbc4a5c33 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index 0566d9e9f..a8d4fca26 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/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.2'
-  GAME_VERSION_NUMBER = "6.2.2"
+  GAME_VERSION = '6.2.3'
+  GAME_VERSION_NUMBER = "6.2.3"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
diff --git a/Data/Scripts/004_Game classes/004_Game_Map.rb b/Data/Scripts/004_Game classes/004_Game_Map.rb
index 8f308123e..7e483653e 100644
--- a/Data/Scripts/004_Game classes/004_Game_Map.rb	
+++ b/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
diff --git a/Data/Scripts/004_Game classes/009_Game_Player.rb b/Data/Scripts/004_Game classes/009_Game_Player.rb
index cc2dfdbd0..e26ff6dda 100644
--- a/Data/Scripts/004_Game classes/009_Game_Player.rb	
+++ b/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
diff --git a/Data/Scripts/005_Sprites/013_Sprite_Wearable.rb b/Data/Scripts/005_Sprites/013_Sprite_Wearable.rb
index ec38ea994..250ba8f54 100644
--- a/Data/Scripts/005_Sprites/013_Sprite_Wearable.rb
+++ b/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
@@ -86,6 +111,8 @@ class Sprite_Wearable < RPG::Sprite
       @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
 
@@ -95,8 +122,8 @@ class Sprite_Wearable < RPG::Sprite
     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)
diff --git a/Data/Scripts/005_Sprites/016_Sprite_Player.rb b/Data/Scripts/005_Sprites/016_Sprite_Player.rb
index 8e8756452..8cc799248 100644
--- a/Data/Scripts/005_Sprites/016_Sprite_Player.rb
+++ b/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
diff --git a/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb b/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb
index 57b9bbdc9..b381606aa 100644
--- a/Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb	
+++ b/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
 
diff --git a/Data/Scripts/016_UI/020_UI_PokeMart.rb b/Data/Scripts/016_UI/020_UI_PokeMart.rb
index 48a5efc00..788477d39 100644
--- a/Data/Scripts/016_UI/020_UI_PokeMart.rb
+++ b/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
diff --git a/Data/Scripts/051_AddOns/GameplayUtils.rb b/Data/Scripts/051_AddOns/GameplayUtils.rb
index 03c1a820d..6a18b3516 100644
--- a/Data/Scripts/051_AddOns/GameplayUtils.rb
+++ b/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)
diff --git a/Data/Scripts/051_AddOns/New Balls.rb b/Data/Scripts/051_AddOns/New Balls.rb
index 567dfb8d5..235da9d79 100644
--- a/Data/Scripts/051_AddOns/New Balls.rb	
+++ b/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
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index 61cba7ea2..a45219f5e 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 0f9b4ae5d..868d49e59 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 54a33692b..bf193ac10 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index d134fe135..d54a94d58 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index d9bd35260..c7ea19a7a 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ
diff --git a/Data/messages.dat b/Data/messages.dat
index e260e53c8..aeed922f7 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/Graphics/Battlers/Eggs/098.png b/Graphics/Battlers/Eggs/098.png
deleted file mode 100644
index 4fa652888..000000000
Binary files a/Graphics/Battlers/Eggs/098.png and /dev/null differ
diff --git a/Graphics/Battlers/Eggs/133.png b/Graphics/Battlers/Eggs/133.png
index f176b10b7..b42c47fb2 100644
Binary files a/Graphics/Battlers/Eggs/133.png and b/Graphics/Battlers/Eggs/133.png differ
diff --git a/Graphics/Battlers/Eggs/137.png b/Graphics/Battlers/Eggs/137.png
index 6d2b58aa9..f92a12455 100644
Binary files a/Graphics/Battlers/Eggs/137.png and b/Graphics/Battlers/Eggs/137.png differ
diff --git a/Graphics/Battlers/Eggs/147.png b/Graphics/Battlers/Eggs/147.png
index 2819a80f8..fec1ef55c 100644
Binary files a/Graphics/Battlers/Eggs/147.png and b/Graphics/Battlers/Eggs/147.png differ
diff --git a/Graphics/Battlers/Eggs/155.png b/Graphics/Battlers/Eggs/155.png
index c3f594ff7..23f6fe21d 100644
Binary files a/Graphics/Battlers/Eggs/155.png and b/Graphics/Battlers/Eggs/155.png differ
diff --git a/Graphics/Battlers/Eggs/170.png b/Graphics/Battlers/Eggs/170.png
index 546392b17..5a544bf81 100644
Binary files a/Graphics/Battlers/Eggs/170.png and b/Graphics/Battlers/Eggs/170.png differ
diff --git a/Graphics/Battlers/Eggs/172.png b/Graphics/Battlers/Eggs/172.png
index f0335de8d..d4bb0f2c8 100644
Binary files a/Graphics/Battlers/Eggs/172.png and b/Graphics/Battlers/Eggs/172.png differ
diff --git a/Graphics/Battlers/Eggs/173.png b/Graphics/Battlers/Eggs/173.png
index db8e3d5f0..e4ebf104c 100644
Binary files a/Graphics/Battlers/Eggs/173.png and b/Graphics/Battlers/Eggs/173.png differ
diff --git a/Graphics/Battlers/Eggs/201.png b/Graphics/Battlers/Eggs/201.png
index 4321b8977..27707cfde 100644
Binary files a/Graphics/Battlers/Eggs/201.png and b/Graphics/Battlers/Eggs/201.png differ
diff --git a/Graphics/Battlers/Eggs/238.png b/Graphics/Battlers/Eggs/238.png
index f5ef003d3..8191351ad 100644
Binary files a/Graphics/Battlers/Eggs/238.png and b/Graphics/Battlers/Eggs/238.png differ
diff --git a/Graphics/Battlers/Eggs/239.png b/Graphics/Battlers/Eggs/239.png
index 6fca68a8d..169819318 100644
Binary files a/Graphics/Battlers/Eggs/239.png and b/Graphics/Battlers/Eggs/239.png differ
diff --git a/Graphics/Battlers/Eggs/240.png b/Graphics/Battlers/Eggs/240.png
index 24631bfe9..ca76c8965 100644
Binary files a/Graphics/Battlers/Eggs/240.png and b/Graphics/Battlers/Eggs/240.png differ
diff --git a/Graphics/Battlers/Eggs/253.png b/Graphics/Battlers/Eggs/253.png
index 5bff15b0a..16e367d31 100644
Binary files a/Graphics/Battlers/Eggs/253.png and b/Graphics/Battlers/Eggs/253.png differ
diff --git a/Graphics/Battlers/Eggs/257.png b/Graphics/Battlers/Eggs/257.png
index 74582d152..db3aa5ef9 100644
Binary files a/Graphics/Battlers/Eggs/257.png and b/Graphics/Battlers/Eggs/257.png differ
diff --git a/Graphics/Battlers/Eggs/258.png b/Graphics/Battlers/Eggs/258.png
index ec46bf7e3..0e573f297 100644
Binary files a/Graphics/Battlers/Eggs/258.png and b/Graphics/Battlers/Eggs/258.png differ
diff --git a/Graphics/Battlers/Eggs/259.png b/Graphics/Battlers/Eggs/259.png
index 1c0218600..9ae564d86 100644
Binary files a/Graphics/Battlers/Eggs/259.png and b/Graphics/Battlers/Eggs/259.png differ
diff --git a/Graphics/Battlers/Eggs/260.png b/Graphics/Battlers/Eggs/260.png
index 54e2ecaa4..6d232dcaf 100644
Binary files a/Graphics/Battlers/Eggs/260.png and b/Graphics/Battlers/Eggs/260.png differ
diff --git a/Graphics/Battlers/Eggs/261.png b/Graphics/Battlers/Eggs/261.png
index 1a72c797b..ca6b0030c 100644
Binary files a/Graphics/Battlers/Eggs/261.png and b/Graphics/Battlers/Eggs/261.png differ
diff --git a/Graphics/Battlers/Eggs/285.png b/Graphics/Battlers/Eggs/285.png
index 41cee70fe..1b5ee41ee 100644
Binary files a/Graphics/Battlers/Eggs/285.png and b/Graphics/Battlers/Eggs/285.png differ
diff --git a/Graphics/Battlers/Eggs/330.png b/Graphics/Battlers/Eggs/330.png
index 8ff5a553e..7862a7a62 100644
Binary files a/Graphics/Battlers/Eggs/330.png and b/Graphics/Battlers/Eggs/330.png differ
diff --git a/Graphics/Battlers/Eggs/343.png b/Graphics/Battlers/Eggs/343.png
index 0df1ae9fc..f81ecf5cd 100644
Binary files a/Graphics/Battlers/Eggs/343.png and b/Graphics/Battlers/Eggs/343.png differ
diff --git a/Graphics/Battlers/Eggs/344.png b/Graphics/Battlers/Eggs/344.png
index 53735a491..7e3f6237b 100644
Binary files a/Graphics/Battlers/Eggs/344.png and b/Graphics/Battlers/Eggs/344.png differ
diff --git a/Graphics/Battlers/Eggs/345.png b/Graphics/Battlers/Eggs/345.png
index 2155793f9..9db54a210 100644
Binary files a/Graphics/Battlers/Eggs/345.png and b/Graphics/Battlers/Eggs/345.png differ
diff --git a/Graphics/Battlers/Eggs/411.png b/Graphics/Battlers/Eggs/411.png
index f3fdd2fb7..49abd609f 100644
Binary files a/Graphics/Battlers/Eggs/411.png and b/Graphics/Battlers/Eggs/411.png differ
diff --git a/Graphics/Battlers/Eggs/414.png b/Graphics/Battlers/Eggs/414.png
index 0bab86efa..ec9702f97 100644
Binary files a/Graphics/Battlers/Eggs/414.png and b/Graphics/Battlers/Eggs/414.png differ
diff --git a/Graphics/Characters/BW (14).png b/Graphics/Characters/BW (14).png
index eacc41199..a641a2b0e 100644
Binary files a/Graphics/Characters/BW (14).png and b/Graphics/Characters/BW (14).png differ
diff --git a/Graphics/Transitions/vsBar_LEADER_Brock.png b/Graphics/Transitions/vsBar_LEADER_Brock.png
index 1456ec820..4eacb2f80 100644
Binary files a/Graphics/Transitions/vsBar_LEADER_Brock.png and b/Graphics/Transitions/vsBar_LEADER_Brock.png differ
diff --git a/Graphics/Transitions/vsBar_LEADER_Brock_old.png b/Graphics/Transitions/vsBar_LEADER_Brock_old.png
deleted file mode 100644
index 4eacb2f80..000000000
Binary files a/Graphics/Transitions/vsBar_LEADER_Brock_old.png and /dev/null differ