Renamed $Trainer to $player

Data/Scripts/010_Data/002_PBS data/006_Item.rb

@@ -124,7 +124,7 @@ module GameData
     def is_mail?;            return has_flag?("Mail") || has_flag?("IconMail"); end
     def is_icon_mail?;       return has_flag?("IconMail"); end
     def is_poke_ball?;       return has_flag?("PokeBall") || has_flag?("SnagBall"); end
-    def is_snag_ball?;       return has_flag?("SnagBall") || (is_poke_ball? && $Trainer.has_snag_machine); end
+    def is_snag_ball?;       return has_flag?("SnagBall") || (is_poke_ball? && $player.has_snag_machine); end
     def is_berry?;           return has_flag?("Berry"); end
     def is_key_item?;        return has_flag?("KeyItem"); end
     def is_evolution_stone?; return has_flag?("EvolutionStone"); end

Data/Scripts/010_Data/002_PBS data/012_TrainerType.rb

@@ -57,7 +57,7 @@ module GameData
     end
 
     def self.player_front_sprite_filename(tr_type)
-      outfit = ($Trainer) ? $Trainer.outfit : 0
+      outfit = ($player) ? $player.outfit : 0
       return self.check_file(tr_type, "Graphics/Trainers/", sprintf("_%d", outfit))
     end
 
@@ -66,7 +66,7 @@ module GameData
     end
 
     def self.player_back_sprite_filename(tr_type)
-      outfit = ($Trainer) ? $Trainer.outfit : 0
+      outfit = ($player) ? $player.outfit : 0
       return self.check_file(tr_type, "Graphics/Trainers/", sprintf("_%d", outfit), "_back")
     end
 
@@ -75,7 +75,7 @@ module GameData
     end
 
     def self.player_map_icon_filename(tr_type)
-      outfit = ($Trainer) ? $Trainer.outfit : 0
+      outfit = ($player) ? $player.outfit : 0
       return self.check_file(tr_type, "Graphics/Pictures/mapPlayer", sprintf("_%d", outfit))
     end
 

Data/Scripts/010_Data/002_PBS data/013_Trainer.rb

@@ -108,7 +108,7 @@ module GameData
       end
       # Create trainer object
       trainer = NPCTrainer.new(tr_name, @trainer_type)
-      trainer.id        = $Trainer.make_foreign_ID
+      trainer.id        = $player.make_foreign_ID
       trainer.items     = @items.clone
       trainer.lose_text = self.lose_text
       # Create each Pokémon owned by the trainer