diff --git a/Data/Scripts/002_Save data/005_Game_SaveConversions.rb b/Data/Scripts/002_Save data/005_Game_SaveConversions.rb
index 1932f71f4..b82418feb 100644
--- a/Data/Scripts/002_Save data/005_Game_SaveConversions.rb	
+++ b/Data/Scripts/002_Save data/005_Game_SaveConversions.rb	
@@ -1,151 +1,5 @@
 # Contains conversions defined in Essentials by default.
 
-SaveData.register_conversion(:v19_define_versions) do
-  essentials_version 19
-  display_title 'Adding game version and Essentials version to save data'
-  to_all do |save_data|
-    unless save_data.has_key?(:essentials_version)
-      save_data[:essentials_version] = Essentials::VERSION
-    end
-    unless save_data.has_key?(:game_version)
-      save_data[:game_version] = Settings::GAME_VERSION
-    end
-  end
-end
-
-SaveData.register_conversion(:v19_convert_PokemonSystem) do
-  essentials_version 19
-  display_title 'Updating PokemonSystem class'
-  to_all do |save_data|
-    new_system = PokemonSystem.new
-    new_system.textspeed   = save_data[:pokemon_system].textspeed || new_system.textspeed
-    new_system.battlescene = save_data[:pokemon_system].battlescene || new_system.battlescene
-    new_system.battlestyle = save_data[:pokemon_system].battlestyle || new_system.battlestyle
-    new_system.frame       = save_data[:pokemon_system].frame || new_system.frame
-    new_system.textskin    = save_data[:pokemon_system].textskin || new_system.textskin
-    new_system.screensize  = save_data[:pokemon_system].screensize || new_system.screensize
-    new_system.language    = save_data[:pokemon_system].language || new_system.language
-    new_system.runstyle    = save_data[:pokemon_system].runstyle || new_system.runstyle
-    new_system.bgmvolume   = save_data[:pokemon_system].bgmvolume || new_system.bgmvolume
-    new_system.sevolume    = save_data[:pokemon_system].sevolume || new_system.sevolume
-    new_system.textinput   = save_data[:pokemon_system].textinput || new_system.textinput
-    save_data[:pokemon_system] = new_system
-  end
-end
-
-SaveData.register_conversion(:v19_convert_player) do
-  essentials_version 19
-  display_title 'Converting player trainer class'
-  to_all do |save_data|
-    next if save_data[:player].is_a?(Player)
-    # Conversion of the party is handled in PokeBattle_Trainer.convert
-    save_data[:player] = PokeBattle_Trainer.convert(save_data[:player])
-  end
-end
-
-SaveData.register_conversion(:v19_move_global_data_to_player) do
-  essentials_version 19
-  display_title 'Moving some global metadata data to player'
-  to_all do |save_data|
-    global = save_data[:global_metadata]
-    player = save_data[:player]
-    player.character_ID = global.playerID
-    global.playerID = nil
-    global.pokedexUnlocked.each_with_index do |value, i|
-      if value
-        player.pokedex.unlock(i)
-      else
-        player.pokedex.lock(i)
-      end
-    end
-    player.coins = global.coins
-    global.coins = nil
-    player.soot = global.sootsack
-    global.sootsack = nil
-    player.has_running_shoes = global.runningShoes
-    global.runningShoes = nil
-    player.seen_storage_creator = global.seenStorageCreator
-    global.seenStorageCreator = nil
-    player.has_snag_machine = global.snagMachine
-    global.snagMachine = nil
-    player.seen_purify_chamber = global.seenPurifyChamber
-    global.seenPurifyChamber = nil
-  end
-end
-
-SaveData.register_conversion(:v19_convert_global_metadata) do
-  essentials_version 19
-  display_title 'Adding encounter version variable to global metadata'
-  to_value :global_metadata do |global|
-    global.bridge ||= 0
-    global.encounter_version ||= 0
-    if global.pcItemStorage
-      global.pcItemStorage.items.each_with_index do |slot, i|
-        item_data = GameData::Item.try_get(slot[0])
-        if item_data
-          slot[0] = item_data.id
-        else
-          global.pcItemStorage.items[i] = nil
-        end
-      end
-      global.pcItemStorage.items.compact!
-    end
-    if global.mailbox
-      global.mailbox.each_with_index do |mail, i|
-        global.mailbox[i] = PokemonMail.convert(mail) if mail
-      end
-    end
-    global.phoneNumbers.each do |contact|
-      contact[1] = GameData::TrainerType.get(contact[1]).id if contact && contact.length == 8
-    end
-    if global.partner
-      global.partner[0] = GameData::TrainerType.get(global.partner[0]).id
-      global.partner[3].each_with_index do |pkmn, i|
-        global.partner[3][i] = PokeBattle_Pokemon.convert(pkmn) if pkmn
-      end
-    end
-    if global.daycare
-      global.daycare.each do |slot|
-        slot[0] = PokeBattle_Pokemon.convert(slot[0]) if slot && slot[0]
-      end
-    end
-    if global.roamPokemon
-      global.roamPokemon.each_with_index do |pkmn, i|
-        global.roamPokemon[i] = PokeBattle_Pokemon.convert(pkmn) if pkmn && pkmn != true
-      end
-    end
-    global.purifyChamber.sets.each do |set|
-      set.shadow = PokeBattle_Pokemon.convert(set.shadow) if set.shadow
-      set.list.each_with_index do |pkmn, i|
-        set.list[i] = PokeBattle_Pokemon.convert(pkmn) if pkmn
-      end
-    end
-    if global.hallOfFame
-      global.hallOfFame.each do |team|
-        next if !team
-        team.each_with_index do |pkmn, i|
-          team[i] = PokeBattle_Pokemon.convert(pkmn) if pkmn
-        end
-      end
-    end
-    if global.triads
-      global.triads.items.each do |card|
-        card[0] = GameData::Species.get(card[0]).id if card && card[0] && card[0] != 0
-      end
-    end
-  end
-end
-
-SaveData.register_conversion(:v19_1_fix_phone_contacts) do
-  essentials_version 19.1
-  display_title 'Fixing phone contacts data'
-  to_value :global_metadata do |global|
-    global.phoneNumbers.each do |contact|
-      contact[1] = GameData::TrainerType.get(contact[1]).id if contact && contact.length == 8
-    end
-  end
-end
-
 SaveData.register_conversion(:v19_2_fix_berry_plants) do
   essentials_version 19.2
   display_title 'Fixing berry plant data'
@@ -234,98 +88,3 @@ SaveData.register_conversion(:v19_2_fix_berry_plants) do
     end
   end
 end
-
-SaveData.register_conversion(:v19_convert_bag) do
-  essentials_version 19
-  display_title 'Converting item IDs in Bag'
-  to_value :bag do |bag|
-    bag.instance_eval do
-      for pocket in self.pockets
-        pocket.each_with_index do |item, i|
-          next if !item || !item[0] || item[0] == 0
-          item_data = GameData::Item.try_get(item[0])
-          if item_data
-            item[0] = item_data.id
-          else
-            pocket[i] = nil
-          end
-        end
-        pocket.compact!
-      end
-      self.registeredIndex   # Just to ensure this data exists
-      self.registeredItems.each_with_index do |item, i|
-        next if !item
-        if item == 0
-          self.registeredItems[i] = nil
-        else
-          item_data = GameData::Item.try_get(item)
-          if item_data
-            self.registeredItems[i] = item_data.id
-          else
-            self.registeredItems[i] = nil
-          end
-        end
-      end
-      self.registeredItems.compact!
-    end   # bag.instance_eval
-  end   # to_value
-end
-
-SaveData.register_conversion(:v19_convert_game_variables) do
-  essentials_version 19
-  display_title 'Converting classes of things in Game Variables'
-  to_all do |save_data|
-    variables = save_data[:variables]
-    for i in 0..5000
-      value = variables[i]
-      next if value.nil?
-      if value.is_a?(Array)
-        value.each_with_index do |value2, j|
-          if value2.is_a?(PokeBattle_Pokemon)
-            value[j] = PokeBattle_Pokemon.convert(value2)
-          end
-        end
-      elsif value.is_a?(PokeBattle_Pokemon)
-        variables[i] = PokeBattle_Pokemon.convert(value)
-      elsif value.is_a?(PokemonBag)
-        SaveData.run_single_conversions(value, :bag, save_data)
-      end
-    end
-  end
-end
-
-SaveData.register_conversion(:v19_convert_storage) do
-  essentials_version 19
-  display_title 'Converting classes of Pokémon in storage'
-  to_value :storage_system do |storage|
-    storage.instance_eval do
-      for box in 0...self.maxBoxes
-        for i in 0...self.maxPokemon(box)
-          self[box, i] = PokeBattle_Pokemon.convert(self[box, i]) if self[box, i]
-        end
-      end
-      self.unlockedWallpapers   # Just to ensure this data exists
-    end   # storage.instance_eval
-  end   # to_value
-end
-
-SaveData.register_conversion(:v19_convert_game_player) do
-  essentials_version 19
-  display_title 'Converting game player character'
-  to_value :game_player do |game_player|
-    game_player.width = 1
-    game_player.height = 1
-    game_player.sprite_size = [Game_Map::TILE_WIDTH, Game_Map::TILE_HEIGHT]
-    game_player.pattern_surf ||= 0
-    game_player.lock_pattern ||= false
-    game_player.move_speed = game_player.move_speed
-  end
-end
-
-SaveData.register_conversion(:v19_convert_game_screen) do
-  essentials_version 19
-  display_title 'Converting game screen'
-  to_value :game_screen do |game_screen|
-    game_screen.weather(game_screen.weather_type, game_screen.weather_max, 0)
-  end
-end
diff --git a/Data/Scripts/010_Data/002_PBS data/005_Move.rb b/Data/Scripts/010_Data/002_PBS data/005_Move.rb
index a34bf5add..b7426f19d 100644
--- a/Data/Scripts/010_Data/002_PBS data/005_Move.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/005_Move.rb	
@@ -81,18 +81,3 @@ module GameData
     end
   end
 end
-
-#===============================================================================
-# Deprecated methods
-#===============================================================================
-# @deprecated This alias is slated to be removed in v20.
-def pbGetMoveData(move_id, move_data_type = -1)
-  Deprecation.warn_method('pbGetMoveData', 'v20', 'GameData::Move.get(move_id)')
-  return GameData::Move.get(move_id)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsHiddenMove?(move)
-  Deprecation.warn_method('pbIsHiddenMove?', 'v20', 'GameData::Move.get(move).hidden_move?')
-  return GameData::Move.get(move).hidden_move?
-end
diff --git a/Data/Scripts/010_Data/002_PBS data/006_Item.rb b/Data/Scripts/010_Data/002_PBS data/006_Item.rb
index efac59b2c..c367243a1 100644
--- a/Data/Scripts/010_Data/002_PBS data/006_Item.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/006_Item.rb	
@@ -180,150 +180,3 @@ module GameData
     end
   end
 end
-
-#===============================================================================
-# Deprecated methods
-#===============================================================================
-# @deprecated This alias is slated to be removed in v20.
-def pbGetPocket(item)
-  Deprecation.warn_method('pbGetPocket', 'v20', 'GameData::Item.get(item).pocket')
-  return GameData::Item.get(item).pocket
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbGetPrice(item)
-  Deprecation.warn_method('pbGetPrice', 'v20', 'GameData::Item.get(item).price')
-  return GameData::Item.get(item).price
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbGetMachine(item)
-  Deprecation.warn_method('pbGetMachine', 'v20', 'GameData::Item.get(item).move')
-  return GameData::Item.get(item).move
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsTechnicalMachine?(item)
-  Deprecation.warn_method('pbIsTechnicalMachine?', 'v20', 'GameData::Item.get(item).is_TM?')
-  return GameData::Item.get(item).is_TM?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsHiddenMachine?(item)
-  Deprecation.warn_method('pbIsHiddenMachine?', 'v20', 'GameData::Item.get(item).is_HM?')
-  return GameData::Item.get(item).is_HM?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsMachine?(item)
-  Deprecation.warn_method('pbIsMachine?', 'v20', 'GameData::Item.get(item).is_machine?')
-  return GameData::Item.get(item).is_machine?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsMail?(item)
-  Deprecation.warn_method('pbIsMail?', 'v20', 'GameData::Item.get(item).is_mail?')
-  return GameData::Item.get(item).is_mail?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsMailWithPokemonIcons?(item)
-  Deprecation.warn_method('pbIsMailWithPokemonIcons?', 'v20', 'GameData::Item.get(item).is_icon_mail?')
-  return GameData::Item.get(item).is_icon_mail?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsPokeBall?(item)
-  Deprecation.warn_method('pbIsPokeBall?', 'v20', 'GameData::Item.get(item).is_poke_ball?')
-  return GameData::Item.get(item).is_poke_ball?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsSnagBall?(item)
-  Deprecation.warn_method('pbIsSnagBall?', 'v20', 'GameData::Item.get(item).is_snag_ball?')
-  return GameData::Item.get(item).is_snag_ball?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsBerry?(item)
-  Deprecation.warn_method('pbIsBerry?', 'v20', 'GameData::Item.get(item).is_berry?')
-  return GameData::Item.get(item).is_berry?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsKeyItem?(item)
-  Deprecation.warn_method('pbIsKeyItem?', 'v20', 'GameData::Item.get(item).is_key_item?')
-  return GameData::Item.get(item).is_key_item?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsEvolutionStone?(item)
-  Deprecation.warn_method('pbIsEvolutionStone?', 'v20', 'GameData::Item.get(item).is_evolution_stone?')
-  return GameData::Item.get(item).is_evolution_stone?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsFossil?(item)
-  Deprecation.warn_method('pbIsFossil?', 'v20', 'GameData::Item.get(item).is_fossil?')
-  return GameData::Item.get(item).is_fossil?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsApricorn?(item)
-  Deprecation.warn_method('pbIsApricorn?', 'v20', 'GameData::Item.get(item).is_apricorn?')
-  return GameData::Item.get(item).is_apricorn?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsGem?(item)
-  Deprecation.warn_method('pbIsGem?', 'v20', 'GameData::Item.get(item).is_gem?')
-  return GameData::Item.get(item).is_gem?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsMulch?(item)
-  Deprecation.warn_method('pbIsMulch?', 'v20', 'GameData::Item.get(item).is_mulch?')
-  return GameData::Item.get(item).is_mulch?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsMegaStone?(item)
-  Deprecation.warn_method('pbIsMegaStone?', 'v20', 'GameData::Item.get(item).is_mega_stone?')
-  return GameData::Item.get(item).is_mega_stone?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsImportantItem?(item)
-  Deprecation.warn_method('pbIsImportantItem?', 'v20', 'GameData::Item.get(item).is_important?')
-  return GameData::Item.get(item).is_important?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbCanHoldItem?(item)
-  Deprecation.warn_method('pbCanHoldItem?', 'v20', 'GameData::Item.get(item).can_hold?')
-  return GameData::Item.get(item).can_hold?
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbIsUnlosableItem?(check_item, species, ability)
-  Deprecation.warn_method('pbIsUnlosableItem?', 'v20', 'GameData::Item.get(item).unlosable?')
-  return GameData::Item.get(check_item).unlosable?(species, ability)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbItemIconFile(item)
-  Deprecation.warn_method('pbItemIconFile', 'v20', 'GameData::Item.icon_filename(item)')
-  return GameData::Item.icon_filename(item)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbHeldItemIconFile(item)
-  Deprecation.warn_method('pbHeldItemIconFile', 'v20', 'GameData::Item.held_icon_filename(item)')
-  return GameData::Item.held_icon_filename(item)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbMailBackFile(item)
-  Deprecation.warn_method('pbMailBackFile', 'v20', 'GameData::Item.mail_filename(item)')
-  return GameData::Item.mail_filename(item)
-end
diff --git a/Data/Scripts/010_Data/002_PBS data/007_BerryPlant.rb b/Data/Scripts/010_Data/002_PBS data/007_BerryPlant.rb
index 720f28e0c..d7b43bfd3 100644
--- a/Data/Scripts/010_Data/002_PBS data/007_BerryPlant.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/007_BerryPlant.rb	
@@ -23,12 +23,3 @@ module GameData
     end
   end
 end
-
-#===============================================================================
-# Deprecated methods
-#===============================================================================
-# @deprecated This alias is slated to be removed in v20.
-def pbGetBerryPlantData(item)
-  Deprecation.warn_method('pbGetBerryPlantData', 'v20', 'GameData::BerryPlant.get(item)')
-  return GameData::BerryPlant.get(item)
-end
diff --git a/Data/Scripts/010_Data/002_PBS data/008_Species.rb b/Data/Scripts/010_Data/002_PBS data/008_Species.rb
index d9e440e41..4a6daade3 100644
--- a/Data/Scripts/010_Data/002_PBS data/008_Species.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/008_Species.rb	
@@ -319,84 +319,3 @@ module GameData
     end
   end
 end
-
-#===============================================================================
-# Deprecated methods
-#===============================================================================
-# @deprecated This alias is slated to be removed in v20.
-def pbGetSpeciesData(species, form = 0, species_data_type = -1)
-  Deprecation.warn_method('pbGetSpeciesData', 'v20', 'GameData::Species.get_species_form(species, form).something')
-  return GameData::Species.get_species_form(species, form)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbGetSpeciesEggMoves(species, form = 0)
-  Deprecation.warn_method('pbGetSpeciesEggMoves', 'v20', 'GameData::Species.get_species_form(species, form).egg_moves')
-  return GameData::Species.get_species_form(species, form).egg_moves
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbGetSpeciesMoveset(species, form = 0)
-  Deprecation.warn_method('pbGetSpeciesMoveset', 'v20', 'GameData::Species.get_species_form(species, form).moves')
-  return GameData::Species.get_species_form(species, form).moves
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbGetEvolutionData(species)
-  Deprecation.warn_method('pbGetEvolutionData', 'v20', 'GameData::Species.get(species).evolutions')
-  return GameData::Species.get(species).evolutions
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbApplyBattlerMetricsToSprite(sprite, index, species_data, shadow = false, metrics = nil)
-  Deprecation.warn_method('pbApplyBattlerMetricsToSprite', 'v20', 'GameData::Species.get(species).apply_metrics_to_sprite')
-  GameData::Species.get(species).apply_metrics_to_sprite(sprite, index, shadow)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def showShadow?(species)
-  Deprecation.warn_method('showShadow?', 'v20', 'GameData::Species.get(species).shows_shadow?')
-  return GameData::Species.get(species).shows_shadow?
-end
-
-# @deprecated Use {GameData#Species#get_evolutions} instead. This alias is slated to be removed in v20.
-def pbGetEvolvedFormData(species, exclude_invalid = false)
-  Deprecation.warn_method('pbGetEvolvedFormData', 'v20', 'GameData::Species.get(species).get_evolutions')
-  return GameData::Species.get(species).get_evolutions(exclude_invalid)
-end
-
-# @deprecated Use {GameData#Species#get_family_evolutions} instead. This alias is slated to be removed in v20.
-def pbGetEvolutionFamilyData(species)   # Unused
-  Deprecation.warn_method('pbGetEvolutionFamilyData', 'v20', 'GameData::Species.get(species).get_family_evolutions')
-  return GameData::Species.get(species).get_family_evolutions
-end
-
-# @deprecated Use {GameData#Species#get_previous_species} instead. This alias is slated to be removed in v20.
-def pbGetPreviousForm(species)   # Unused
-  Deprecation.warn_method('pbGetPreviousForm', 'v20', 'GameData::Species.get(species).get_previous_species')
-  return GameData::Species.get(species).get_previous_species
-end
-
-# @deprecated Use {GameData#Species#get_baby_species} instead. This alias is slated to be removed in v20.
-def pbGetBabySpecies(species, check_items = false, item1 = nil, item2 = nil)
-  Deprecation.warn_method('pbGetBabySpecies', 'v20', 'GameData::Species.get(species).get_baby_species')
-  return GameData::Species.get(species).get_baby_species(check_items, item1, item2)
-end
-
-# @deprecated Use {GameData#Species#family_evolutions_have_method?} instead. This alias is slated to be removed in v20.
-def pbCheckEvolutionFamilyForMethod(species, method, param = nil)   # Unused
-  Deprecation.warn_method('pbCheckEvolutionFamilyForMethod', 'v20', 'GameData::Species.get(species).family_evolutions_have_method?(method)')
-  return GameData::Species.get(species).family_evolutions_have_method?(method, param)
-end
-
-# @deprecated Use {GameData#Species#family_item_evolutions_use_item?} instead. This alias is slated to be removed in v20.
-def pbCheckEvolutionFamilyForItemMethodItem(species, param = nil)
-  Deprecation.warn_method('pbCheckEvolutionFamilyForItemMethodItem', 'v20', 'GameData::Species.get(species).family_item_evolutions_use_item?(item)')
-  return GameData::Species.get(species).family_item_evolutions_use_item?(param)
-end
-
-# @deprecated Use {GameData#Species#minimum_level} instead. This alias is slated to be removed in v20.
-def pbGetMinimumLevel(species)
-  Deprecation.warn_method('pbGetMinimumLevel', 'v20', 'GameData::Species.get(species).minimum_level')
-  return GameData::Species.get(species).minimum_level
-end
diff --git a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb
index 916fb4afd..3db307561 100644
--- a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb	
@@ -232,88 +232,3 @@ module GameData
     end
   end
 end
-
-#===============================================================================
-# Deprecated methods
-#===============================================================================
-# @deprecated This alias is slated to be removed in v20.
-def pbLoadSpeciesBitmap(species, gender = 0, form = 0, shiny = false, shadow = false, back = false , egg = false)
-  Deprecation.warn_method('pbLoadSpeciesBitmap', 'v20', 'GameData::Species.sprite_bitmap(species, form, gender, shiny, shadow, back, egg)')
-  return GameData::Species.sprite_bitmap(species, form, gender, shiny, shadow, back, egg)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbLoadPokemonBitmap(pkmn, back = false)
-  Deprecation.warn_method('pbLoadPokemonBitmap', 'v20', 'GameData::Species.sprite_bitmap_from_pokemon(pkmn)')
-  return GameData::Species.sprite_bitmap_from_pokemon(pkmn, back)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbLoadPokemonBitmapSpecies(pkmn, species, back = false)
-  Deprecation.warn_method('pbLoadPokemonBitmapSpecies', 'v20', 'GameData::Species.sprite_bitmap_from_pokemon(pkmn, back, species)')
-  return GameData::Species.sprite_bitmap_from_pokemon(pkmn, back, species)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbPokemonIconFile(pkmn)
-  Deprecation.warn_method('pbPokemonIconFile', 'v20', 'GameData::Species.icon_filename_from_pokemon(pkmn)')
-  return GameData::Species.icon_filename_from_pokemon(pkmn)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbLoadPokemonIcon(pkmn)
-  Deprecation.warn_method('pbLoadPokemonIcon', 'v20', 'GameData::Species.icon_bitmap_from_pokemon(pkmn)')
-  return GameData::Species.icon_bitmap_from_pokemon(pkmn)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbPokemonFootprintFile(species, form = 0)
-  Deprecation.warn_method('pbPokemonFootprintFile', 'v20', 'GameData::Species.footprint_filename(species, form)')
-  return GameData::Species.footprint_filename(species, form)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbCheckPokemonShadowBitmapFiles(species, form = 0)
-  Deprecation.warn_method('pbCheckPokemonShadowBitmapFiles', 'v20', 'GameData::Species.shadow_filename(species, form)')
-  return GameData::Species.shadow_filename(species, form)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbLoadPokemonShadowBitmap(pkmn)
-  Deprecation.warn_method('pbLoadPokemonShadowBitmap', 'v20', 'GameData::Species.shadow_bitmap_from_pokemon(pkmn)')
-  return GameData::Species.shadow_bitmap_from_pokemon(pkmn)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbCryFile(species, form = 0)
-  if species.is_a?(Pokemon)
-    Deprecation.warn_method('pbCryFile', 'v20', 'GameData::Species.cry_filename_from_pokemon(pkmn)')
-    return GameData::Species.cry_filename_from_pokemon(species)
-  end
-  Deprecation.warn_method('pbCryFile', 'v20', 'GameData::Species.cry_filename(species, form)')
-  return GameData::Species.cry_filename(species, form)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbPlayCry(pkmn, volume = 90, pitch = nil)
-  Deprecation.warn_method('pbPlayCry', 'v20', 'GameData::Species.play_cry(pkmn)')
-  GameData::Species.play_cry(pkmn, volume, pitch)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbPlayCrySpecies(species, form = 0, volume = 90, pitch = nil)
-  Deprecation.warn_method('pbPlayCrySpecies', 'v20', 'Pokemon.play_cry(species, form)')
-  Pokemon.play_cry(species, form, volume, pitch)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbPlayCryPokemon(pkmn, volume = 90, pitch = nil)
-  Deprecation.warn_method('pbPlayCryPokemon', 'v20', 'pkmn.play_cry')
-  pkmn.play_cry(volume, pitch)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbCryFrameLength(species, form = 0, pitch = 100)
-  Deprecation.warn_method('pbCryFrameLength', 'v20', 'GameData::Species.cry_length(species, form)')
-  return GameData::Species.cry_length(species, form, pitch)
-end
diff --git a/Data/Scripts/010_Data/002_PBS data/011_Encounter.rb b/Data/Scripts/010_Data/002_PBS data/011_Encounter.rb
index e0e75bb3f..dc17b34ca 100644
--- a/Data/Scripts/010_Data/002_PBS data/011_Encounter.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/011_Encounter.rb	
@@ -66,12 +66,3 @@ module GameData
     end
   end
 end
-
-#===============================================================================
-# Deprecated methods
-#===============================================================================
-# @deprecated This alias is slated to be removed in v20.
-def pbLoadEncountersData
-  Deprecation.warn_method('pbLoadEncountersData', 'v20', 'GameData::Encounter.get(map_id, version)')
-  return nil
-end
diff --git a/Data/Scripts/010_Data/002_PBS data/012_TrainerType.rb b/Data/Scripts/010_Data/002_PBS data/012_TrainerType.rb
index 387d52415..8e3f1cb38 100644
--- a/Data/Scripts/010_Data/002_PBS data/012_TrainerType.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/012_TrainerType.rb	
@@ -100,60 +100,3 @@ module GameData
     def female?; return @gender == 1; end
   end
 end
-
-#===============================================================================
-# Deprecated methods
-#===============================================================================
-# @deprecated This alias is slated to be removed in v20.
-def pbGetTrainerTypeData(tr_type)
-  Deprecation.warn_method('pbGetTrainerTypeData', 'v20', 'GameData::TrainerType.get(trainer_type)')
-  return GameData::TrainerType.get(tr_type)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbTrainerCharFile(tr_type)   # Used by the phone
-  Deprecation.warn_method('pbTrainerCharFile', 'v20', 'GameData::TrainerType.charset_filename(trainer_type)')
-  return GameData::TrainerType.charset_filename(tr_type)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbTrainerCharNameFile(tr_type)   # Used by Battle Frontier and compiler
-  Deprecation.warn_method('pbTrainerCharNameFile', 'v20', 'GameData::TrainerType.charset_filename_brief(trainer_type)')
-  return GameData::TrainerType.charset_filename_brief(tr_type)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbTrainerSpriteFile(tr_type)
-  Deprecation.warn_method('pbTrainerSpriteFile', 'v20', 'GameData::TrainerType.front_sprite_filename(trainer_type)')
-  return GameData::TrainerType.front_sprite_filename(tr_type)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbTrainerSpriteBackFile(tr_type)
-  Deprecation.warn_method('pbTrainerSpriteBackFile', 'v20', 'GameData::TrainerType.back_sprite_filename(trainer_type)')
-  return GameData::TrainerType.back_sprite_filename(tr_type)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbPlayerSpriteFile(tr_type)
-  Deprecation.warn_method('pbPlayerSpriteFile', 'v20', 'GameData::TrainerType.player_front_sprite_filename(trainer_type)')
-  return GameData::TrainerType.player_front_sprite_filename(tr_type)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbPlayerSpriteBackFile(tr_type)
-  Deprecation.warn_method('pbPlayerSpriteBackFile', 'v20', 'GameData::TrainerType.player_back_sprite_filename(trainer_type)')
-  return GameData::TrainerType.player_back_sprite_filename(tr_type)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbTrainerHeadFile(tr_type)
-  Deprecation.warn_method('pbTrainerHeadFile', 'v20', 'GameData::TrainerType.map_icon_filename(trainer_type)')
-  return GameData::TrainerType.map_icon_filename(tr_type)
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbPlayerHeadFile(tr_type)
-  Deprecation.warn_method('pbPlayerHeadFile', 'v20', 'GameData::TrainerType.player_map_icon_filename(trainer_type)')
-  return GameData::TrainerType.player_map_icon_filename(tr_type)
-end
diff --git a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb
index 28a4de93d..ff9253f4f 100644
--- a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
@@ -164,12 +164,3 @@ module GameData
     end
   end
 end
-
-#===============================================================================
-# Deprecated methods
-#===============================================================================
-# @deprecated This alias is slated to be removed in v20.
-def pbGetTrainerData(tr_type, tr_name, tr_version = 0)
-  Deprecation.warn_method('pbGetTrainerData', 'v20', 'GameData::Trainer.get(tr_type, tr_name, tr_version)')
-  return GameData::Trainer.get(tr_type, tr_name, tr_version)
-end
diff --git a/Data/Scripts/010_Data/002_PBS data/014_Metadata.rb b/Data/Scripts/010_Data/002_PBS data/014_Metadata.rb
index 51e7a3962..e4d426366 100644
--- a/Data/Scripts/010_Data/002_PBS data/014_Metadata.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/014_Metadata.rb	
@@ -125,22 +125,3 @@ module GameData
     end
   end
 end
-
-#===============================================================================
-# Deprecated methods
-#===============================================================================
-# @deprecated This alias is slated to be removed in v20.
-def pbLoadMetadata
-  Deprecation.warn_method('pbLoadMetadata', 'v20', 'GameData::Metadata.get or GameData::MapMetadata.get(map_id)')
-  return nil
-end
-
-# @deprecated This alias is slated to be removed in v20.
-def pbGetMetadata(map_id, metadata_type)
-  if map_id == 0   # Global metadata
-    Deprecation.warn_method('pbGetMetadata', 'v20', 'GameData::Metadata.get.something')
-  else   # Map metadata
-    Deprecation.warn_method('pbGetMetadata', 'v20', 'GameData::MapMetadata.get(map_id).something')
-  end
-  return nil
-end
diff --git a/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb b/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb
index 8bcdc30e4..d1f8ade53 100644
--- a/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb
+++ b/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb
@@ -101,7 +101,6 @@ class PokeBattle_Battler
   end
 
   def fainted?; return @hp<=0; end
-  alias isFainted? fainted?
 
   attr_reader :status
 
@@ -138,7 +137,6 @@ class PokeBattle_Battler
   end
 
   def mega?; return @pokemon && @pokemon.mega?; end
-  alias isMega? mega?
 
   def hasPrimal?
     return false if @effects[PBEffects::Transform]
@@ -146,10 +144,8 @@ class PokeBattle_Battler
   end
 
   def primal?; return @pokemon && @pokemon.primal?; end
-  alias isPrimal? primal?
 
   def shadowPokemon?; return false; end
-  alias isShadow? shadowPokemon?
 
   def inHyperMode?; return false; end
 
@@ -187,7 +183,6 @@ class PokeBattle_Battler
     return @effects[PBEffects::Illusion].shiny? if @effects[PBEffects::Illusion]
     return @pokemon && @pokemon.shiny?
   end
-  alias isShiny? shiny?
 
   def owned?
     return false if !@battle.wildBattle?
diff --git a/Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb b/Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb
index c2732a0bb..3016e44e5 100644
--- a/Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb	
+++ b/Data/Scripts/011_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb	
@@ -23,22 +23,17 @@ class PokeBattle_FakeBattler
   def totalhp;        return @pokemon.totalhp; end
   def displayGender;  return @pokemon.gender;  end
   def shiny?;         return @pokemon.shiny?;  end
-  alias isShiny? shiny?
 
   def isSpecies?(check_species)
     return @pokemon && @pokemon.isSpecies?(check_species)
   end
 
   def fainted?;       return false; end
-  alias isFainted? fainted?
   def shadowPokemon?; return false; end
-  alias isShadow? shadowPokemon?
   def hasMega?;       return false; end
   def mega?;          return false; end
-  alias isMega? mega?
   def hasPrimal?;     return false; end
   def primal?;        return false; end
-  alias isPrimal? primal?
   def captured;       return false; end
   def captured=(value); end
 
diff --git a/Data/Scripts/012_Overworld/002_Overworld_Metadata.rb b/Data/Scripts/012_Overworld/002_Overworld_Metadata.rb
index 9cec49832..23c610fab 100644
--- a/Data/Scripts/012_Overworld/002_Overworld_Metadata.rb
+++ b/Data/Scripts/012_Overworld/002_Overworld_Metadata.rb
@@ -19,7 +19,6 @@ class PokemonGlobalMetadata
   attr_accessor :partner
   attr_accessor :creditsPlayed
   # Pokédex
-  attr_accessor :pokedexUnlocked # Deprecated, replaced with Player::Pokedex#unlocked_dexes
   attr_accessor :pokedexDex      # Dex currently looking at (-1 is National Dex)
   attr_accessor :pokedexIndex    # Last species viewed per Dex
   attr_accessor :pokedexMode     # Search mode
@@ -111,86 +110,6 @@ class PokemonGlobalMetadata
     # Save file
     @safesave             = false
   end
-
-  # @deprecated Use {Player#character_ID} instead. This alias is slated to be removed in v20.
-  def playerID
-    Deprecation.warn_method('PokemonGlobalMetadata#playerID', 'v20', '$Trainer.character_ID')
-    return @playerID || $Trainer.character_ID
-  end
-
-  # @deprecated Use {Player#character_ID=} instead. This alias is slated to be removed in v20.
-  def playerID=(value)
-    Deprecation.warn_method('PokemonGlobalMetadata#playerID=', 'v20', '$Trainer.character_ID=')
-    if value.nil?
-      @playerID = value   # For setting to nil by a save data conversion
-    else
-      $Trainer.character_ID = value
-    end
-  end
-
-  # @deprecated Use {Player#coins} instead. This alias is slated to be removed in v20.
-  def coins
-    Deprecation.warn_method('PokemonGlobalMetadata#coins', 'v20', '$Trainer.coins')
-    return @coins || $Trainer.coins
-  end
-
-  # @deprecated Use {Player#coins=} instead. This alias is slated to be removed in v20.
-  def coins=(value)
-    Deprecation.warn_method('PokemonGlobalMetadata#coins=', 'v20', '$Trainer.coins=')
-    if value.nil?
-      @coins = value   # For setting to nil by a save data conversion
-    else
-      $Trainer.coins = value
-    end
-  end
-
-  # @deprecated Use {Player#soot} instead. This alias is slated to be removed in v20.
-  def sootsack
-    Deprecation.warn_method('PokemonGlobalMetadata#sootsack', 'v20', '$Trainer.soot')
-    return @sootsack || $Trainer.soot
-  end
-
-  # @deprecated Use {Player#soot=} instead. This alias is slated to be removed in v20.
-  def sootsack=(value)
-    Deprecation.warn_method('PokemonGlobalMetadata#sootsack=', 'v20', '$Trainer.soot=')
-    if value.nil?
-      @sootsack = value   # For setting to nil by a save data conversion
-    else
-      $Trainer.soot = value
-    end
-  end
-
-  # @deprecated Use {Player#has_running_shoes} instead. This alias is slated to be removed in v20.
-  def runningShoes
-    Deprecation.warn_method('PokemonGlobalMetadata#runningShoes', 'v20', '$Trainer.has_running_shoes')
-    return (!@runningShoes.nil?) ? @runningShoes : $Trainer.has_running_shoes
-  end
-
-  # @deprecated Use {Player#has_running_shoes=} instead. This alias is slated to be removed in v20.
-  def runningShoes=(value)
-    Deprecation.warn_method('PokemonGlobalMetadata#runningShoes=', 'v20', '$Trainer.has_running_shoes=')
-    if value.nil?
-      @runningShoes = value   # For setting to nil by a save data conversion
-    else
-      $Trainer.has_running_shoes = value
-    end
-  end
-
-  # @deprecated Use {Player#seen_storage_creator} instead. This alias is slated to be removed in v20.
-  def seenStorageCreator
-    Deprecation.warn_method('PokemonGlobalMetadata#seenStorageCreator', 'v20', '$Trainer.seen_storage_creator')
-    return (!@seenStorageCreator.nil?) ? @seenStorageCreator : $Trainer.seen_storage_creator
-  end
-
-  # @deprecated Use {Player#seen_storage_creator=} instead. This alias is slated to be removed in v20.
-  def seenStorageCreator=(value)
-    Deprecation.warn_method('PokemonGlobalMetadata#seenStorageCreator=', 'v20', '$Trainer.seen_storage_creator=')
-    if value.nil?
-      @seenStorageCreator = value   # For setting to nil by a save data conversion
-    else
-      $Trainer.seen_storage_creator = value
-    end
-  end
 end
 
 
diff --git a/Data/Scripts/013_Items/006_Item_Mail.rb b/Data/Scripts/013_Items/006_Item_Mail.rb
index 8175a33b0..a856f5125 100644
--- a/Data/Scripts/013_Items/006_Item_Mail.rb
+++ b/Data/Scripts/013_Items/006_Item_Mail.rb
@@ -14,21 +14,6 @@ end
 
 
 
-# @deprecated Use {Mail} instead. PokemonMail is slated to be removed in v20.
-class PokemonMail
-  attr_reader :item, :message, :sender, :poke1, :poke2, :poke3
-
-  def self.convert(mail)
-    return mail if mail.is_a?(Mail)
-    item.poke1[0] = GameData::Species.get(item.poke1[0]).id if item.poke1
-    item.poke2[0] = GameData::Species.get(item.poke2[0]).id if item.poke2
-    item.poke3[0] = GameData::Species.get(item.poke3[0]).id if item.poke3
-    return Mail.new(mail.item, item.message, item.sender, item.poke1, item.poke2, item.poke3)
-  end
-end
-
-
-
 def pbMoveToMailbox(pokemon)
   $PokemonGlobal.mailbox = [] if !$PokemonGlobal.mailbox
   return false if $PokemonGlobal.mailbox.length>=10
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
index 6b2d3a0e2..cac259f4a 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb
@@ -233,7 +233,7 @@ MultipleForms.register(:ROTOM,{
         move_name = pkmn.moves[move_index].name
         pkmn.forget_move_at_index(move_index)
         pbMessage(_INTL("{1} forgot {2}...", pkmn.name, move_name))
-        pbLearnMove(:THUNDERSHOCK) if pkmn.numMoves == 0
+        pbLearnMove(pkmn, :THUNDERSHOCK) if pkmn.numMoves == 0
       end
     else
       # Turned into an alternate form; try learning that form's unique move
@@ -250,7 +250,7 @@ MultipleForms.register(:ROTOM,{
         else
           pkmn.forget_move_at_index(move_index)
           pbMessage(_INTL("{1} forgot {2}...", pkmn.name, old_move_name))
-          pbLearnMove(:THUNDERSHOCK) if pkmn.numMoves == 0
+          pbLearnMove(pkmn, :THUNDERSHOCK) if pkmn.numMoves == 0
         end
       else
         # Just try to learn this form's unique move
@@ -578,7 +578,7 @@ MultipleForms.register(:NECROZMA,{
         move_name = pkmn.moves[move_index].name
         pkmn.forget_move_at_index(move_index)
         pbMessage(_INTL("{1} forgot {2}...", pkmn.name, move_name))
-        pbLearnMove(:CONFUSION) if pkmn.numMoves == 0
+        pbLearnMove(pkmn, :CONFUSION) if pkmn.numMoves == 0
       end
     else
       # Turned into an alternate form; try learning that form's unique move
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb
index 63417609a..63a72af97 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb
@@ -205,7 +205,6 @@ class PokeBattle_Battler
     p = self.pokemon
     return p && p.shadowPokemon?
   end
-  alias isShadow? shadowPokemon?
 
   def inHyperMode?
     return false if fainted?
diff --git a/Data/Scripts/014_Pokemon/003_Pokemon_ShadowPokemon.rb b/Data/Scripts/014_Pokemon/003_Pokemon_ShadowPokemon.rb
index 304c53e3f..54137447a 100644
--- a/Data/Scripts/014_Pokemon/003_Pokemon_ShadowPokemon.rb
+++ b/Data/Scripts/014_Pokemon/003_Pokemon_ShadowPokemon.rb
@@ -43,7 +43,6 @@ class Pokemon
   def shadowPokemon?
     return @shadow && @heart_gauge && @heart_gauge >= 0
   end
-  alias isShadow? shadowPokemon?
 
   def hyper_mode
     return (self.heart_gauge == 0 || @hp == 0) ? false : @hyper_mode
diff --git a/Data/Scripts/014_Pokemon/004_Pokemon_Move.rb b/Data/Scripts/014_Pokemon/004_Pokemon_Move.rb
index 03191925c..69bf6f960 100644
--- a/Data/Scripts/014_Pokemon/004_Pokemon_Move.rb
+++ b/Data/Scripts/014_Pokemon/004_Pokemon_Move.rb
@@ -61,18 +61,3 @@ class Pokemon
     def hidden_move?;  return GameData::Move.get(@id).hidden_move?;  end
   end
 end
-
-#===============================================================================
-# Legacy move object known by Pokémon.
-#===============================================================================
-# @deprecated Use {Pokemon#Move} instead. PBMove is slated to be removed in v20.
-class PBMove
-  attr_reader :id, :pp, :ppup
-
-  def self.convert(move)
-    ret = Pokemon::Move.new(move.id)
-    ret.ppup = move.ppup
-    ret.pp = move.pp
-    return ret
-  end
-end
diff --git a/Data/Scripts/014_Pokemon/006_Pokemon_Deprecated.rb b/Data/Scripts/014_Pokemon/006_Pokemon_Deprecated.rb
deleted file mode 100644
index ccee4ebd9..000000000
--- a/Data/Scripts/014_Pokemon/006_Pokemon_Deprecated.rb
+++ /dev/null
@@ -1,207 +0,0 @@
-#===============================================================================
-# Deprecated classes, methods and constants for Pokémon.
-# These will be removed in a future Essentials version.
-#===============================================================================
-
-# @deprecated Use {Pokemon} instead. PokeBattle_Pokemon is slated to be removed in v20.
-class PokeBattle_Pokemon
-  attr_reader :name, :species, :form, :formTime, :forcedForm, :fused
-  attr_reader :personalID, :exp, :hp, :status, :statusCount
-  attr_reader :abilityflag, :genderflag, :natureflag, :natureOverride, :shinyflag
-  attr_reader :moves, :firstmoves
-  attr_reader :item, :mail
-  attr_reader :iv, :ivMaxed, :ev
-  attr_reader :happiness, :eggsteps, :pokerus
-  attr_reader :ballused, :markings, :ribbons
-  attr_reader :obtainMode, :obtainMap, :obtainText, :obtainLevel, :hatchedMap
-  attr_reader :timeReceived, :timeEggHatched
-  attr_reader :cool, :beauty, :cute, :smart, :tough, :sheen
-  attr_reader :trainerID, :ot, :otgender, :language
-  attr_reader :shadow, :heartgauge, :savedexp, :savedev, :hypermode, :shadowmoves
-
-  def initialize(*args)
-    raise "PokeBattle_Pokemon.new is deprecated. Use Pokemon.new instead."
-  end
-
-  def self.convert(pkmn)
-    return pkmn if pkmn.is_a?(Pokemon)
-    owner = Pokemon::Owner.new(pkmn.trainerID, pkmn.ot, pkmn.otgender, pkmn.language)
-    # Set level to 1 initially, as it will be recalculated later
-    ret = Pokemon.new(pkmn.species, 1, owner, false, false)
-    ret.forced_form      = pkmn.forcedForm if pkmn.forcedForm
-    ret.time_form_set    = pkmn.formTime
-    ret.exp              = pkmn.exp
-    ret.steps_to_hatch   = pkmn.eggsteps
-    ret.status           = pkmn.status
-    ret.statusCount      = pkmn.statusCount
-    ret.gender           = pkmn.genderflag
-    ret.shiny            = pkmn.shinyflag
-    ret.ability_index    = pkmn.abilityflag
-    ret.nature           = pkmn.natureflag
-    ret.nature_for_stats = pkmn.natureOverride
-    ret.item             = pkmn.item
-    ret.mail             = PokemonMail.convert(pkmn.mail) if pkmn.mail
-    pkmn.moves.each { |m| ret.moves.push(PBMove.convert(m)) if m && m.id > 0 }
-    if pkmn.firstmoves
-      pkmn.firstmoves.each { |m| ret.add_first_move(m) }
-    end
-    if pkmn.ribbons
-      pkmn.ribbons.each { |r| ret.giveRibbon(r) }
-    end
-    ret.cool             = pkmn.cool if pkmn.cool
-    ret.beauty           = pkmn.beauty if pkmn.beauty
-    ret.cute             = pkmn.cute if pkmn.cute
-    ret.smart            = pkmn.smart if pkmn.smart
-    ret.tough            = pkmn.tough if pkmn.tough
-    ret.sheen            = pkmn.sheen if pkmn.sheen
-    ret.pokerus          = pkmn.pokerus if pkmn.pokerus
-    ret.name             = pkmn.name if pkmn.name != ret.speciesName
-    ret.happiness        = pkmn.happiness
-    ret.poke_ball        = :POKEBALL   # pbBallTypeToItem(pkmn.ballused).id
-    ret.markings         = pkmn.markings if pkmn.markings
-    GameData::Stat.each_main do |s|
-      ret.iv[s.id]       = pkmn.iv[s.id_number]
-      ret.ivMaxed[s.id]  = pkmn.ivMaxed[s.id_number] if pkmn.ivMaxed
-      ret.ev[s.id]       = pkmn.ev[s.id_number]
-    end
-    ret.obtain_method    = pkmn.obtainMode
-    ret.obtain_map       = pkmn.obtainMap
-    ret.obtain_text      = pkmn.obtainText
-    ret.obtain_level     = pkmn.obtainLevel if pkmn.obtainLevel
-    ret.hatched_map      = pkmn.hatchedMap
-    ret.timeReceived     = pkmn.timeReceived
-    ret.timeEggHatched   = pkmn.timeEggHatched
-    if pkmn.fused
-      ret.fused = PokeBattle_Pokemon.convert(pkmn.fused) if pkmn.fused.is_a?(PokeBattle_Pokemon)
-      ret.fused = pkmn.fused if pkmn.fused.is_a?(Pokemon)
-    end
-    ret.personalID       = pkmn.personalID
-    ret.hp               = pkmn.hp
-    if pkmn.shadow
-      ret.shadow         = pkmn.shadow
-      ret.heart_gauge    = pkmn.heartgauge
-      ret.hyper_mode     = pkmn.hypermode
-      ret.saved_exp      = pkmn.savedexp
-      if pkmn.savedev
-        GameData::Stat.each_main { |s| ret.saved_ev[s.id] = pkmn.savedev[s.pbs_order] if s.pbs_order >= 0 }
-      end
-      ret.shadow_moves   = []
-      pkmn.shadowmoves.each_with_index do |move, i|
-        ret.shadow_moves[i] = GameData::Move.get(move).id if move
-      end
-    end
-    # NOTE: Intentionally set last, as it recalculates stats.
-    ret.form_simple      = pkmn.form || 0
-    return ret
-  end
-end
-
-class Pokemon
-  # @deprecated Use {MAX_NAME_SIZE} instead. This alias is slated to be removed in v20.
-  MAX_POKEMON_NAME_SIZE = MAX_NAME_SIZE
-  deprecate_constant :MAX_POKEMON_NAME_SIZE
-
-  # @deprecated Use {Owner#public_id} instead. This alias is slated to be removed in v20.
-  def publicID
-    Deprecation.warn_method('Pokemon#publicID', 'v20', 'Pokemon::Owner#public_id')
-    return @owner.public_id
-  end
-
-  # @deprecated Use {Owner#id} instead. This alias is slated to be removed in v20.
-  def trainerID
-    Deprecation.warn_method('Pokemon#trainerID', 'v20', 'Pokemon::Owner#id')
-    return @owner.id
-  end
-
-  # @deprecated Use {Owner#id=} instead. This alias is slated to be removed in v20.
-  def trainerID=(value)
-    Deprecation.warn_method('Pokemon#trainerID=', 'v20', 'Pokemon::Owner#id=')
-    @owner.id = value
-  end
-
-  # @deprecated Use {Owner#name} instead. This alias is slated to be removed in v20.
-  def ot
-    Deprecation.warn_method('Pokemon#ot', 'v20', 'Pokemon::Owner#name')
-    return @owner.name
-  end
-
-  # @deprecated Use {Owner#name=} instead. This alias is slated to be removed in v20.
-  def ot=(value)
-    Deprecation.warn_method('Pokemon#ot=', 'v20', 'Pokemon::Owner#name=')
-    @owner.name = value
-  end
-
-  # @deprecated Use {Owner#gender} instead. This alias is slated to be removed in v20.
-  def otgender
-    Deprecation.warn_method('Pokemon#otgender', 'v20', 'Pokemon::Owner#gender')
-    return @owner.gender
-  end
-
-  # @deprecated Use {Owner#gender=} instead. This alias is slated to be removed in v20.
-  def otgender=(value)
-    Deprecation.warn_method('Pokemon#otgender=', 'v20', 'Pokemon::Owner#gender=')
-    @owner.gender = value
-  end
-
-  # @deprecated Use {Owner#language} instead. This alias is slated to be removed in v20.
-  def language
-    Deprecation.warn_method('Pokemon#language', 'v20', 'Pokemon::Owner#language')
-    return @owner.language
-  end
-
-  # @deprecated Use {Owner#language=} instead. This alias is slated to be removed in v20.
-  def language=(value)
-    Deprecation.warn_method('Pokemon#language=', 'v20', 'Pokemon::Owner#language=')
-    @owner.language = value
-  end
-
-  # @deprecated Use {Pokemon#shiny=} instead. This alias is slated to be removed in v20.
-  def makeShiny
-    Deprecation.warn_method('Pokemon#makeShiny', 'v20', 'Pokemon#shiny=true')
-    self.shiny = true
-  end
-
-  # @deprecated Use {Pokemon#shiny=} instead. This alias is slated to be removed in v20.
-  def makeNotShiny
-    Deprecation.warn_method('Pokemon#makeNotShiny', 'v20', 'Pokemon#shiny=false')
-    self.shiny = false
-  end
-
-  deprecated_method_alias :isEgg?, :egg?, removal_in: 'v20'
-  deprecated_method_alias :isAble?, :able?, removal_in: 'v20'
-  deprecated_method_alias :isFainted?, :fainted?, removal_in: 'v20'
-  deprecated_method_alias :isShiny?, :shiny?, removal_in: 'v20'
-  deprecated_method_alias :setGender, :gender=, removal_in: 'v20'
-  deprecated_method_alias :isMale?, :male?, removal_in: 'v20'
-  deprecated_method_alias :isFemale?, :female?, removal_in: 'v20'
-  deprecated_method_alias :isGenderless?, :genderless?, removal_in: 'v20'
-  deprecated_method_alias :isSingleGendered?, :singleGendered?, removal_in: 'v20'
-  deprecated_method_alias :setAbility, :ability_index=, removal_in: 'v20'
-  deprecated_method_alias :setNature, :nature=, removal_in: 'v20'
-  deprecated_method_alias :setItem, :item=, removal_in: 'v20'
-  deprecated_method_alias :healStatus, :heal_status, removal_in: 'v20'
-  deprecated_method_alias :knowsMove?, :hasMove?, removal_in: 'v20'
-  deprecated_method_alias :resetMoves, :reset_moves, removal_in: 'v20'
-  deprecated_method_alias :pbLearnMove, :learn_move, removal_in: 'v20'
-  deprecated_method_alias :pbDeleteMove, :forget_move, removal_in: 'v20'
-  deprecated_method_alias :pbDeleteMoveAtIndex, :forget_move_at_index, removal_in: 'v20'
-  deprecated_method_alias :pbRecordFirstMoves, :record_first_moves, removal_in: 'v20'
-  deprecated_method_alias :pbAddFirstMove, :add_first_move, removal_in: 'v20'
-  deprecated_method_alias :pbRemoveFirstMove, :remove_first_move, removal_in: 'v20'
-  deprecated_method_alias :pbClearFirstMoves, :clear_first_moves, removal_in: 'v20'
-  deprecated_method_alias :pbUpdateShadowMoves, :update_shadow_moves, removal_in: 'v20'
-  deprecated_method_alias :isForeign?, :foreign?, removal_in: 'v20'
-  deprecated_method_alias :calcStats, :calc_stats, removal_in: 'v20'
-  deprecated_method_alias :isMega?, :mega?, removal_in: 'v20'
-  deprecated_method_alias :isPrimal?, :primal?, removal_in: 'v20'
-end
-
-# (see Pokemon#initialize)
-# @deprecated Use +Pokemon.new+ instead. This method and its aliases are
-#   slated to be removed in v20.
-def pbNewPkmn(species, level, owner = $Trainer, withMoves = true)
-  Deprecation.warn_method('pbNewPkmn', 'v20', 'Pokemon.new')
-  return Pokemon.new(species, level, owner, withMoves)
-end
-alias pbGenPkmn pbNewPkmn
-alias pbGenPoke pbNewPkmn
diff --git a/Data/Scripts/015_Trainers and player/006_Player_Deprecated.rb b/Data/Scripts/015_Trainers and player/006_Player_Deprecated.rb
deleted file mode 100644
index acfb81bef..000000000
--- a/Data/Scripts/015_Trainers and player/006_Player_Deprecated.rb	
+++ /dev/null
@@ -1,194 +0,0 @@
-#===============================================================================
-# Deprecated
-#===============================================================================
-class Trainer
-  deprecated_method_alias :fullname, :full_name, removal_in: 'v20'
-  deprecated_method_alias :publicID, :public_ID, removal_in: 'v20'
-  deprecated_method_alias :secretID, :secret_ID, removal_in: 'v20'
-  deprecated_method_alias :getForeignID, :make_foreign_ID, removal_in: 'v20'
-  deprecated_method_alias :trainerTypeName, :trainer_type_name, removal_in: 'v20'
-  deprecated_method_alias :isMale?, :male?, removal_in: 'v20'
-  deprecated_method_alias :isFemale?, :female?, removal_in: 'v20'
-  deprecated_method_alias :moneyEarned, :base_money, removal_in: 'v20'
-  deprecated_method_alias :skill, :skill_level, removal_in: 'v20'
-  deprecated_method_alias :skillCode, :skill_code, removal_in: 'v20'
-  deprecated_method_alias :hasSkillCode, :has_skill_code?, removal_in: 'v20'
-  deprecated_method_alias :pokemonParty, :pokemon_party, removal_in: 'v20'
-  deprecated_method_alias :ablePokemonParty, :able_party, removal_in: 'v20'
-  deprecated_method_alias :partyCount, :party_count, removal_in: 'v20'
-  deprecated_method_alias :pokemonCount, :pokemon_count, removal_in: 'v20'
-  deprecated_method_alias :ablePokemonCount, :able_pokemon_count, removal_in: 'v20'
-  deprecated_method_alias :firstParty, :first_party, removal_in: 'v20'
-  deprecated_method_alias :firstPokemon, :first_pokemon, removal_in: 'v20'
-  deprecated_method_alias :firstAblePokemon, :first_able_pokemon, removal_in: 'v20'
-  deprecated_method_alias :lastParty, :last_party, removal_in: 'v20'
-  deprecated_method_alias :lastPokemon, :last_pokemon, removal_in: 'v20'
-  deprecated_method_alias :lastAblePokemon, :last_able_pokemon, removal_in: 'v20'
-end
-
-class Player < Trainer
-  class Pokedex
-    # @deprecated Use {seen?} or {set_seen} instead. This alias is slated to be removed in v20.
-    attr_reader :seen_forms
-  end
-
-  deprecated_method_alias :numbadges, :badge_count, removal_in: 'v20'
-  deprecated_method_alias :metaID, :character_ID, removal_in: 'v20'
-  deprecated_method_alias :mysterygiftaccess, :mystery_gift_unlocked, removal_in: 'v20'
-  deprecated_method_alias :mysterygift, :mystery_gifts, removal_in: 'v20'
-  deprecated_method_alias :hasSeen?, :seen?, removal_in: 'v20'
-  deprecated_method_alias :hasOwned?, :owned?, removal_in: 'v20'
-  deprecated_method_alias :pokegear, :has_pokegear, removal_in: 'v20'
-
-  # @deprecated Use {Player::Pokedex#set_seen} instead. This alias is slated to be removed in v20.
-  def setSeen(species)
-    Deprecation.warn_method('Player#setSeen', 'v20', 'Player::Pokedex#set_seen(species)')
-    return @pokedex.set_seen(species)
-  end
-
-  # @deprecated Use {Player::Pokedex#set_owned} instead. This alias is slated to be removed in v20.
-  def setOwned(species)
-    Deprecation.warn_method('Player#setOwned', 'v20', 'Player::Pokedex#set_owned(species)')
-    return @pokedex.set_owned(species)
-  end
-
-  # @deprecated Use {Player::Pokedex#seen_count} instead. This alias is slated to be removed in v20.
-  def pokedexSeen(dex = -1)
-    Deprecation.warn_method('Player#pokedexSeen', 'v20', 'Player::Pokedex#seen_count')
-    return @pokedex.seen_count(dex)
-  end
-
-  # @deprecated Use {Player::Pokedex#owned_count} instead. This alias is slated to be removed in v20.
-  def pokedexOwned(dex = -1)
-    Deprecation.warn_method('Player#pokedexOwned', 'v20', 'Player::Pokedex#owned_count')
-    return @pokedex.owned_count(dex)
-  end
-
-  # @deprecated Use {Player::Pokedex#seen_forms_count} instead. This alias is slated to be removed in v20.
-  def numFormsSeen(species)
-    Deprecation.warn_method('Player#numFormsSeen', 'v20', 'Player::Pokedex#seen_forms_count')
-    return @pokedex.seen_forms_count(species)
-  end
-
-  # @deprecated Use {Player::Pokedex#clear} instead. This alias is slated to be removed in v20.
-  def clearPokedex
-    Deprecation.warn_method('Player#clearPokedex', 'v20', 'Player::Pokedex#clear')
-    return @pokedex.clear
-  end
-end
-
-# @deprecated Use {Player} instead. PokeBattle_Trainer is slated to be removed in v20.
-class PokeBattle_Trainer
-  attr_reader :trainertype, :name, :id, :metaID, :outfit, :language
-  attr_reader :party, :badges, :money
-  attr_reader :seen, :owned, :formseen, :formlastseen, :shadowcaught
-  attr_reader :pokedex, :pokegear
-  attr_reader :mysterygiftaccess, :mysterygift
-
-  def self.convert(trainer)
-    validate trainer => self
-    ret = Player.new(trainer.name, trainer.trainertype)
-    ret.id                    = trainer.id
-    ret.character_ID          = trainer.metaID if trainer.metaID
-    ret.outfit                = trainer.outfit if trainer.outfit
-    ret.language              = trainer.language if trainer.language
-    trainer.party.each { |p| ret.party.push(PokeBattle_Pokemon.convert(p)) }
-    ret.badges                = trainer.badges.clone
-    ret.money                 = trainer.money
-    trainer.seen.each_with_index { |value, i| ret.pokedex.set_seen(i, false) if value }
-    trainer.owned.each_with_index { |value, i| ret.pokedex.set_owned(i, false) if value }
-    trainer.formseen.each_with_index do |value, i|
-      species_id = GameData::Species.try_get(i)&.species
-      next if species_id.nil? || value.nil?
-      ret.pokedex.seen_forms[species_id] = [value[0].clone, value[1].clone] if value
-    end
-    trainer.formlastseen.each_with_index do |value, i|
-      species_id = GameData::Species.try_get(i)&.species
-      next if species_id.nil? || value.nil?
-      ret.pokedex.set_last_form_seen(species_id, value[0], value[1]) if value
-    end
-    if trainer.shadowcaught
-      trainer.shadowcaught.each_with_index do |value, i|
-        ret.pokedex.set_shadow_pokemon_owned(i) if value
-      end
-    end
-    ret.pokedex.refresh_accessible_dexes
-    ret.has_pokedex           = trainer.pokedex
-    ret.has_pokegear          = trainer.pokegear
-    ret.mystery_gift_unlocked = trainer.mysterygiftaccess if trainer.mysterygiftaccess
-    ret.mystery_gifts         = trainer.mysterygift.clone if trainer.mysterygift
-    return ret
-  end
-end
-
-# @deprecated Use {Player#remove_pokemon_at_index} instead. This alias is slated to be removed in v20.
-def pbRemovePokemonAt(index)
-  Deprecation.warn_method('pbRemovePokemonAt', 'v20', 'Player#remove_pokemon_at_index')
-  return $Trainer.remove_pokemon_at_index(index)
-end
-
-# @deprecated Use {Player#has_other_able_pokemon?} instead. This alias is slated to be removed in v20.
-def pbCheckAble(index)
-  Deprecation.warn_method('pbCheckAble', 'v20', 'Player#has_other_able_pokemon?')
-  return $Trainer.has_other_able_pokemon?(index)
-end
-
-# @deprecated Use {Player#all_fainted?} instead. This alias is slated to be removed in v20.
-def pbAllFainted
-  Deprecation.warn_method('pbAllFainted', 'v20', 'Player#all_fainted?')
-  return $Trainer.all_fainted?
-end
-
-# @deprecated Use {Player#has_species?} instead. This alias is slated to be removed in v20.
-def pbHasSpecies?(species, form = -1)
-  Deprecation.warn_method('pbHasSpecies?', 'v20', 'Player#has_species?')
-  return $Trainer.has_species?(species, form)
-end
-
-# @deprecated Use {Player#has_fateful_species?} instead. This alias is slated to be removed in v20.
-def pbHasFatefulSpecies?(species)
-  Deprecation.warn_method('pbHasFatefulSpecies?', 'v20', 'Player#has_fateful_species?')
-  return $Trainer.has_fateful_species?(species)
-end
-
-# @deprecated Use {Player#has_pokemon_of_type?} instead. This alias is slated to be removed in v20.
-def pbHasType?(type)
-  Deprecation.warn_method('pbHasType?', 'v20', 'Player#has_pokemon_of_type?')
-  return $Trainer.has_pokemon_of_type?(type)
-end
-
-# @deprecated Use {Player#get_pokemon_with_move} instead. This alias is slated to be removed in v20.
-def pbCheckMove(move)
-  Deprecation.warn_method('pbCheckMove', 'v20', 'Player#get_pokemon_with_move')
-  return $Trainer.get_pokemon_with_move(move)
-end
-
-# @deprecated Use {Player#heal_party} instead. This alias is slated to be removed in v20.
-def pbHealAll
-  Deprecation.warn_method('pbHealAll', 'v20', 'Player#heal_party')
-  $Trainer.heal_party
-end
-
-# @deprecated Use {Player::Pokedex#unlock} instead. This alias is slated to be removed in v20.
-def pbUnlockDex(dex=-1)
-  Deprecation.warn_method('pbUnlockDex', 'v20', '$Trainer.pokedex.unlock(dex)')
-  $Trainer.pokedex.unlock(dex)
-end
-
-# @deprecated Use {Player::Pokedex#lock} instead. This alias is slated to be removed in v20.
-def pbLockDex(dex=-1)
-  Deprecation.warn_method('pbLockDex', 'v20', '$Trainer.pokedex.lock(dex)')
-  $Trainer.pokedex.lock(dex)
-end
-
-# @deprecated Use {Player::Pokedex#register} instead. This alias is slated to be removed in v20.
-def pbSeenForm(species, gender = 0, form = 0)
-  Deprecation.warn_method('pbSeenForm', 'v20', '$Trainer.pokedex.register(species, gender, form)')
-  $Trainer.pokedex.register(species, gender, form)
-end
-
-# @deprecated Use {Player::Pokedex#register_last_seen} instead. This alias is slated to be removed in v20.
-def pbUpdateLastSeenForm(pkmn)
-  Deprecation.warn_method('Player#pokedexSeen', 'v20', '$Trainer.pokedex.register_last_seen(pkmn)')
-  $Trainer.pokedex.register_last_seen(pkmn)
-end
diff --git a/Data/Scripts/016_UI/014_UI_Save.rb b/Data/Scripts/016_UI/014_UI_Save.rb
index a51233dbb..2d98e128a 100644
--- a/Data/Scripts/016_UI/014_UI_Save.rb
+++ b/Data/Scripts/016_UI/014_UI_Save.rb
@@ -1,9 +1,3 @@
-# @deprecated Use {Game.save} instead. pbSave is slated to be removed in v20.
-def pbSave(safesave = false)
-  Deprecation.warn_method('pbSave', 'v20', 'Game.save')
-  Game.save(safe: safesave)
-end
-
 def pbEmergencySave
   oldscene = $scene
   $scene = nil
diff --git a/Data/Scripts/016_UI/022_UI_PurifyChamber.rb b/Data/Scripts/016_UI/022_UI_PurifyChamber.rb
index 423cb9a5e..73c43935b 100644
--- a/Data/Scripts/016_UI/022_UI_PurifyChamber.rb
+++ b/Data/Scripts/016_UI/022_UI_PurifyChamber.rb
@@ -20,40 +20,6 @@ class PokemonGlobalMetadata
     @purifyChamber = PurifyChamber.new() if !@purifyChamber
     return @purifyChamber
   end
-
-  # @deprecated Use {Player#seen_purify_chamber} instead. This alias is slated to be removed in v20.
-  def seenPurifyChamber
-    Deprecation.warn_method('PokemonGlobalMetadata#seenPurifyChamber', 'v20', '$Trainer.seen_purify_chamber')
-    return @seenPurifyChamber if !@seenPurifyChamber.nil?
-    return ($Trainer) ? $Trainer.seen_purify_chamber : false
-  end
-
-  # @deprecated Use {Player#seen_purify_chamber=} instead. This alias is slated to be removed in v20.
-  def seenPurifyChamber=(value)
-    Deprecation.warn_method('PokemonGlobalMetadata#seenPurifyChamber=', 'v20', '$Trainer.seen_purify_chamber=')
-    if value.nil?
-      @seenPurifyChamber = value   # For setting to nil by a save data conversion
-    else
-      $Trainer.seen_purify_chamber = value
-    end
-  end
-
-  # @deprecated Use {Player#has_snag_machine} instead. This alias is slated to be removed in v20.
-  def snagMachine
-    Deprecation.warn_method('PokemonGlobalMetadata#snagMachine', 'v20', '$Trainer.has_snag_machine')
-    return @snagMachine if !@snagMachine.nil?
-    return ($Trainer) ? $Trainer.has_snag_machine : false
-  end
-
-  # @deprecated Use {Player#has_snag_machine=} instead. This alias is slated to be removed in v20.
-  def snagMachine=(value)
-    Deprecation.warn_method('PokemonGlobalMetadata#snagMachine=', 'v20', '$Trainer.has_snag_machine=')
-    if value.nil?
-      @snagMachine = value   # For setting to nil by a save data conversion
-    else
-      $Trainer.has_snag_machine = value
-    end
-  end
 end
 
 #===============================================================================
diff --git a/Data/Scripts/016_UI/023_UI_MysteryGift.rb b/Data/Scripts/016_UI/023_UI_MysteryGift.rb
index d2c43adcf..98801a68e 100644
--- a/Data/Scripts/016_UI/023_UI_MysteryGift.rb
+++ b/Data/Scripts/016_UI/023_UI_MysteryGift.rb
@@ -343,7 +343,7 @@ def pbMysteryGiftDecrypt(gift)
   if ret
     ret.each do |gift|
       if gift[1] == 0   # Pokémon
-        gift[2] = PokeBattle_Pokemon.convert(gift[2])
+        gift[2] = gift[2]
       else   # Item
         gift[2] = GameData::Item.get(gift[2]).id
       end
diff --git a/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb b/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb
index 6f67c12b4..d35de8238 100644
--- a/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb	
+++ b/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb	
@@ -1144,16 +1144,6 @@ DebugMenuCommands.register("createpbs", {
   }
 })
 
-DebugMenuCommands.register("renamesprites", {
-  "parent"      => "othermenu",
-  "name"        => _INTL("Rename Old Sprites"),
-  "description" => _INTL("Renames and moves Pokémon/item/trainer sprites from their old places."),
-  "always_show" => true,
-  "effect"      => proc {
-    SpriteRenamer.convert_files
-  }
-})
-
 DebugMenuCommands.register("invalidtiles", {
   "parent"      => "othermenu",
   "name"        => _INTL("Fix Invalid Tiles"),
diff --git a/Data/Scripts/020_Debug/003_Debug menus/004_Debug_MenuSpriteRenamer.rb b/Data/Scripts/020_Debug/003_Debug menus/004_Debug_MenuSpriteRenamer.rb
deleted file mode 100644
index c38d1f542..000000000
--- a/Data/Scripts/020_Debug/003_Debug menus/004_Debug_MenuSpriteRenamer.rb	
+++ /dev/null
@@ -1,311 +0,0 @@
-class File
-  # Copies the source file to the destination path.
-  def self.copy(source, destination)
-    data = ""
-    t = Time.now
-    File.open(source, 'rb') do |f|
-      while r = f.read(4096)
-        if Time.now - t > 1
-          Graphics.update
-          t = Time.now
-        end
-        data += r
-      end
-    end
-    File.delete(destination) if File.file?(destination)
-    f = File.new(destination, 'wb')
-    f.write data
-    f.close
-  end
-
-  # Copies the source to the destination and deletes the source.
-  def self.move(source, destination)
-    File.copy(source, destination)
-    File.delete(source)
-  end
-end
-
-#===============================================================================
-#
-#===============================================================================
-module SpriteRenamer
-  module_function
-
-  def readDirectoryFiles(directory, formats)
-    files = []
-    Dir.chdir(directory) {
-      for i in 0...formats.length
-        Dir.glob(formats[i]) { |f| files.push(f) }
-      end
-    }
-    return files
-  end
-
-  def convert_pokemon_filename(full_name, default_prefix = "")
-    name = full_name
-    extension = ".png"
-    if full_name[/^(.+)\.([^\.]+)$/]   # Of the format something.abc
-      name = $~[1]
-      extension = "." + $~[2]
-    end
-    prefix = default_prefix
-    form = female = shadow = crack = ""
-    if default_prefix == ""
-      if name[/s/] && !name[/shadow/]
-        prefix = (name[/b/]) ? "Back shiny/" : "Front shiny/"
-      else
-        prefix = (name[/b/]) ? "Back/" : "Front/"
-      end
-    elsif default_prefix == "Icons/"
-      prefix = "Icons shiny/" if name[/s/] && !name[/shadow/]
-    end
-    if name[/000/]
-      species = "000"
-    elsif name[/^(\d+)$/] || name[/^(\d+)\D/]
-      species_number = $~[1].to_i
-      species_data = GameData::Species.try_get(species_number)
-      raise _INTL("Species {1} is not defined (trying to rename Pokémon graphic {2}).", species_number, full_name) if !species_data
-      species = species_data.id.to_s
-      form = "_" + $~[1].to_s if name[/_(\d+)$/] || name[/_(\d+)\D/]
-      female = "_female" if name[/f/]
-      shadow = "_shadow" if name[/_shadow/]
-      if name[/egg/]
-        prefix = "Eggs/"
-        crack = "_icon" if default_prefix == "Icons/"
-        crack = "_cracks" if name[/eggCracks/]
-      end
-    end
-    return prefix + species + form + female + shadow + crack + extension
-  end
-
-  def convert_pokemon_sprites(src_dir, dest_dir)
-    return if !FileTest.directory?(src_dir)
-    # generates a list of all graphic files
-    files = readDirectoryFiles(src_dir, ["*.png"])
-    # starts automatic renaming
-    files.each_with_index do |file, i|
-      Graphics.update if i % 100 == 0
-      pbSetWindowText(_INTL("Converting Pokémon sprites {1}/{2}...", i, files.length)) if i % 50 == 0
-      case file
-      when "battlers.png"
-        File.delete(src_dir + file)
-      when "egg.png"
-        File.move(src_dir + file, dest_dir + "Eggs/000.png")
-      when "eggCracks.png"
-        File.move(src_dir + file, dest_dir + "Eggs/000_cracks.png")
-      else
-        next if !file[/^\d+[^\.]*\.[^\.]*$/]
-        new_filename = convert_pokemon_filename(file)
-        # moves the files into their appropriate folders
-        File.move(src_dir + file, dest_dir + new_filename)
-      end
-    end
-    Dir.delete(src_dir) rescue nil
-  end
-
-  def convert_pokemon_icons(src_dir, dest_dir)
-    return if !FileTest.directory?(src_dir)
-    # generates a list of all graphic files
-    files = readDirectoryFiles(src_dir, ["*.png"])
-    # starts automatic renaming
-    files.each_with_index do |file, i|
-      Graphics.update if i % 100 == 0
-      pbSetWindowText(_INTL("Converting Pokémon icons {1}/{2}...", i, files.length)) if i % 50 == 0
-      case file
-      when "iconEgg.png"
-        File.move(src_dir + file, dest_dir + "Eggs/000_egg.png")
-      else
-        next if !file[/^icon\d+[^\.]*\.[^\.]*$/]
-        new_filename = convert_pokemon_filename(file.sub(/^icon/, ''), "Icons/")
-        # moves the files into their appropriate folders
-        File.move(src_dir + file, dest_dir + new_filename)
-      end
-    end
-  end
-
-  def convert_pokemon_footprints(src_dir, dest_dir)
-    return if !FileTest.directory?(src_dir)
-    # generates a list of all graphic files
-    files = readDirectoryFiles(src_dir, ["*.png"])
-    # starts automatic renaming
-    files.each_with_index do |file, i|
-      Graphics.update if i % 100 == 0
-      pbSetWindowText(_INTL("Converting footprints {1}/{2}...", i, files.length)) if i % 50 == 0
-      next if !file[/^footprint\d+[^\.]*\.[^\.]*$/]
-      new_filename = convert_pokemon_filename(file.sub(/^footprint/, ''), "Footprints/")
-      # moves the files into their appropriate folders
-      File.move(src_dir + file, dest_dir + new_filename)
-    end
-    Dir.delete(src_dir) rescue nil
-  end
-
-  def convert_item_icons(src_dir, dest_dir)
-    return if !FileTest.directory?(src_dir)
-    # generates a list of all graphic files
-    files = readDirectoryFiles(src_dir, ["*.png"])
-    # starts automatic renaming
-    files.each_with_index do |file, i|
-      Graphics.update if i % 100 == 0
-      pbSetWindowText(_INTL("Converting item icons {1}/{2}...", i, files.length)) if i % 50 == 0
-      case file
-      when "item000.png"
-        File.move(src_dir + file, dest_dir + "000.png")
-      when "itemBack.png"
-        File.move(src_dir + file, dest_dir + "back.png")
-      else
-        if file[/^itemMachine(.+)\.([^\.]*)$/]
-          type = $~[1]
-          extension = $~[2]
-          File.move(src_dir + file, dest_dir + "machine_" + type + "." + extension)
-        elsif file[/^item(\d+)\.([^\.]*)$/]
-          item_number = $~[1].to_i
-          extension = $~[2]
-          item_data = GameData::Item.try_get(item_number)
-          raise _INTL("Item {1} is not defined (trying to rename item icon {2}).", item_number, file) if !item_data
-          item = item_data.id.to_s
-          # moves the files into their appropriate folders
-          File.move(src_dir + file, dest_dir + item + "." + extension)
-        end
-      end
-    end
-  end
-
-  def convert_pokemon_cries(src_dir)
-    return if !FileTest.directory?(src_dir)
-    # generates a list of all audio files
-    files = readDirectoryFiles(src_dir, ["*.wav", "*.mp3", "*.ogg"])
-    # starts automatic renaming
-    files.each_with_index do |file, i|
-      Graphics.update if i % 100 == 0
-      pbSetWindowText(_INTL("Converting Pokémon cries {1}/{2}...", i, files.length)) if i % 50 == 0
-      if file[/^(\d+)Cry[^\.]*\.([^\.]*)$/]
-        species_number = $~[1].to_i
-        extension = $~[2]
-        form = (file[/Cry_(\d+)\./]) ? sprintf("_%s", $~[1]) : ""
-        species_data = GameData::Species.try_get(species_number)
-        raise _INTL("Species {1} is not defined (trying to rename species cry {2}).", species_number, file) if !species_data
-        species = species_data.id.to_s
-        File.move(src_dir + file, src_dir + species + form + "." + extension)
-      end
-    end
-  end
-
-  def convert_trainer_sprites(src_dir)
-    return if !FileTest.directory?(src_dir)
-    # generates a list of all graphic files
-    if src_dir == "Graphics/Characters/"
-      files = readDirectoryFiles(src_dir, ["trchar*.png"])
-    else
-      files = readDirectoryFiles(src_dir, ["*.png"])
-    end
-    # starts automatic renaming
-    files.each_with_index do |file, i|
-      Graphics.update if i % 100 == 0
-      pbSetWindowText(_INTL("Converting trainer sprites {1}/{2}...", i, files.length)) if i % 50 == 0
-      if src_dir == "Graphics/Characters/"
-        if file[/^trchar(\d+)\.([^\.]*)$/]
-          tr_type_number = $~[1].to_i
-          extension = $~[2]
-          tr_type_data = GameData::TrainerType.try_get(tr_type_number)
-          raise _INTL("Trainer type {1} is not defined (trying to rename trainer charset {2}).", tr_type_number, file) if !tr_type_data
-          tr_type = tr_type_data.id.to_s
-          File.move(src_dir + file, src_dir + "trainer_" + tr_type + "." + extension)
-        end
-      else
-        if file[/^trainer(\d+)\.([^\.]*)$/]
-          tr_type_number = $~[1].to_i
-          extension = $~[2]
-          tr_type_data = GameData::TrainerType.try_get(tr_type_number)
-          raise _INTL("Trainer type {1} is not defined (trying to rename trainer sprite {2}).", tr_type_number, file) if !tr_type_data
-          tr_type = tr_type_data.id.to_s
-          File.move(src_dir + file, src_dir + tr_type + "." + extension)
-        elsif file[/^trback(\d+)\.([^\.]*)$/]
-          tr_type_number = $~[1].to_i
-          extension = $~[2]
-          tr_type_data = GameData::TrainerType.try_get(tr_type_number)
-          raise _INTL("Trainer type {1} is not defined (trying to rename trainer sprite {2}).", tr_type_number, file) if !tr_type_data
-          tr_type = tr_type_data.id.to_s
-          File.move(src_dir + file, src_dir + tr_type + "_back." + extension)
-        end
-      end
-    end
-  end
-
-  def convert_player_metadata_charsets
-    changed = false
-    for i in 0...8
-      metadata = GameData::Metadata.get_player(i)
-      next if !metadata
-      if metadata[1][/^trchar(\d+)$/]
-        tr_type_number = $~[1].to_i
-        tr_type_data = GameData::TrainerType.try_get(tr_type_number)
-        raise _INTL("Trainer type {1} is not defined (trying to rename player metadata filename {2}).", tr_type_number, metadata[1]) if !tr_type_data
-        metadata[1] = "trainer_" + tr_type_data.id.to_s
-        changed = true
-      end
-    end
-    return if !changed
-    # Save changes to metadata and rewrite PBS file
-    GameData::Metadata.save
-    Compiler.write_metadata
-  end
-
-  def convert_files
-    return if !pbConfirmMessage("Check for Pokémon/item/trainer files in their old folders that need renaming and moving?")
-    any_changed = false
-    # Rename and move Pokémon sprites/icons
-    dest_dir = "Graphics/Pokemon/"
-    Dir.mkdir(dest_dir) if !FileTest.directory?(dest_dir)
-    for ext in ["Front/", "Back/", "Icons/", "Front shiny/", "Back shiny/", "Icons shiny/",
-                "Eggs/", "Footprints/", "Shadow/"]
-      Dir.mkdir(dest_dir + ext) if !FileTest.directory?(dest_dir + ext)
-    end
-    convert_pokemon_sprites("Graphics/Battlers/", dest_dir)
-    convert_pokemon_icons("Graphics/Icons/", dest_dir)
-    convert_pokemon_footprints("Graphics/Icons/Footprints/", dest_dir)
-    # Rename and move item icons
-    dest_dir = "Graphics/Items/"
-    Dir.mkdir(dest_dir) if !FileTest.directory?(dest_dir)
-    convert_item_icons("Graphics/Icons/", dest_dir)
-    # Rename Pokémon cries
-    convert_pokemon_cries("Audio/SE/Cries/")
-    # Rename trainer sprites
-    convert_trainer_sprites("Graphics/Trainers/")
-    pbSetWindowText(nil)
-    if pbConfirmMessage("Rename all trainer charsets? This will also edit map data to change events' charsets accordingly.")
-      convert_trainer_sprites("Graphics/Characters/")
-      convert_player_metadata_charsets
-      pbSetWindowText(nil)
-      # Edit all maps to replace used charsets
-      mapData = Compiler::MapData.new
-      t = Time.now.to_i
-      Graphics.update
-      for id in mapData.mapinfos.keys.sort
-        map = mapData.getMap(id)
-        next if !map || !mapData.mapinfos[id]
-        changed = false
-        for key in map.events.keys
-          if Time.now.to_i - t >= 5
-            Graphics.update
-            t = Time.now.to_i
-          end
-          map.events[key].pages.each do |page|
-            next if nil_or_empty?(page.graphic.character_name)
-            next if !page.graphic.character_name[/^trchar(.+)$/]
-            tr_type = $~[1]
-            tr_type = tr_type.to_i if tr_type[/^\d+$/]
-            tr_type_data = GameData::TrainerType.try_get(tr_type)
-            raise _INTL("Trainer type {1} is not defined (trying to rename event's charset {2}).", tr_type, file) if !tr_type_data
-            page.graphic.character_name = "trainer_" + tr_type_data.id.to_s
-            changed = true
-          end
-        end
-        mapData.saveMap(id) if changed
-        any_changed = true if changed
-      end
-    end
-    pbMessage(_INTL("All found sprites and icons were renamed and moved."))
-    pbMessage(_INTL("Some map data was edited. Close and reopen RPG Maker XP to see the changes.")) if any_changed
-    pbUpdateVehicle if $game_player
-  end
-end