From 41a304f5686bff73982cdfcbf578388f7cc29c38 Mon Sep 17 00:00:00 2001
From: Joni Savolainen <joni@jonisavo.xyz>
Date: Wed, 23 Sep 2020 20:26:29 +0300
Subject: [PATCH] Initial testing of deprecation

---
 Data/Scripts/016_Pokemon/001_Pokemon.rb            | 7 +++----
 Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb | 7 +++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Data/Scripts/016_Pokemon/001_Pokemon.rb b/Data/Scripts/016_Pokemon/001_Pokemon.rb
index 7dd0b1b12..66fc31e8d 100644
--- a/Data/Scripts/016_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/016_Pokemon/001_Pokemon.rb
@@ -96,7 +96,7 @@ class Pokemon
   # Otherwise returns 0.
   # @return [Integer] the map ID where egg was hatched (0 by default)
   attr_accessor :hatchedMap
-  # @param value [Integer] new language 
+  # @param value [Integer] new language
   attr_writer   :language
   # @return [String] the name of the original trainer
   attr_accessor :ot
@@ -122,7 +122,7 @@ class Pokemon
   #=============================================================================
 
   # @return [Integer] the public portion of the original trainer's ID
-  def publicID
+  def public_id
     return @trainerID & 0xFFFF
   end
 
@@ -131,7 +131,6 @@ class Pokemon
   def foreign?(trainer)
     return @trainerID != trainer.id || @ot != trainer.name
   end
-  alias isForeign? foreign?
 
   # @return [0, 1, 2] the gender of this Pokémon original trainer (0 = male, 1 = female, 2 = unknown)
   def otgender
@@ -139,7 +138,7 @@ class Pokemon
   end
 
   # @return [Integer] this Pokémon's level when it was obtained
-  def obtainLevel
+  def obtain_level
     return @obtainLevel || 0
   end
 
diff --git a/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb b/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb
index 08904006a..12dfe2b97 100644
--- a/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb
+++ b/Data/Scripts/016_Pokemon/009_Pokemon_Deprecated.rb
@@ -12,14 +12,17 @@ PokeBattle_Pokemon = Pokemon
 class Pokemon
   # @deprecated Use {MAX_NAME_SIZE} instead. This alias is slated to be removed in vXX.
   MAX_POKEMON_NAME_SIZE = MAX_NAME_SIZE
+
+  deprecated_instance_method_alias :publicID, :public_id, 'vXX'
+  deprecated_instance_method_alias :isForeign?, :foreign?, 'vXX'
 end
 
 # (see Pokemon#initialize)
 # @deprecated Use +Pokemon.new+ instead. This method and its aliases are
 #   slated to be removed in vXX.
 def pbNewPkmn(species, level, owner = $Trainer, withMoves = true)
-  Kernel.echoln("WARN: pbNewPkmn and its aliases are deprecated and slated to be removed in Essentials vXX")
+  Deprecation.warn_method('pbNewPkmn', 'vXX', 'Pokemon.new')
   return Pokemon.new(species, level, owner, withMoves)
 end
 alias pbGenPkmn pbNewPkmn
-alias pbGenPoke pbNewPkmn
\ No newline at end of file
+alias pbGenPoke pbNewPkmn