Renamed $Trainer to $player

Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb

@@ -194,7 +194,7 @@ class PokeBattle_Battler
 
   def owned?
     return false if !@battle.wildBattle?
-    return $Trainer.owned?(displaySpecies)
+    return $player.owned?(displaySpecies)
   end
   alias owned owned?
 

Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb

@@ -47,7 +47,7 @@ module PokeBattle_BattleCommon
       # Record the Pokémon's species as owned in the Pokédex
       if !pbPlayer.owned?(pkmn.species)
         pbPlayer.pokedex.set_owned(pkmn.species)
-        if $Trainer.has_pokedex
+        if $player.has_pokedex
           pbDisplayPaused(_INTL("{1}'s data was added to the Pokédex.",pkmn.name))
           pbPlayer.pokedex.register_last_seen(pkmn)
           @scene.pbShowPokedex(pkmn.species)
@@ -195,7 +195,7 @@ module PokeBattle_BattleCommon
     # Critical capture check
     if Settings::ENABLE_CRITICAL_CAPTURES
       dex_modifier = 0
-      numOwned = $Trainer.pokedex.owned_count
+      numOwned = $player.pokedex.owned_count
       if numOwned>600
         dex_modifier = 5
       elsif numOwned>450

Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb

@@ -457,16 +457,16 @@ class PokeBattle_Battle
     # Pass on Pokérus within the party
     if @internalBattle
       infected = []
-      $Trainer.party.each_with_index do |pkmn,i|
+      $player.party.each_with_index do |pkmn,i|
         infected.push(i) if pkmn.pokerusStage==1
       end
       infected.each do |idxParty|
-        strain = $Trainer.party[idxParty].pokerusStrain
-        if idxParty>0 && $Trainer.party[idxParty-1].pokerusStage==0
-          $Trainer.party[idxParty-1].givePokerus(strain) if rand(3)==0   # 33%
+        strain = $player.party[idxParty].pokerusStrain
+        if idxParty > 0 && $player.party[idxParty - 1].pokerusStage == 0
+          $player.party[idxParty - 1].givePokerus(strain) if rand(3) == 0   # 33%
         end
-        if idxParty<$Trainer.party.length-1 && $Trainer.party[idxParty+1].pokerusStage==0
-          $Trainer.party[idxParty+1].givePokerus(strain) if rand(3)==0   # 33%
+        if idxParty < $player.party.length - 1 && $player.party[idxParty + 1].pokerusStage == 0
+          $player.party[idxParty + 1].givePokerus(strain) if rand(3) == 0   # 33%
         end
       end
     end

Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb

@@ -39,7 +39,7 @@ class PokeBattle_FakeBattler
   def captured=(value); end
 
   def owned?
-    return $Trainer.owned?(pokemon.species)
+    return $player.owned?(pokemon.species)
   end
 
   def pbThis(lowerCase=false)

Data/Scripts/011_Battle/006_Other battle types/008_PokeBattle_BattlePeer.rb

@@ -40,7 +40,7 @@ class PokeBattle_RealBattlePeer
   end
 
   def pbGetStorageCreatorName
-    return pbGetStorageCreator if $Trainer.seen_storage_creator
+    return pbGetStorageCreator if $player.seen_storage_creator
     return nil
   end