Split PokeBattle_Trainer into PlayerTrainer and NPCTrainer

Data/Scripts/016_Pokemon/006_Pokemon_Owner.rb

@@ -25,10 +25,10 @@ class Pokemon
     end
 
     # Returns a new Owner object populated with values taken from +trainer+.
-    # @param trainer [PokeBattle_Trainer] trainer object to read data from
+    # @param trainer [PlayerTrainer, NPCTrainer] trainer object to read data from
     # @return [Owner] new Owner object
     def self.new_from_trainer(trainer)
-      validate trainer => PokeBattle_Trainer
+      validate trainer => [PlayerTrainer, NPCTrainer]
       return new(trainer.id, trainer.name, trainer.gender, trainer.language)
     end
 
@@ -38,7 +38,7 @@ class Pokemon
     # @param language [Integer] owner language
     # @return [Owner] foreign Owner object
     def self.new_foreign(name = '', gender = 2, language = 2)
-      return new($Trainer.getForeignID, name, gender, language)
+      return new($Trainer.make_foreign_ID, name, gender, language)
     end
 
     # @param new_id [Integer] new owner ID