release 6.2

Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb

@@ -209,7 +209,7 @@ def pbHatch(pokemon)
   pokemon.hatched_map    = $game_map.map_id
   if player_on_hidden_ability_map
     chosenAbility = pokemon.getAbilityList.sample #format: [[:ABILITY, index],...]
-    pokemon.ability = chosenAbility[0]
+    #pokemon.ability = chosenAbility[0]
     pokemon.ability_index = chosenAbility[1]
   end
 

Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb

@@ -633,9 +633,9 @@ class PokemonEvolutionScene
 
 
 
-    if allNewPossibleAbilities.include?(oldAbility)
-      @pokemon.ability=oldAbility
-    end
+    # if allNewPossibleAbilities.include?(oldAbility)
+    #   @pokemon.ability=oldAbility
+    # end
 
     # Learn moves upon evolution for evolved species
     movelist = @pokemon.getMoveList

Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb

@@ -219,6 +219,10 @@ def pbStartTrade(pokemonIndex,newpoke,nickname,trainerName,trainerGender=0,saveg
   Kernel.Autosave if savegame
 
   myPokemon = $Trainer.party[pokemonIndex]
+  heldItem = myPokemon.item
+  echoln heldItem
+  $PokemonBag.pbStoreItem(heldItem, 1) if heldItem
+
   opponent = NPCTrainer.new(trainerName,trainerGender)
   opponent.id = $Trainer.make_foreign_ID
   yourPokemon = nil

Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb

@@ -245,7 +245,7 @@ class HallOfFame_Scene
 
   def createTrainerBattler
     @sprites["trainer"] = IconSprite.new(@viewport)
-    @sprites["trainer"].setBitmap(GameData::TrainerType.front_sprite_filename($Trainer.trainer_type))
+    @sprites["trainer"].setBitmapDirectly(generate_front_trainer_sprite_bitmap())
     if !SINGLEROW
       @sprites["trainer"].x = Graphics.width - 96
       @sprites["trainer"].y = 160
@@ -276,14 +276,9 @@ class HallOfFame_Scene
     end
   end
 
+  #Get difficulty for displaying in-game
   def getDifficulty
-    if $game_switches[SWITCH_GAME_DIFFICULTY_EASY]
-      return "Easy"
-    elsif $game_switches[SWITCH_GAME_DIFFICULTY_HARD]
-      return "Hard"
-    else
-      return "Normal"
-    end
+    return getDisplayDifficulty()
   end
 
   def writeTrainerData
@@ -344,7 +339,7 @@ class HallOfFame_Scene
     pbDrawTextPositions(overlay, [[_INTL("Welcome to the Hall of Fame!"),
                                    Graphics.width / 2, Graphics.height - 80, 2, BASECOLOR, SHADOWCOLOR]])
 
-    writeCurrentDate(overlay, 120 , Graphics.height - 50)
+    writeCurrentDate(overlay, 120, Graphics.height - 50)
     writeGameMode(overlay, (Graphics.width / 2) + 100, Graphics.height - 50)
   end
 
@@ -364,7 +359,7 @@ class HallOfFame_Scene
     end
     if $game_switches[SWITCH_SINGLE_POKEMON_MODE]
       pokemon_number = pbGet(VAR_SINGLE_POKEMON_MODE)
-      if pokemon_number.is_a?(Integer) && pokemon_number >0
+      if pokemon_number.is_a?(Integer) && pokemon_number > 0
         pokemon = GameData::Species.get(pokemon_number)
         gameMode = pokemon.real_name + " mode"
       else

Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb

@@ -110,6 +110,8 @@ Knuckles
 UnworthyPie
 Doctor Miawoo
 Chardub
+elupsis
+TCGrunler#4583
 
 The following free ressources were also used 
 with their respective authors' consent:
@@ -211,6 +213,7 @@ _END_
 # Stop Editing
 
   def main
+    endCredits() if $PokemonSystem.on_mobile
     #-------------------------------
     # Animated Background Setup
     #-------------------------------
@@ -326,13 +329,17 @@ _END_
   # Check if the credits should be cancelled
   def cancel?
     if Input.trigger?(Input::USE) && $PokemonGlobal.creditsPlayed
-      $scene = Scene_Map.new
-      pbBGMFade(1.0)
+      endCredits
       return true
     end
     return false
   end
 
+  def endCredits
+    $scene = Scene_Map.new
+    pbBGMFade(1.0)
+  end
+
   # Checks if credits bitmap has reached its ending point
   def last?
     if @realOY > @total_height + @trim