Renamed $Trainer to $player

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

@@ -191,13 +191,13 @@ end
 def pbHatch(pokemon)
   speciesname = pokemon.speciesName
   pokemon.name           = nil
-  pokemon.owner          = Pokemon::Owner.new_from_trainer($Trainer)
+  pokemon.owner          = Pokemon::Owner.new_from_trainer($player)
   pokemon.happiness      = 120
   pokemon.timeEggHatched = pbGetTimeNow
   pokemon.obtain_method  = 1   # hatched from egg
   pokemon.hatched_map    = $game_map.map_id
-  $Trainer.pokedex.register(pokemon)
-  $Trainer.pokedex.set_owned(pokemon.species)
+  $player.pokedex.register(pokemon)
+  $player.pokedex.set_owned(pokemon.species)
   pokemon.record_first_moves
   if !pbHatchAnimation(pokemon)
     pbMessage(_INTL("Huh?\1"))
@@ -213,10 +213,10 @@ def pbHatch(pokemon)
 end
 
 Events.onStepTaken += proc { |_sender,_e|
-  for egg in $Trainer.party
+  for egg in $player.party
     next if egg.steps_to_hatch <= 0
     egg.steps_to_hatch -= 1
-    for i in $Trainer.pokemon_party
+    for i in $player.pokemon_party
       next if ![:FLAMEBODY, :MAGMAARMOR, :STEAMENGINE].include?(i.ability_id)
       egg.steps_to_hatch -= 1
       break

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

@@ -588,8 +588,8 @@ class PokemonEvolutionScene
     @pokemon.form    = 0 if @pokemon.isSpecies?(:MOTHIM)
     @pokemon.calc_stats
     # See and own evolved species
-    $Trainer.pokedex.register(@pokemon)
-    $Trainer.pokedex.set_owned(@newspecies)
+    $player.pokedex.register(@pokemon)
+    $player.pokedex.set_owned(@newspecies)
     # Learn moves upon evolution for evolved species
     movelist = @pokemon.getMoveList
     for i in movelist
@@ -613,9 +613,9 @@ class PokemonEvolutionScene
     new_pkmn.calc_stats
     new_pkmn.heal
     # Add duplicate Pokémon to party
-    $Trainer.party.push(new_pkmn)
+    $player.party.push(new_pkmn)
     # See and own duplicate Pokémon
-    $Trainer.pokedex.register(new_pkmn)
-    $Trainer.pokedex.set_owned(new_species)
+    $player.pokedex.register(new_pkmn)
+    $player.pokedex.set_owned(new_species)
   end
 end

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

@@ -198,9 +198,9 @@ end
 #
 #===============================================================================
 def pbStartTrade(pokemonIndex,newpoke,nickname,trainerName,trainerGender=0)
-  myPokemon = $Trainer.party[pokemonIndex]
+  myPokemon = $player.party[pokemonIndex]
   opponent = NPCTrainer.new(trainerName,trainerGender)
-  opponent.id = $Trainer.make_foreign_ID
+  opponent.id = $player.make_foreign_ID
   yourPokemon = nil
   resetmoves = true
   if newpoke.is_a?(Pokemon)
@@ -216,13 +216,13 @@ def pbStartTrade(pokemonIndex,newpoke,nickname,trainerName,trainerGender=0)
   yourPokemon.obtain_method = 2   # traded
   yourPokemon.reset_moves if resetmoves
   yourPokemon.record_first_moves
-  $Trainer.pokedex.register(yourPokemon)
-  $Trainer.pokedex.set_owned(yourPokemon.species)
+  $player.pokedex.register(yourPokemon)
+  $player.pokedex.set_owned(yourPokemon.species)
   pbFadeOutInWithMusic {
     evo = PokemonTrade_Scene.new
-    evo.pbStartScreen(myPokemon,yourPokemon,$Trainer.name,opponent.name)
+    evo.pbStartScreen(myPokemon, yourPokemon, $player.name, opponent.name)
     evo.pbTrade
     evo.pbEndScreen
   }
-  $Trainer.party[pokemonIndex] = yourPokemon
+  $player.party[pokemonIndex] = yourPokemon
 end

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

@@ -123,9 +123,9 @@ class HallOfFame_Scene
   end
 
   def saveHallEntry
-    for i in 0...$Trainer.party.length
+    $player.party.each do |pkmn|
       # Clones every pokémon object
-      @hallEntry.push($Trainer.party[i].clone) if !$Trainer.party[i].egg? || ALLOWEGGS
+      @hallEntry.push(pkmn.clone) if !pkmn.egg? || ALLOWEGGS
     end
     # Update the global variables
     $PokemonGlobal.hallOfFame.push(@hallEntry)
@@ -243,7 +243,7 @@ class HallOfFame_Scene
 
   def createTrainerBattler
     @sprites["trainer"]=IconSprite.new(@viewport)
-    @sprites["trainer"].setBitmap(GameData::TrainerType.front_sprite_filename($Trainer.trainer_type))
+    @sprites["trainer"].setBitmap(GameData::TrainerType.front_sprite_filename($player.trainer_type))
     if !SINGLEROW
       @sprites["trainer"].x=Graphics.width-96
       @sprites["trainer"].y=160
@@ -278,12 +278,12 @@ class HallOfFame_Scene
     totalsec = Graphics.frame_count / Graphics.frame_rate
     hour = totalsec / 60 / 60
     min = totalsec / 60 % 60
-    pubid=sprintf("%05d",$Trainer.public_ID)
-    lefttext= _INTL("Name<r>{1}<br>",$Trainer.name)
+    pubid=sprintf("%05d", $player.public_ID)
+    lefttext= _INTL("Name<r>{1}<br>", $player.name)
     lefttext+=_INTL("IDNo.<r>{1}<br>",pubid)
     lefttext+=_ISPRINTF("Time<r>{1:02d}:{2:02d}<br>",hour,min)
     lefttext+=_INTL("Pokédex<r>{1}/{2}<br>",
-        $Trainer.pokedex.owned_count,$Trainer.pokedex.seen_count)
+        $player.pokedex.owned_count, $player.pokedex.seen_count)
     @sprites["messagebox"]=Window_AdvancedTextPokemon.new(lefttext)
     @sprites["messagebox"].viewport=@viewport
     @sprites["messagebox"].width=192 if @sprites["messagebox"].width<192