diff --git a/Data/.DS_Store b/Data/.DS_Store
index 4dd5b8e67..4aaabb27b 100644
Binary files a/Data/.DS_Store and b/Data/.DS_Store differ
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 ff0e4bf55..d8f037637 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 4479164ca..3e173607b 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/Map384.rxdata b/Data/Map384.rxdata
index e0ddade27..c23b7848f 100644
Binary files a/Data/Map384.rxdata and b/Data/Map384.rxdata differ
diff --git a/Data/Map565.rxdata b/Data/Map565.rxdata
index a889f707d..aa77df324 100644
Binary files a/Data/Map565.rxdata and b/Data/Map565.rxdata differ
diff --git a/Data/Map782.rxdata b/Data/Map782.rxdata
index 097325aa2..9638c527e 100644
Binary files a/Data/Map782.rxdata and b/Data/Map782.rxdata differ
diff --git a/Data/Map783.rxdata b/Data/Map783.rxdata
index f74c255eb..0933ee099 100644
Binary files a/Data/Map783.rxdata and b/Data/Map783.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 615375359..da9b583a4 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 7ebccf695..fb0cda996 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -5,7 +5,7 @@
 #==============================================================================#
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION_NUMBER = "6.8.1"
+  GAME_VERSION_NUMBER = "6.8.2"
   LATEST_GAME_RELEASE = "6.8"
 
   HOENN_VERSION_NUMBER = "1.1.0"
@@ -212,6 +212,17 @@ module Settings
   FIRE_STARTERS = [:CHARMANDER, :CYNDAQUIL, :TORCHIC, :CHIMCHAR, :FENNEKIN]
   WATER_STARTERS = [:SQUIRTLE, :TOTODILE, :MUDKIP, :PIPLUP, :FROAKIE]
 
+  ALTERING_CAVE_ENCOUNTERS =
+    {
+    :MONDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :HOUNDOUR],
+    :TUESDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :SCRAGGY],
+    :WEDNESDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :PINECO],
+    :THURSDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :MAREEP],
+    :FRIDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :TEDDIURSA],
+    :SATURDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :AIPOM],
+    :SUNDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :SMEARGLE],
+  }
+
   #=============================================================================
 
   # The amount of money the player starts the game with.
diff --git a/Data/Scripts/004_Game classes/004_Game_Map.rb b/Data/Scripts/004_Game classes/004_Game_Map.rb
index f1103e821..92b277d28 100644
--- a/Data/Scripts/004_Game classes/004_Game_Map.rb	
+++ b/Data/Scripts/004_Game classes/004_Game_Map.rb	
@@ -619,3 +619,52 @@ def pbScrollMap(direction, distance, speed)
     end
   end
 end
+
+def pbScrollMapDiagonal(distance_horizontal, distance_vertical, speed)
+  real_x = distance_horizontal.abs * Game_Map::REAL_RES_X
+  real_y = distance_vertical.abs * Game_Map::REAL_RES_Y
+
+  if speed == 0
+    if distance_horizontal > 0
+      $game_map.scroll_right(real_x)
+    elsif distance_horizontal < 0
+      $game_map.scroll_left(real_x)
+    end
+    if distance_vertical > 0
+      $game_map.scroll_down(real_y)
+    elsif distance_vertical < 0
+      $game_map.scroll_up(real_y)
+    end
+  else
+    x_rest = real_x
+    y_rest = real_y
+    step = 2 ** speed
+    loop do
+      Graphics.update
+      Input.update
+      moved = false
+      if x_rest > 0
+        dx = [step, x_rest].min
+        if distance_horizontal > 0
+          $game_map.scroll_right(dx)
+        else
+          $game_map.scroll_left(dx)
+        end
+        x_rest -= dx
+        moved = true
+      end
+      if y_rest > 0
+        dy = [step, y_rest].min
+        if distance_vertical > 0
+          $game_map.scroll_down(dy)
+        else
+          $game_map.scroll_up(dy)
+        end
+        y_rest -= dy
+        moved = true
+      end
+      pbUpdateSceneMap
+      break if !moved || (x_rest <= 0 && y_rest <= 0)
+    end
+  end
+end
diff --git a/Data/Scripts/004_Game classes/007_Game_Character.rb b/Data/Scripts/004_Game classes/007_Game_Character.rb
index e802e4835..fc96da6d4 100644
--- a/Data/Scripts/004_Game classes/007_Game_Character.rb	
+++ b/Data/Scripts/004_Game classes/007_Game_Character.rb	
@@ -34,7 +34,6 @@ class Game_Character
   attr_accessor :shadow_offset
   attr_accessor :animation_speed
   attr_accessor :step_anime
-
   def initialize(map = nil)
     @map = map
     @id = 0
@@ -420,6 +419,7 @@ class Game_Character
   # Movement
   #=============================================================================
   def moving?
+    return true if @diag_move_active
     return @real_x != @x * Game_Map::REAL_RES_X ||
       @real_y != @y * Game_Map::REAL_RES_Y
   end
@@ -1235,6 +1235,10 @@ class Game_Character
   end
 
   def update_move
+    if @diag_move_active
+      update_diagonal_move
+      return
+    end
     # Move the character (the 0.1 catches rounding errors)
     distance = (jumping?) ? jump_speed_real : move_speed_real
     dest_x = @x * Game_Map::REAL_RES_X
@@ -1326,5 +1330,68 @@ class Game_Character
     return (dx + dy) - 1
   end
 
+  def move_diagonal_freeform(distance_horizontal, distance_vertical, speed)
+    real_dx = distance_horizontal * Game_Map::REAL_RES_X
+    real_dy = distance_vertical * Game_Map::REAL_RES_Y
+    total_dist = Math.sqrt((real_dx ** 2) + (real_dy ** 2))
+    return if total_dist == 0
 
+    unless @direction_fix
+      if real_dx.abs > real_dy.abs
+        @direction = (real_dx < 0) ? 4 : 6
+      else
+        @direction = (real_dy < 0) ? 8 : 2
+      end
+    end
+
+    @diag_start_x  = @real_x
+    @diag_start_y  = @real_y
+    @diag_real_dx  = real_dx
+    @diag_real_dy  = real_dy
+    @diag_total_dist = total_dist
+    @diag_traveled = 0
+    step = (speed == 6) ? 64 : (speed == 5) ? 32 : (2 ** (speed + 1)) * 0.8
+    @diag_step = step * 40.0 / Graphics.frame_rate
+    @diag_move_active = true
+  end
+
+  def stop_diagonal_move
+    return unless @diag_move_active
+    @diag_move_active = false
+    calculate_bush_depth
+    triggerLeaveTile
+  end
+
+  def update_diagonal_move
+    move_amount = [@diag_step, @diag_total_dist - @diag_traveled].min
+    @diag_traveled += move_amount
+    frac = @diag_traveled / @diag_total_dist
+    @real_x = @diag_start_x + (@diag_real_dx * frac)
+    @real_y = @diag_start_y + (@diag_real_dy * frac)
+    @x = (@real_x / Game_Map::REAL_RES_X).round % self.map.width
+    @y = (@real_y / Game_Map::REAL_RES_Y).round % self.map.height
+    @anime_count += 1 if @walk_anime || @step_anime
+    @moved_this_frame = true
+
+    return if @diag_traveled < @diag_total_dist
+
+    # Finished - snap to tile
+    @real_x = @diag_start_x + @diag_real_dx
+    @real_y = @diag_start_y + @diag_real_dy
+    @x = (@real_x / Game_Map::REAL_RES_X).round % self.map.width
+    @y = (@real_y / Game_Map::REAL_RES_Y).round % self.map.height
+    @diag_move_active = false
+    calculate_bush_depth
+    triggerLeaveTile
+    Events.onStepTakenFieldMovement.trigger(self, self)
+  end
+
+  def diagonal_moving?
+    return @diag_move_active
+  end
+end
+
+def pbMoveEventDiagonal(event, distance_horizontal, distance_vertical, speed)
+  event = get_character(event) if event.is_a?(Integer)
+  event.move_diagonal_freeform(distance_horizontal, distance_vertical, speed)
 end
diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
index 618a8557c..867af9f9b 100644
--- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
+++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
@@ -1165,6 +1165,19 @@ HiddenMoveHandlers::UseMove.add(:MAGNETRISE, proc { |move, pokemon|
   next true
 })
 
+HiddenMoveHandlers::CanUseMove.add(:SPLASH, proc { |move, pkmn, showmsg|
+  next true unless $PokemonGlobal.bicycle || $game_player.floating
+})
+HiddenMoveHandlers::UseMove.add(:SPLASH, proc { |move, pokemon|
+  if !pbHiddenMoveAnimation(pokemon)
+    pbMessage(_INTL("{1} used {2}!", pokemon.name, GameData::Move.get(move).name))
+  end
+  pbSEPlay("jump", 80, 100)
+  $game_player.jump(0,0)
+  next true
+})
+
+
 HiddenMoveHandlers::CanUseMove.add(:MIST, proc { |move, pkmn, showmsg|
   next true if Settings::GAME_ID == :IF_HOENN
 })
diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/Credits/CREDITS_KANTO.rb b/Data/Scripts/016_UI/001_Non-interactive UI/Credits/CREDITS_KANTO.rb
index 501ad6e5f..483cc274d 100644
--- a/Data/Scripts/016_UI/001_Non-interactive UI/Credits/CREDITS_KANTO.rb	
+++ b/Data/Scripts/016_UI/001_Non-interactive UI/Credits/CREDITS_KANTO.rb	
@@ -67,7 +67,8 @@ UnworthyPie<s>Doctor Miawoo
 Chardub<s>TCGrunler#4583
 
 <title>Elite 4 rematch teams
-duskrd<s>anaconja<s>taraline
+duskrd<s>anaconja
+taraline<s>
 
 <title>French translation
 anthonygourmand
diff --git a/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb b/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb
index 995ec24ab..d37262509 100644
--- a/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb	
+++ b/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb	
@@ -562,7 +562,6 @@ def pbExtractText
   end
   pbMessageDisplay(msgwindow,_INTL("Please wait.\\wtnp[0]"))
   pbSetTextMessages
-  MessageTypes.saveMessages
   MessageTypes.extract("intl.txt")
   pbMessageDisplay(msgwindow,_INTL("All text in the game was extracted and saved to intl.txt.\1"))
   pbMessageDisplay(msgwindow,_INTL("To localize the text for a particular language, translate every second line in the file.\1"))
diff --git a/Data/Scripts/051_Wrappers/type_expert.rb b/Data/Scripts/051_Wrappers/type_expert.rb
index 6318b9f60..5dc4a11e8 100644
--- a/Data/Scripts/051_Wrappers/type_expert.rb
+++ b/Data/Scripts/051_Wrappers/type_expert.rb
@@ -41,7 +41,7 @@ TYPE_EXPERTS_APPEARANCES = {
   :TYPE_EXPERT_WATER => TrainerAppearance.new(5, "waterdress", "waterdress", "1_pixie", 180, 0, 0),
   :TYPE_EXPERT_GRASS => TrainerAppearance.new(3, "grassexpert", "grassexpert", "3_roseradeF", 70, 0, 0, "sprout"),
   :TYPE_EXPERT_ELECTRIC => TrainerAppearance.new(3, "designerheadphones", "urbanelectric", "1_dancer", 10, 0, 0), # OK
-  :TYPE_EXPERT_PSYCHIC => TrainerAppearance.new(4, "nil", "psyshamanm", "3_nhair", 250, 0, 0), # TODO NEEDS OUTFIT, LOCATION, TEAM
+  :TYPE_EXPERT_PSYCHIC => TrainerAppearance.new(4, "nil", "psyshaman", "3_nhair", 250, 0, 0), # TODO NEEDS OUTFIT, LOCATION, TEAM
   :TYPE_EXPERT_ICE => TrainerAppearance.new(6, "skierF", "iceoutfit", "1_wavy", 0, 0, 210),
   :TYPE_EXPERT_DRAGON => TrainerAppearance.new(5, "aerodactylSkull", "dragonconqueror", "2_SpecialLatias", 670, 0, 510), # OK
   :TYPE_EXPERT_DARK => TrainerAppearance.new(4, "cynthiaaccessory", "darkoutfit", "3_emo", 330, 0, 0),
diff --git a/Data/Scripts/052_InfiniteFusion/Gameplay/NPCs/FusionMoveTutor.rb b/Data/Scripts/052_InfiniteFusion/Gameplay/NPCs/FusionMoveTutor.rb
index 30e30848e..f1c876432 100644
--- a/Data/Scripts/052_InfiniteFusion/Gameplay/NPCs/FusionMoveTutor.rb
+++ b/Data/Scripts/052_InfiniteFusion/Gameplay/NPCs/FusionMoveTutor.rb
@@ -104,7 +104,7 @@ class FusionTutorService
       compatibleMoves << :DEFENDORDER if is_fusion_of([:BEEDRILL])
       compatibleMoves << :HEALORDER if is_fusion_of([:BEEDRILL])
       compatibleMoves << :POWDER if is_fusion_of([:BUTTERFREE, :VENOMOTH, :VOLCARONA, :PARASECT, :BRELOOM])
-      compatibleMoves << :TAILGLOW if is_fusion_of([:MAREEP, :FLAAFFY, :AMPHAROS, :LANTURN, :ZEKROM, :RESHIRAM])
+      #compatibleMoves << :TAILGLOW if is_fusion_of([:MAREEP, :FLAAFFY, :AMPHAROS, :LANTURN, :ZEKROM, :RESHIRAM])
       compatibleMoves << :DARKESTLARIAT if is_fusion_of([:SNORLAX, :REGIGIGAS, :POLIWRATH, :MACHAMP, :ELECTIVIRE, :DUSKNOIR, :SWAMPERT, :KROOKODILE, :GOLURK])
       compatibleMoves << :PARTINGSHOT if is_fusion_of([:MEOWTH, :PERSIAN, :SANDILE, :KROKOROK, :KROOKODILE, :UMBREON])
       compatibleMoves << :TOPSYTURVY if is_fusion_of([:HITMONTOP, :WOBBUFFET])
@@ -115,7 +115,7 @@ class FusionTutorService
       compatibleMoves << :AROMATICMIST if is_fusion_of([:WEEZING, :BULBASAUR, :IVYSAUR, :VENUSAUR, :CHIKORITA, :BAYLEEF, :MEGANIUM, :GLOOM, :VILEPLUME, :BELLOSSOM, :ROSELIA, :ROSERADE])
       compatibleMoves << :FLORALHEALING if is_fusion_of([:SUNFLORA, :BELLOSSOM, :ROSELIA, :ROSERADE])
       #compatibleMoves << :FLYINGPRESS if is_fusion_of([:TORCHIC, :COMBUSKEN, :BLAZIKEN, :FARFETCHD, :HERACROSS]) || (hasType(:FLYING) && hasType(:FIGHTING))
-      compatibleMoves << :MATBLOCK if is_fusion_of([:MACHOP, :MACHOKE, :MACHAMP, :TYROGUE, :HITMONLEE, :HITMONCHAN, :HITMONTOP])
+      #compatibleMoves << :MATBLOCK if is_fusion_of([:MACHOP, :MACHOKE, :MACHAMP, :TYROGUE, :HITMONLEE, :HITMONCHAN, :HITMONTOP])
       compatibleMoves << :MINDBLOWN if is_fusion_of([:VOLTORB, :ELECTRODE, :EXEGGUTOR])
       compatibleMoves << :SHELLTRAP if is_fusion_of([:MAGCARGO, :FORRETRESS])
       compatibleMoves << :HEATCRASH if is_fusion_of([:BLAZIKEN, :RESHIRAM, :GROUDON, :CHARIZARD, :GOLURK, :REGIGIGAS, :RHYDON, :RHYPERIOR, :SNORLAX])
diff --git a/Data/Scripts/053_PIF_Hoenn/HoennGameplayUtils.rb b/Data/Scripts/053_PIF_Hoenn/HoennGameplayUtils.rb
index 74264bc87..7b58111d6 100644
--- a/Data/Scripts/053_PIF_Hoenn/HoennGameplayUtils.rb
+++ b/Data/Scripts/053_PIF_Hoenn/HoennGameplayUtils.rb
@@ -128,16 +128,7 @@ end
 
 def select_altering_cave_encounter
   level_range = 8..16
-  encounter_table =
-    {
-      :MONDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :HOUNDOUR],
-      :TUESDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :SCRAGGY],
-      :WEDNESDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :PINECO],
-      :THURSDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :MAREEP],
-      :FRIDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :TEDDIURSA],
-      :SATURDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :AIPOM],
-      :SUNDAY => [:ZUBAT, :ZUBAT, :ZUBAT, :WOOBAT, :SMEARGLE],
-    }
+  encounter_table = Settings::ALTERING_CAVE_ENCOUNTERS
   day_of_week = getDayOfTheWeek
   species = encounter_table[day_of_week].sample
   level = rand(level_range)
diff --git a/Data/Scripts/053_PIF_Hoenn/OverworldPokemon/OverworldPokemonEvent.rb b/Data/Scripts/053_PIF_Hoenn/OverworldPokemon/OverworldPokemonEvent.rb
index 11a2b2082..92d5bb7da 100644
--- a/Data/Scripts/053_PIF_Hoenn/OverworldPokemon/OverworldPokemonEvent.rb
+++ b/Data/Scripts/053_PIF_Hoenn/OverworldPokemon/OverworldPokemonEvent.rb
@@ -102,7 +102,7 @@ class OverworldPokemonEvent < Game_Event
 
   def roll_for_special_encounters
     # Mew encounter
-    if rand(10000) < Settings::MEW_OW_ENCOUNTER_CHANCE
+    if rand(15100) < Settings::MEW_OW_ENCOUNTER_CHANCE
       @species = :MEW
       @level = 7
     end
diff --git a/Data/Scripts/053_PIF_Hoenn/OverworldPokemon/OverworldPokemonSpawning.rb b/Data/Scripts/053_PIF_Hoenn/OverworldPokemon/OverworldPokemonSpawning.rb
index f3c00eaae..b09761855 100644
--- a/Data/Scripts/053_PIF_Hoenn/OverworldPokemon/OverworldPokemonSpawning.rb
+++ b/Data/Scripts/053_PIF_Hoenn/OverworldPokemon/OverworldPokemonSpawning.rb
@@ -51,8 +51,7 @@ end
 
 def get_overworld_pokemon_group_size(species, max_group_size)
   catch_rate = GameData::Species.get(species).catch_rate
-  t = (catch_rate - 1) / 254.0
-  t = Math.sqrt(t) # invert to favor smaller groups
+  t = Math.sqrt([(catch_rate - 1) / 254.0, 0].max)
 
   # Base group size, biased toward smaller numbers
   base = 1 + (t * (max_group_size - 1) * 0.5) # multiply by 0.5 to shrink toward 1–2
diff --git a/Data/Scripts/053_PIF_Hoenn/PokeNav/Challenges/ChallengeHooks/ChallengeHooks_Capture.rb b/Data/Scripts/053_PIF_Hoenn/PokeNav/Challenges/ChallengeHooks/ChallengeHooks_Capture.rb
index 64a0d9279..5a7ef385b 100644
--- a/Data/Scripts/053_PIF_Hoenn/PokeNav/Challenges/ChallengeHooks/ChallengeHooks_Capture.rb
+++ b/Data/Scripts/053_PIF_Hoenn/PokeNav/Challenges/ChallengeHooks/ChallengeHooks_Capture.rb
@@ -3,6 +3,7 @@ class PokemonTemp
 end
 module PokeBattle_BattleCommon
   def checkCatchChallenge(pokeball, battle, caught_pokemon)
+    return unless battle.is_a?(PokeBattle_Battle) #This whole check gets skipped for safari zone - maybe implement it later
     #Caught in 1 try
     if battle.balls_thrown == 0 #It's incremented after this method gets checked
       $Trainer.complete_challenge(:catch_first_try)
diff --git a/Data/Scripts/053_PIF_Hoenn/TrainerRematches/02_battled_trainer.rb b/Data/Scripts/053_PIF_Hoenn/TrainerRematches/02_battled_trainer.rb
index ce60ccde1..f3d21004c 100644
--- a/Data/Scripts/053_PIF_Hoenn/TrainerRematches/02_battled_trainer.rb
+++ b/Data/Scripts/053_PIF_Hoenn/TrainerRematches/02_battled_trainer.rb
@@ -180,7 +180,7 @@ class BattledTrainer
       held_item = pokemon.item
       is_holdable_item = HELD_ITEMS.include?(held_item.id)
       echoln "#{held_item} #{is_holdable_item}"
-      next if is_holdable_item && rand(100) >= store_held_item_chancex
+      next if is_holdable_item && rand(100) >= store_held_item_chance
 
       is_evolution_item = held_item.is_evolution_stone?
       is_battle_item = held_item.has_battle_use?
diff --git a/Data/Scripts/053_PIF_Hoenn/TrainerRematches/TrainerRematch_FRIENDSHIP.rb b/Data/Scripts/053_PIF_Hoenn/TrainerRematches/TrainerRematch_FRIENDSHIP.rb
index c7d01925a..14de941e3 100644
--- a/Data/Scripts/053_PIF_Hoenn/TrainerRematches/TrainerRematch_FRIENDSHIP.rb
+++ b/Data/Scripts/053_PIF_Hoenn/TrainerRematches/TrainerRematch_FRIENDSHIP.rb
@@ -118,21 +118,21 @@ class BattledTrainer
 
 
     #story / bosses
-    LEADER_Roxanne:    [20, 40, 200],
-    LEADER_Brawly:    [20, 40, 200],
-    LEADER_Wattson:    [20, 40, 200],
-    LEADER_Flannery:    [20, 40, 200],
-    LEADER_Norman:    [5, 40, 200],
-    LEADER_Winona:    [20, 40, 200],
-    LEADER_Tate:    [20, 40, 200],
-    LEADER_Liza:    [20, 40, 200],
-    LEADER_Wallace:    [20, 40, 200],
-    LEADER_Juan:    [20, 40, 200],
-    ELITEFOUR_Sidney:    [30, 60, 200],
-    ELITEFOUR_Phoebe:    [30, 60, 200],
-    ELITEFOUR_Glacia:    [30, 60, 200],
-    ELITEFOUR_Drake:    [30, 60, 200],
-    CHAMPION_Steven:    [50, 70, 200],
+    LEADER_Roxanne:    [20, 40, 80],
+    LEADER_Brawly:    [20, 40, 80],
+    LEADER_Wattson:    [20, 40, 80],
+    LEADER_Flannery:    [20, 40, 80],
+    LEADER_Norman:    [5, 40, 80],
+    LEADER_Winona:    [20, 40, 80],
+    LEADER_Tate:    [20, 40, 80],
+    LEADER_Liza:    [20, 40, 80],
+    LEADER_Wallace:    [20, 40, 80],
+    LEADER_Juan:    [20, 40, 80],
+    ELITEFOUR_Sidney:    [30, 60, 90],
+    ELITEFOUR_Phoebe:    [30, 60, 90],
+    ELITEFOUR_Glacia:    [30, 60, 90],
+    ELITEFOUR_Drake:    [30, 60, 90],
+    CHAMPION_Steven:    [50, 70, 90],
     TEAM_AQUA_BOSS:     [60, 200, 200],
     TEAM_MAGMA_BOSS:    [60, 200, 200]
   }
diff --git a/Data/Scripts/DownloadedSettings.rb b/Data/Scripts/DownloadedSettings.rb
index 672cb7932..5ae782a21 100644
--- a/Data/Scripts/DownloadedSettings.rb
+++ b/Data/Scripts/DownloadedSettings.rb
@@ -1,6 +1,6 @@
 
 module Settings
-  LATEST_GAME_RELEASE = "6.7.2"
+  LATEST_GAME_RELEASE = "6.8.0"
 
   SHINY_POKEMON_CHANCE = 16
   SNOW_DAY = false
@@ -48,7 +48,7 @@ module Settings
   CUSTOM_FUSIONS_SPRITESHEET_TRUE_SIZE_URL = "https://infinitefusion.net/customsprites/spritesheets/spritesheets_custom/"
 
   
-  TRANSFER_BOX_DISCLAIMER_MESSAGE = "\\C[2]The Transfer Box is not yet available in Infinite Fusion 1, it is planned for a future update. It can still be used to transfer Pokémon between Hoenn savefiles in the meantime."
+  TRANSFER_BOX_DISCLAIMER_MESSAGE = ""
 
   CUSTOMSPRITES_RATE_MAX_NB_REQUESTS = 15  #Nb. requests allowed in each time window
   CUSTOMSPRITES_ENTRIES_RATE_TIME_WINDOW = 60    # In seconds
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 997ccf927..64dd03019 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 39a004133..3b3389e09 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/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log
index c9d70c715..67963ce0d 100644
--- a/Data/sprites/sprites_rate_limit.log
+++ b/Data/sprites/sprites_rate_limit.log
@@ -1,3 +1,3 @@
-1783711058
-1783711058
-1783711058
\ No newline at end of file
+1783780333
+1783780333
+1783780333
\ No newline at end of file
diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache
index 4b968ac4c..f22fa7a8b 100644
--- a/Data/sprites/updated_spritesheets_cache
+++ b/Data/sprites/updated_spritesheets_cache
@@ -1,88 +1,28 @@
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/502/502.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/469.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/189.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/189/189.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/356.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/367.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/367/367.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/564.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/23.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/23/23.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/295.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/202.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/202/202.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/516/516.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/219.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/380.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/380/380.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/68.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/194.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/194/194.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/159.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/210.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/210/210.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/87.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/392.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/392/392.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/100.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/204.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/204/204.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/254.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/266.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/266/266.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/249.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/345.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/345/345.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/330.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/307.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/307/307.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/288.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/36.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/36/36.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/310.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/148.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/148/148.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/220/220.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/544.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/340.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/340/340.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/290.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/453.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/232.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/418.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/418/418.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/39.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/413.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/413/413.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/283.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/283/283.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/184/184.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/114/114a.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/571.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/9.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/9/9a.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/29.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/173.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/173/173.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/194/194a.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/4/4.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/79/79.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/10.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/328.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/328/328.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/460.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/492.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/389.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/130.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/329.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/329/329.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/494.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/295/295.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/519.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/352.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/352/352.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/501.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/9/9.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/427.png
-Graphics/CustomBattlers/spritesheets/spritesheets_base/12.png
-Graphics/CustomBattlers/spritesheets/spritesheets_custom/12/12.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/75.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/424.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/462.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/462/462.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/282.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/242.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/242/242.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/21.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/90.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/182.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/182/182.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/191.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/96.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/96/96.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/128.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/449.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/449/449.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/409.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/27.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/27/27.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/354.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/350.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/350/350.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/64.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/191/191.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/415.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/102.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/102/102.png