From 87285a2a1ffc26261626620f854d8bddbefb7e1b Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Wed, 24 Feb 2021 21:05:04 +0000
Subject: [PATCH] Added class GameData::Target

---
 .../002_Hardcoded data/012_PBTargets.rb       |  70 -------
 .../011_Data/002_Hardcoded data/012_Target.rb | 192 ++++++++++++++++++
 .../001_Battler/007_Battler_UseMove.rb        |   5 +-
 .../008_Battler_UseMove_Targeting.rb          |  36 ++--
 .../009_Battler_UseMove_SuccessChecks.rb      |   7 +-
 .../002_Move/001_PokeBattle_Move.rb           |   2 +-
 .../002_Move/005_Move_Effects_000-07F.rb      |   2 +-
 .../002_Move/007_Move_Effects_100-17F.rb      |  12 +-
 .../005_Battle_Action_AttacksPriority.rb      |  34 ++--
 .../003_Battle/010_Battle_Phase_Command.rb    |   4 +-
 .../003_Battle/011_Battle_Phase_Attack.rb     |   2 +-
 Data/Scripts/012_Battle/004_AI/004_AI_Move.rb |  12 +-
 .../004_AI/005_AI_Move_EffectScores.rb        |   4 +-
 .../004_AI/006_AI_Move_Utilities.rb           |  33 ++-
 .../005_Battle scene/008_Scene_Commands.rb    |  41 ++--
 .../005_Battle scene/009_Scene_Animations.rb  |   7 +-
 .../004_PokeBattle_BattlePalace.rb            |   4 +-
 .../007_PokeBattle_DebugScene.rb              |   2 +-
 .../022_Compiler/002_Compiler_CompilePBS.rb   |   8 +-
 .../022_Compiler/003_Compiler_WritePBS.rb     |   8 +-
 20 files changed, 301 insertions(+), 184 deletions(-)
 delete mode 100644 Data/Scripts/011_Data/002_Hardcoded data/012_PBTargets.rb
 create mode 100644 Data/Scripts/011_Data/002_Hardcoded data/012_Target.rb

diff --git a/Data/Scripts/011_Data/002_Hardcoded data/012_PBTargets.rb b/Data/Scripts/011_Data/002_Hardcoded data/012_PBTargets.rb
deleted file mode 100644
index 0be66e948..000000000
--- a/Data/Scripts/011_Data/002_Hardcoded data/012_PBTargets.rb	
+++ /dev/null
@@ -1,70 +0,0 @@
-module PBTargets
-  # NOTE: These numbers are all over the place because of backwards
-  #       compatibility. As untidy as they are, they need to be left like this.
-  None           = 1     # Bide, Counter, Metal Burst, Mirror Coat (calculate a target)
-  User           = 10
-  NearAlly       = 100   # Aromatic Mist, Helping Hand, Hold Hands
-  UserOrNearAlly = 200   # Acupressure
-  UserAndAllies  = 5     # Aromatherapy, Gear Up, Heal Bell, Life Dew, Magnetic Flux, Howl (in Gen 8+)
-  NearFoe        = 400   # Me First
-  RandomNearFoe  = 2     # Petal Dance, Outrage, Struggle, Thrash, Uproar
-  AllNearFoes    = 4
-  Foe            = 9     # For throwing a Poké Ball
-  AllFoes        = 6     # Unused (for completeness)
-  NearOther      = 0
-  AllNearOthers  = 8
-  Other          = 3     # Most Flying-type moves, pulse moves (hits non-near targets)
-  AllBattlers    = 7     # Flower Shield, Perish Song, Rototiller, Teatime
-  UserSide       = 40
-  FoeSide        = 80    # Entry hazards
-  BothSides      = 20
-
-  def self.noTargets?(target)
-    return target==None ||
-           target==User ||
-           target==UserSide ||
-           target==FoeSide ||
-           target==BothSides
-  end
-
-  # Used to determine if you are able to choose a target for the move.
-  def self.oneTarget?(target)
-    return !PBTargets.noTargets?(target) &&
-           !PBTargets.multipleTargets?(target)
-  end
-
-  def self.multipleTargets?(target)
-    return target==AllNearFoes ||
-           target==AllNearOthers ||
-           target==UserAndAllies ||
-           target==AllFoes ||
-           target==AllBattlers
-  end
-
-  # These moves do not target specific Pokémon but are still affected by Pressure.
-  def self.targetsFoeSide?(target)
-    return target==FoeSide ||
-           target==BothSides
-  end
-
-  def self.canChooseDistantTarget?(target)
-    return target==Other
-  end
-
-  # These moves can be redirected to a different target.
-  def self.canChooseOneFoeTarget?(target)
-    return target==NearFoe ||
-           target==NearOther ||
-           target==Other ||
-           target==RandomNearFoe
-  end
-
-  # Used by the AI to avoid targeting an ally with a move if that move could
-  # target an opponent instead.
-  def self.canChooseFoeTarget?(target)
-    return target==NearFoe ||
-           target==NearOther ||
-           target==Other ||
-           target==RandomNearFoe
-  end
-end
diff --git a/Data/Scripts/011_Data/002_Hardcoded data/012_Target.rb b/Data/Scripts/011_Data/002_Hardcoded data/012_Target.rb
new file mode 100644
index 000000000..fdd4b1ef3
--- /dev/null
+++ b/Data/Scripts/011_Data/002_Hardcoded data/012_Target.rb	
@@ -0,0 +1,192 @@
+# NOTE: If adding a new target, you will need to add code in several places to
+#       make them work properly:
+#         - def pbFindTargets
+#         - def pbMoveCanTarget?
+#         - def pbCreateTargetTexts
+#         - def pbFirstTarget
+#         - def pbTargetsMultiple?
+module GameData
+  class Target
+    attr_reader :id
+    attr_reader :id_number
+    attr_reader :real_name
+    attr_reader :num_targets        # 0, 1 or 2 (meaning 2+)
+    attr_reader :targets_foe        # Is able to target one or more foes
+    attr_reader :targets_all        # Crafty Shield can't protect from these moves
+    attr_reader :affects_foe_side   # Pressure also affects these moves
+    attr_reader :long_range         # Hits non-adjacent targets
+
+    DATA = {}
+
+    extend ClassMethods
+    include InstanceMethods
+
+    def self.load; end
+    def self.save; end
+
+    def initialize(hash)
+      @id               = hash[:id]
+      @real_name        = hash[:name]             || "Unnamed"
+      @num_targets      = hash[:num_targets]      || 0
+      @targets_foe      = hash[:targets_foe]      || false
+      @targets_all      = hash[:targets_all]      || false
+      @affects_foe_side = hash[:affects_foe_side] || false
+      @long_range       = hash[:long_range]       || false
+    end
+
+    # @return [String] the translated name of this target
+    def name
+      return _INTL(@real_name)
+    end
+
+    def can_choose_distant_target?
+      return @num_targets == 1 && @long_range
+    end
+
+    def can_target_one_foe?
+      return @num_targets == 1 && @targets_foe
+    end
+  end
+end
+
+# Bide, Counter, Metal Burst, Mirror Coat (calculate a target)
+GameData::Target.register({
+  :id               => :None,
+  :id_number        => 1,
+  :name             => _INTL("None")
+})
+
+GameData::Target.register({
+  :id               => :User,
+  :id_number        => 10,
+  :name             => _INTL("User")
+})
+
+# Aromatic Mist, Helping Hand, Hold Hands
+GameData::Target.register({
+  :id               => :NearAlly,
+  :id_number        => 100,
+  :name             => _INTL("Near Ally"),
+  :num_targets      => 1
+})
+
+# Acupressure
+GameData::Target.register({
+  :id               => :UserOrNearAlly,
+  :id_number        => 200,
+  :name             => _INTL("User or Near Ally"),
+  :num_targets      => 1
+})
+
+# Aromatherapy, Gear Up, Heal Bell, Life Dew, Magnetic Flux, Howl (in Gen 8+)
+GameData::Target.register({
+  :id               => :UserAndAllies,
+  :id_number        => 5,
+  :name             => _INTL("User and Allies"),
+  :num_targets      => 2,
+  :long_range       => true
+})
+
+# Me First
+GameData::Target.register({
+  :id               => :NearFoe,
+  :id_number        => 400,
+  :name             => _INTL("Near Foe"),
+  :num_targets      => 1,
+  :targets_foe      => true
+})
+
+# Petal Dance, Outrage, Struggle, Thrash, Uproar
+GameData::Target.register({
+  :id               => :RandomNearFoe,
+  :id_number        => 2,
+  :name             => _INTL("Random Near Foe"),
+  :num_targets      => 1,
+  :targets_foe      => true
+})
+
+GameData::Target.register({
+  :id               => :AllNearFoes,
+  :id_number        => 4,
+  :name             => _INTL("All Near Foes"),
+  :num_targets      => 2,
+  :targets_foe      => true
+})
+
+# For throwing a Poké Ball
+GameData::Target.register({
+  :id               => :Foe,
+  :id_number        => 9,
+  :name             => _INTL("Foe"),
+  :num_targets      => 1,
+  :targets_foe      => true,
+  :long_range       => true
+})
+
+# Unused
+GameData::Target.register({
+  :id               => :AllFoes,
+  :id_number        => 6,
+  :name             => _INTL("All Foes"),
+  :num_targets      => 2,
+  :targets_foe      => true,
+  :long_range       => true
+})
+
+GameData::Target.register({
+  :id               => :NearOther,
+  :id_number        => 0,
+  :name             => _INTL("Near Other"),
+  :num_targets      => 1,
+  :targets_foe      => true
+})
+
+GameData::Target.register({
+  :id               => :AllNearOthers,
+  :id_number        => 8,
+  :name             => _INTL("All Near Others"),
+  :num_targets      => 2,
+  :targets_foe      => true
+})
+
+# Most Flying-type moves, pulse moves (hits non-near targets)
+GameData::Target.register({
+  :id               => :Other,
+  :id_number        => 3,
+  :name             => _INTL("Other"),
+  :num_targets      => 1,
+  :targets_foe      => true,
+  :long_range       => true
+})
+
+# Flower Shield, Perish Song, Rototiller, Teatime
+GameData::Target.register({
+  :id               => :AllBattlers,
+  :id_number        => 7,
+  :name             => _INTL("All Battlers"),
+  :num_targets      => 2,
+  :targets_foe      => true,
+  :targets_all      => true,
+  :long_range       => true
+})
+
+GameData::Target.register({
+  :id               => :UserSide,
+  :id_number        => 40,
+  :name             => _INTL("User Side")
+})
+
+# Entry hazards
+GameData::Target.register({
+  :id               => :FoeSide,
+  :id_number        => 80,
+  :name             => _INTL("Foe Side"),
+  :affects_foe_side => true
+})
+
+GameData::Target.register({
+  :id               => :BothSides,
+  :id_number        => 20,
+  :name             => _INTL("Both Sides"),
+  :affects_foe_side => true
+})
diff --git a/Data/Scripts/012_Battle/001_Battler/007_Battler_UseMove.rb b/Data/Scripts/012_Battle/001_Battler/007_Battler_UseMove.rb
index 99ee63edc..bae960a73 100644
--- a/Data/Scripts/012_Battle/001_Battler/007_Battler_UseMove.rb
+++ b/Data/Scripts/012_Battle/001_Battler/007_Battler_UseMove.rb
@@ -269,7 +269,7 @@ class PokeBattle_Battler
         PBDebug.log("[Ability triggered] #{b.pbThis}'s #{b.abilityName}")
         user.pbReducePP(move)
       end
-      if PBTargets.targetsFoeSide?(move.pbTarget(user))
+      if move.pbTarget(user).affects_foe_side
         @battle.eachOtherSideBattler(user) do |b|
           next unless b.hasActiveAbility?(:PRESSURE)
           PBDebug.log("[Ability triggered] #{b.pbThis}'s #{b.abilityName}")
@@ -379,8 +379,7 @@ class PokeBattle_Battler
     #---------------------------------------------------------------------------
     magicCoater  = -1
     magicBouncer = -1
-    if targets.length==0 && !PBTargets.noTargets?(move.pbTarget(user)) &&
-       !move.worksWithNoTargets?
+    if targets.length == 0 && move.pbTarget(user).num_targets > 0 && !move.worksWithNoTargets?
       # def pbFindTargets should have found a target(s), but it didn't because
       # they were all fainted
       # All target types except: None, User, UserSide, FoeSide, BothSides
diff --git a/Data/Scripts/012_Battle/001_Battler/008_Battler_UseMove_Targeting.rb b/Data/Scripts/012_Battle/001_Battler/008_Battler_UseMove_Targeting.rb
index f1cbbce48..c3cd1a6df 100644
--- a/Data/Scripts/012_Battle/001_Battler/008_Battler_UseMove_Targeting.rb
+++ b/Data/Scripts/012_Battle/001_Battler/008_Battler_UseMove_Targeting.rb
@@ -36,18 +36,21 @@ class PokeBattle_Battler
     preTarget = choice[3]   # A target that was already chosen
     targets = []
     # Get list of targets
-    case move.pbTarget(user)   # Curse can change its target type
-    when PBTargets::NearAlly
+    case move.pbTarget(user).id   # Curse can change its target type
+    when :NearAlly
       targetBattler = (preTarget>=0) ? @battle.battlers[preTarget] : nil
       if !pbAddTarget(targets,user,targetBattler,move)
         pbAddTargetRandomAlly(targets,user,move)
       end
-    when PBTargets::UserOrNearAlly
+    when :UserOrNearAlly
       targetBattler = (preTarget>=0) ? @battle.battlers[preTarget] : nil
       if !pbAddTarget(targets,user,targetBattler,move,true,true)
         pbAddTarget(targets,user,user,move,true,true)
       end
-    when PBTargets::NearFoe, PBTargets::NearOther
+    when :UserAndAllies
+      pbAddTarget(targets,user,user,move,true,true)
+      @battle.eachSameSideBattler(user.index) { |b| pbAddTarget(targets,user,b,move,false,true) }
+    when :NearFoe, :NearOther
       targetBattler = (preTarget>=0) ? @battle.battlers[preTarget] : nil
       if !pbAddTarget(targets,user,targetBattler,move)
         if preTarget>=0 && !user.opposes?(preTarget)
@@ -56,13 +59,11 @@ class PokeBattle_Battler
           pbAddTargetRandomFoe(targets,user,move)
         end
       end
-    when PBTargets::AllNearFoes
-      @battle.eachOtherSideBattler(user.index) { |b| pbAddTarget(targets,user,b,move) }
-    when PBTargets::RandomNearFoe
+    when :RandomNearFoe
       pbAddTargetRandomFoe(targets,user,move)
-    when PBTargets::AllNearOthers
-      @battle.eachBattler { |b| pbAddTarget(targets,user,b,move) }
-    when PBTargets::Other
+    when :AllNearFoes
+      @battle.eachOtherSideBattler(user.index) { |b| pbAddTarget(targets,user,b,move) }
+    when :Foe, :Other
       targetBattler = (preTarget>=0) ? @battle.battlers[preTarget] : nil
       if !pbAddTarget(targets,user,targetBattler,move,false)
         if preTarget>=0 && !user.opposes?(preTarget)
@@ -71,12 +72,11 @@ class PokeBattle_Battler
           pbAddTargetRandomFoe(targets,user,move,false)
         end
       end
-    when PBTargets::UserAndAllies
-      pbAddTarget(targets,user,user,move,true,true)
-      @battle.eachSameSideBattler(user.index) { |b| pbAddTarget(targets,user,b,move,false,true) }
-    when PBTargets::AllFoes
+    when :AllFoes
       @battle.eachOtherSideBattler(user.index) { |b| pbAddTarget(targets,user,b,move,false) }
-    when PBTargets::AllBattlers
+    when :AllNearOthers
+      @battle.eachBattler { |b| pbAddTarget(targets,user,b,move) }
+    when :AllBattlers
       @battle.eachBattler { |b| pbAddTarget(targets,user,b,move,false,true) }
     else
       # Used by Counter/Mirror Coat/Metal Burst/Bide
@@ -89,12 +89,12 @@ class PokeBattle_Battler
   # Redirect attack to another target
   #=============================================================================
   def pbChangeTargets(move,user,targets)
-    targetType = move.pbTarget(user)
+    target_data = move.pbTarget(user)
     return targets if @battle.switching   # For Pursuit interrupting a switch
     return targets if move.cannotRedirect?
-    return targets if !PBTargets.canChooseOneFoeTarget?(targetType) || targets.length!=1
+    return targets if !target_data.can_target_one_foe? || targets.length != 1
     priority = @battle.pbPriority(true)
-    nearOnly = !PBTargets.canChooseDistantTarget?(move.target)
+    nearOnly = !target_data.can_choose_distant_target?
     # Spotlight (takes priority over Follow Me/Rage Powder/Lightning Rod/Storm Drain)
     newTarget = nil; strength = 100   # Lower strength takes priority
     priority.each do |b|
diff --git a/Data/Scripts/012_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb b/Data/Scripts/012_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb
index fb6edf837..cf887c0ca 100644
--- a/Data/Scripts/012_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb
+++ b/Data/Scripts/012_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb
@@ -302,7 +302,7 @@ class PokeBattle_Battler
     end
     # Crafty Shield
     if target.pbOwnSide.effects[PBEffects::CraftyShield] && user.index!=target.index &&
-       move.statusMove? && move.pbTarget(user)!=PBTargets::AllBattlers
+       move.statusMove? && !move.pbTarget(user).targets_all
       @battle.pbCommonAnimation("CraftyShield",target)
       @battle.pbDisplay(_INTL("Crafty Shield protected {1}!",target.pbThis(true)))
       target.damageState.protected = true
@@ -311,7 +311,7 @@ class PokeBattle_Battler
     end
     # Wide Guard
     if target.pbOwnSide.effects[PBEffects::WideGuard] && user.index!=target.index &&
-       PBTargets.multipleTargets?(move.pbTarget(user)) &&
+       move.pbTarget(user).num_targets > 1 &&
        (Settings::MECHANICS_GENERATION >= 7 || move.damagingMove?)
       @battle.pbCommonAnimation("WideGuard",target)
       @battle.pbDisplay(_INTL("Wide Guard protected {1}!",target.pbThis(true)))
@@ -527,8 +527,7 @@ class PokeBattle_Battler
   # Message shown when a move fails the per-hit success check above.
   #=============================================================================
   def pbMissMessage(move,user,target)
-    tar = move.pbTarget(user)
-    if PBTargets.multipleTargets?(tar)
+    if move.pbTarget(user).num_targets > 1
       @battle.pbDisplay(_INTL("{1} avoided the attack!",target.pbThis))
     elsif target.effects[PBEffects::TwoTurnAttack]
       @battle.pbDisplay(_INTL("{1} avoided the attack!",target.pbThis))
diff --git a/Data/Scripts/012_Battle/002_Move/001_PokeBattle_Move.rb b/Data/Scripts/012_Battle/002_Move/001_PokeBattle_Move.rb
index 3bf15d844..b6e3d51d7 100644
--- a/Data/Scripts/012_Battle/002_Move/001_PokeBattle_Move.rb
+++ b/Data/Scripts/012_Battle/002_Move/001_PokeBattle_Move.rb
@@ -60,7 +60,7 @@ class PokeBattle_Move
   #=============================================================================
   # About the move
   #=============================================================================
-  def pbTarget(_user); return @target; end
+  def pbTarget(_user); return GameData::Target.get(@target); end
 
   def total_pp
     return @total_pp if @total_pp && @total_pp>0   # Usually undefined
diff --git a/Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb b/Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb
index 617995bd0..99506da8a 100644
--- a/Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb
+++ b/Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb
@@ -458,7 +458,7 @@ class PokeBattle_Move_019 < PokeBattle_Move
   def pbEffectGeneral(user)
     # Cure all Pokémon in battle on the user's side. For the benefit of the Gen
     # 5 version of this move, to make Pokémon out in battle get cured first.
-    if pbTarget(user)!=PBTargets::UserAndAllies
+    if pbTarget(user) == :UserSide
       @battle.eachSameSideBattler(user) do |b|
         next if b.status == :NONE
         pbAromatherapyHeal(b.pokemon,b)
diff --git a/Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb b/Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb
index 52bde08fd..b8d9b4f1e 100644
--- a/Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb
+++ b/Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb
@@ -261,8 +261,8 @@ class PokeBattle_Move_10D < PokeBattle_Move
   def ignoresSubstitute?(user); return true; end
 
   def pbTarget(user)
-    return PBTargets::NearFoe if user.pbHasType?(:GHOST)
-    super
+    return GameData::Target.get(:NearFoe) if user.pbHasType?(:GHOST)
+    return super
   end
 
   def pbMoveFailed?(user,targets)
@@ -1132,7 +1132,7 @@ class PokeBattle_Move_137 < PokeBattle_Move
   end
 
   def pbEffectGeneral(user)
-    return if pbTarget(user)==PBTargets::UserAndAllies
+    return if pbTarget(user) != :UserSide
     @validTargets.each { |b| pbEffectAgainstTarget(user,b) }
   end
 end
@@ -1978,7 +1978,7 @@ class PokeBattle_Move_15C < PokeBattle_Move
   end
 
   def pbEffectGeneral(user)
-    return if pbTarget(user)==PBTargets::UserAndAllies
+    return if pbTarget(user) != :UserSide
     @validTargets.each { |b| pbEffectAgainstTarget(user,b) }
   end
 end
@@ -2423,8 +2423,8 @@ end
 #===============================================================================
 class PokeBattle_Move_16F < PokeBattle_Move
   def pbTarget(user)
-    return PBTargets::NearFoe if user.effects[PBEffects::HealBlock]>0
-    super
+    return GameData::Target.get(:NearFoe) if user.effects[PBEffects::HealBlock]>0
+    return super
   end
 
   def pbOnStartUse(user,targets)
diff --git a/Data/Scripts/012_Battle/003_Battle/005_Battle_Action_AttacksPriority.rb b/Data/Scripts/012_Battle/003_Battle/005_Battle_Action_AttacksPriority.rb
index 842d7d9b9..37dca6763 100644
--- a/Data/Scripts/012_Battle/003_Battle/005_Battle_Action_AttacksPriority.rb
+++ b/Data/Scripts/012_Battle/003_Battle/005_Battle_Action_AttacksPriority.rb
@@ -99,31 +99,31 @@ class PokeBattle_Battle
     @choices[idxBattler][3] = idxTarget   # Set target of move
   end
 
-  # Returns whether the idxTarget will be targeted by a move with targetType
+  # Returns whether the idxTarget will be targeted by a move with target_data
   # used by a battler in idxUser.
-  def pbMoveCanTarget?(idxUser,idxTarget,targetType)
-    return false if PBTargets.noTargets?(targetType)
-    case targetType
-    when PBTargets::NearAlly
+  def pbMoveCanTarget?(idxUser,idxTarget,target_data)
+    return false if target_data.num_targets == 0
+    case target_data.id
+    when :NearAlly
       return false if opposes?(idxUser,idxTarget)
       return false if !nearBattlers?(idxUser,idxTarget)
-    when PBTargets::UserOrNearAlly
+    when :UserOrNearAlly
       return true if idxUser==idxTarget
       return false if opposes?(idxUser,idxTarget)
       return false if !nearBattlers?(idxUser,idxTarget)
-    when PBTargets::NearFoe, PBTargets::AllNearFoes, PBTargets::RandomNearFoe
-      return false if !opposes?(idxUser,idxTarget)
-      return false if !nearBattlers?(idxUser,idxTarget)
-    when PBTargets::Foe
-      return false if !opposes?(idxUser,idxTarget)
-    when PBTargets::NearOther, PBTargets::AllNearOthers
-      return false if !nearBattlers?(idxUser,idxTarget)
-    when PBTargets::Other
-      return false if idxUser==idxTarget
-    when PBTargets::UserAndAllies
+    when :UserAndAllies
       return false if opposes?(idxUser,idxTarget)
-    when PBTargets::AllFoes
+    when :NearFoe, :RandomNearFoe, :AllNearFoes
       return false if !opposes?(idxUser,idxTarget)
+      return false if !nearBattlers?(idxUser,idxTarget)
+    when :Foe
+      return false if !opposes?(idxUser,idxTarget)
+    when :AllFoes
+      return false if !opposes?(idxUser,idxTarget)
+    when :NearOther, :AllNearOthers
+      return false if !nearBattlers?(idxUser,idxTarget)
+    when :Other
+      return false if idxUser==idxTarget
     end
     return true
   end
diff --git a/Data/Scripts/012_Battle/003_Battle/010_Battle_Phase_Command.rb b/Data/Scripts/012_Battle/003_Battle/010_Battle_Phase_Command.rb
index b70b920ea..8e0ee5fdc 100644
--- a/Data/Scripts/012_Battle/003_Battle/010_Battle_Phase_Command.rb
+++ b/Data/Scripts/012_Battle/003_Battle/010_Battle_Phase_Command.rb
@@ -90,8 +90,8 @@ class PokeBattle_Battle
   def pbAutoFightMenu(idxBattler); return false; end
 
   def pbChooseTarget(battler,move)
-    targetType = move.pbTarget(battler)
-    idxTarget = @scene.pbChooseTarget(battler.index,targetType)
+    target_data = move.pbTarget(battler)
+    idxTarget = @scene.pbChooseTarget(battler.index,target_data)
     return false if idxTarget<0
     pbRegisterTarget(battler.index,idxTarget)
     return true
diff --git a/Data/Scripts/012_Battle/003_Battle/011_Battle_Phase_Attack.rb b/Data/Scripts/012_Battle/003_Battle/011_Battle_Phase_Attack.rb
index 1f8795032..07bcaf913 100644
--- a/Data/Scripts/012_Battle/003_Battle/011_Battle_Phase_Attack.rb
+++ b/Data/Scripts/012_Battle/003_Battle/011_Battle_Phase_Attack.rb
@@ -27,7 +27,7 @@ class PokeBattle_Battle
       next if b.fainted? || !b.opposes?(idxSwitcher)   # Shouldn't hit an ally
       next if b.movedThisRound? || !pbChoseMoveFunctionCode?(b.index,"088")   # Pursuit
       # Check whether Pursuit can be used
-      next unless pbMoveCanTarget?(b.index,idxSwitcher,@choices[b.index][2].target)
+      next unless pbMoveCanTarget?(b.index,idxSwitcher,@choices[b.index][2].pbTarget(b))
       next unless pbCanChooseMove?(b.index,@choices[b.index][1],false)
       next if b.status == :SLEEP || b.status == :FROZEN
       next if b.effects[PBEffects::SkyDrop]>=0
diff --git a/Data/Scripts/012_Battle/004_AI/004_AI_Move.rb b/Data/Scripts/012_Battle/004_AI/004_AI_Move.rb
index 57cb471ff..25335afba 100644
--- a/Data/Scripts/012_Battle/004_AI/004_AI_Move.rb
+++ b/Data/Scripts/012_Battle/004_AI/004_AI_Move.rb
@@ -118,17 +118,17 @@ class PokeBattle_AI
   # Trainer Pokémon calculate how much they want to use each of their moves.
   def pbRegisterMoveTrainer(user,idxMove,choices,skill)
     move = user.moves[idxMove]
-    targetType = move.pbTarget(user)
-    if PBTargets.multipleTargets?(targetType)
+    target_data = move.pbTarget(user)
+    if target_data.num_targets > 1
       # If move affects multiple battlers and you don't choose a particular one
       totalScore = 0
       @battle.eachBattler do |b|
-        next if !@battle.pbMoveCanTarget?(user.index,b.index,targetType)
+        next if !@battle.pbMoveCanTarget?(user.index,b.index,target_data)
         score = pbGetMoveScore(move,user,b,skill)
         totalScore += ((user.opposes?(b)) ? score : -score)
       end
       choices.push([idxMove,totalScore,-1]) if totalScore>0
-    elsif PBTargets.noTargets?(targetType)
+    elsif target_data.num_targets == 0
       # If move has no targets, affects the user, a side or the whole field
       score = pbGetMoveScore(move,user,user,skill)
       choices.push([idxMove,score,-1]) if score>0
@@ -136,8 +136,8 @@ class PokeBattle_AI
       # If move affects one battler and you have to choose which one
       scoresAndTargets = []
       @battle.eachBattler do |b|
-        next if !@battle.pbMoveCanTarget?(user.index,b.index,targetType)
-        next if PBTargets.canChooseFoeTarget?(targetType) && !user.opposes?(b)
+        next if !@battle.pbMoveCanTarget?(user.index,b.index,target_data)
+        next if target_data.targets_foe && !user.opposes?(b)
         score = pbGetMoveScore(move,user,b,skill)
         scoresAndTargets.push([score,b.index]) if score>0
       end
diff --git a/Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb b/Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb
index b00421bf9..4bf5acd4a 100644
--- a/Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb
+++ b/Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb
@@ -1775,10 +1775,10 @@ class PokeBattle_AI
         else
           moveData = GameData::Move.get(target.lastRegularMoveUsed)
           if moveData.category == 2 &&   # Status move
-             [PBTargets::User, PBTargets::BothSides].include?(moveData.target)
+             [:User, :BothSides].include?(moveData.target)
             score += 60
           elsif moveData.category != 2 &&   # Damaging move
-             moveData.target == PBTargets::NearOther &&
+             moveData.target == :NearOther &&
              PBTypeEffectiveness.ineffective?(pbCalcTypeMod(moveData.type, target, user))
             score += 60
           end
diff --git a/Data/Scripts/012_Battle/004_AI/006_AI_Move_Utilities.rb b/Data/Scripts/012_Battle/004_AI/006_AI_Move_Utilities.rb
index a64fdb292..524bddf15 100644
--- a/Data/Scripts/012_Battle/004_AI/006_AI_Move_Utilities.rb
+++ b/Data/Scripts/012_Battle/004_AI/006_AI_Move_Utilities.rb
@@ -3,25 +3,22 @@ class PokeBattle_AI
   #
   #=============================================================================
   def pbTargetsMultiple?(move,user)
-    numTargets = 0
-    case move.pbTarget(user)
-    when PBTargets::AllNearFoes
-      @battle.eachOtherSideBattler(user) { |b| numTargets += 1 if b.near?(user) }
-      return numTargets>1
-    when PBTargets::AllNearOthers
-      @battle.eachBattler { |b| numTargets += 1 if b.near?(user) }
-      return numTargets>1
-    when PBTargets::UserAndAllies
-      @battle.eachSameSideBattler(user) { |_b| numTargets += 1 }
-      return numTargets>1
-    when PBTargets::AllFoes
-      @battle.eachOtherSideBattler(user) { |_b| numTargets += 1 }
-      return numTargets>1
-    when PBTargets::AllBattlers
-      @battle.eachBattler { |_b| numTargets += 1 }
-      return numTargets>1
+    target_data = move.pbTarget(user)
+    return false if target_data.num_targets <= 1
+    num_targets = 0
+    case target_data.id
+    when :UserAndAllies
+      @battle.eachSameSideBattler(user) { |_b| num_targets += 1 }
+    when :AllNearFoes
+      @battle.eachOtherSideBattler(user) { |b| num_targets += 1 if b.near?(user) }
+    when :AllFoes
+      @battle.eachOtherSideBattler(user) { |_b| num_targets += 1 }
+    when :AllNearOthers
+      @battle.eachBattler { |b| num_targets += 1 if b.near?(user) }
+    when :AllBattlers
+      @battle.eachBattler { |_b| num_targets += 1 }
     end
-    return false
+    return num_targets > 1
   end
 
   #=============================================================================
diff --git a/Data/Scripts/012_Battle/005_Battle scene/008_Scene_Commands.rb b/Data/Scripts/012_Battle/005_Battle scene/008_Scene_Commands.rb
index 1c258a894..1feab770a 100644
--- a/Data/Scripts/012_Battle/005_Battle scene/008_Scene_Commands.rb	
+++ b/Data/Scripts/012_Battle/005_Battle scene/008_Scene_Commands.rb	
@@ -296,7 +296,7 @@ class PokeBattle_Scene
           tempVisibleSprites = visibleSprites.clone
           tempVisibleSprites["commandWindow"] = false
           tempVisibleSprites["targetWindow"]  = true
-          idxTarget = pbChooseTarget(idxBattler,PBTargets::Foe,tempVisibleSprites)
+          idxTarget = pbChooseTarget(idxBattler,GameData::Target.get(:Foe),tempVisibleSprites)
           if idxTarget>=0
             break if yield item.id, useType, idxTarget, -1, self
           end
@@ -326,21 +326,24 @@ class PokeBattle_Scene
   # target.
   # nil means can't select that position, "" means can select that position but
   # there is no battler there, otherwise is a battler's name.
-  def pbCreateTargetTexts(idxBattler,targetType)
+  def pbCreateTargetTexts(idxBattler,target_data)
     texts = Array.new(@battle.battlers.length) do |i|
       next nil if !@battle.battlers[i]
       showName = false
-      case targetType
-      when PBTargets::None, PBTargets::User, PBTargets::RandomNearFoe
+      # NOTE: Targets listed here are ones with num_targets of 0, plus
+      #       RandomNearFoe which should look like it targets the user. All
+      #       other targets are handled by the "else" part.
+      case target_data.id
+      when :None, :User, :RandomNearFoe
         showName = (i==idxBattler)
-      when PBTargets::UserSide, PBTargets::UserAndAllies
+      when :UserSide
         showName = !@battle.opposes?(i,idxBattler)
-      when PBTargets::FoeSide, PBTargets::AllFoes
+      when :FoeSide
         showName = @battle.opposes?(i,idxBattler)
-      when PBTargets::BothSides, PBTargets::AllBattlers
+      when :BothSides
         showName = true
       else
-        showName = @battle.pbMoveCanTarget?(i,idxBattler,targetType)
+        showName = @battle.pbMoveCanTarget?(i,idxBattler,target_data)
       end
       next nil if !showName
       next (@battle.battlers[i].fainted?) ? "" : @battle.battlers[i].name
@@ -350,9 +353,9 @@ class PokeBattle_Scene
 
   # Returns the initial position of the cursor when choosing a target for a move
   # in a non-single battle.
-  def pbFirstTarget(idxBattler,targetType)
-    case targetType
-    when PBTargets::NearAlly
+  def pbFirstTarget(idxBattler,target_data)
+    case target_data.id
+    when :NearAlly
       @battle.eachSameSideBattler(idxBattler) do |b|
         next if b.index==idxBattler || !@battle.nearBattlers?(b,idxBattler)
         next if b.fainted?
@@ -362,27 +365,27 @@ class PokeBattle_Scene
         next if b.index==idxBattler || !@battle.nearBattlers?(b,idxBattler)
         return b.index
       end
-    when PBTargets::NearFoe, PBTargets::NearOther
+    when :NearFoe, :NearOther
       indices = @battle.pbGetOpposingIndicesInOrder(idxBattler)
       indices.each { |i| return i if @battle.nearBattlers?(i,idxBattler) && !@battle.battlers[i].fainted? }
       indices.each { |i| return i if @battle.nearBattlers?(i,idxBattler) }
-    when PBTargets::Foe, PBTargets::Other
+    when :Foe, :Other
       indices = @battle.pbGetOpposingIndicesInOrder(idxBattler)
       indices.each { |i| return i if !@battle.battlers[i].fainted? }
       indices.each { |i| return i }
     end
-    return idxBattler
+    return idxBattler   # Target the user initially
   end
 
-  def pbChooseTarget(idxBattler,targetType,visibleSprites=nil)
+  def pbChooseTarget(idxBattler,target_data,visibleSprites=nil)
     pbShowWindow(TARGET_BOX)
     cw = @sprites["targetWindow"]
     # Create an array of battler names (only valid targets are named)
-    texts = pbCreateTargetTexts(idxBattler,targetType)
-    # Determine mode based on targetType
-    mode = (PBTargets.oneTarget?(targetType)) ? 0 : 1
+    texts = pbCreateTargetTexts(idxBattler,target_data)
+    # Determine mode based on target_data
+    mode = (target_data.num_targets == 1) ? 0 : 1
     cw.setDetails(texts,mode)
-    cw.index = pbFirstTarget(idxBattler,targetType)
+    cw.index = pbFirstTarget(idxBattler,target_data)
     pbSelectBattler((mode==0) ? cw.index : texts,2)   # Select initial battler/data box
     pbFadeInAndShow(@sprites,visibleSprites) if visibleSprites
     ret = -1
diff --git a/Data/Scripts/012_Battle/005_Battle scene/009_Scene_Animations.rb b/Data/Scripts/012_Battle/005_Battle scene/009_Scene_Animations.rb
index 36343a4ec..454f29437 100644
--- a/Data/Scripts/012_Battle/005_Battle scene/009_Scene_Animations.rb	
+++ b/Data/Scripts/012_Battle/005_Battle scene/009_Scene_Animations.rb	
@@ -409,12 +409,11 @@ class PokeBattle_Scene
       return anim if anim
       # Actual animation not found, get the default animation for the move's type
       moveData = GameData::Move.get(moveID)
+      target_data = moveData.pbTarget(@battle.battlers[idxUser])
       moveType = moveData.type
       moveKind = moveData.category
-      moveKind += 3 if PBTargets.multipleTargets?(moveData.target) ||
-                       PBTargets.targetsFoeSide?(moveData.target)
-      moveKind += 3 if moveKind == 2 && moveData.target != PBTargets::User &&
-                       moveData.target != PBTargets::UserSide
+      moveKind += 3 if target_data.num_targets > 1 || target_data.affects_foe_side
+      moveKind += 3 if moveKind == 2 && target_data.num_targets > 0
       # [one target physical, one target special, user status,
       #  multiple targets physical, multiple targets special, non-user status]
       typeDefaultAnim = {
diff --git a/Data/Scripts/012_Battle/006_Other battle types/004_PokeBattle_BattlePalace.rb b/Data/Scripts/012_Battle/006_Other battle types/004_PokeBattle_BattlePalace.rb
index 2da169d08..6b7dd642e 100644
--- a/Data/Scripts/012_Battle/006_Other battle types/004_PokeBattle_BattlePalace.rb	
+++ b/Data/Scripts/012_Battle/006_Other battle types/004_PokeBattle_BattlePalace.rb	
@@ -64,10 +64,10 @@ class PokeBattle_BattlePalace < PokeBattle_Battle
   end
 
   def pbMoveCategory(move)
-    if move.target==PBTargets::User || move.function=="0D4"   # Bide
+    if move.target == :User || move.function == "0D4"   # Bide
       return 1
     elsif move.statusMove? ||
-       move.function=="071" || move.function=="072"   # Counter, Mirror Coat
+       move.function == "071" || move.function == "072"   # Counter, Mirror Coat
       return 2
     else
       return 0
diff --git a/Data/Scripts/012_Battle/006_Other battle types/007_PokeBattle_DebugScene.rb b/Data/Scripts/012_Battle/006_Other battle types/007_PokeBattle_DebugScene.rb
index f05a09b6d..61d906e80 100644
--- a/Data/Scripts/012_Battle/006_Other battle types/007_PokeBattle_DebugScene.rb	
+++ b/Data/Scripts/012_Battle/006_Other battle types/007_PokeBattle_DebugScene.rb	
@@ -64,7 +64,7 @@ class PokeBattle_DebugSceneNoLogging
     end
   end
 
-  def pbChooseTarget(idxBattler,targetType,visibleSprites=nil)
+  def pbChooseTarget(idxBattler,target_data,visibleSprites=nil)
     targets = []
     @battle.eachOtherSideBattler(idxBattler) { |b| targets.push(b.index) }
     return -1 if targets.length==0
diff --git a/Data/Scripts/022_Compiler/002_Compiler_CompilePBS.rb b/Data/Scripts/022_Compiler/002_Compiler_CompilePBS.rb
index 3b7ad2379..b7b62f652 100644
--- a/Data/Scripts/022_Compiler/002_Compiler_CompilePBS.rb
+++ b/Data/Scripts/022_Compiler/002_Compiler_CompilePBS.rb
@@ -251,7 +251,7 @@ module Compiler
     pbCompilerEachPreppedLine("PBS/moves.txt") { |line, line_no|
       line = pbGetCsvRecord(line, line_no, [0, "vnssueeuuuyiss",
          nil, nil, nil, nil, nil, :Type, ["Physical", "Special", "Status"],
-         nil, nil, nil, PBTargets, nil, nil, nil
+         nil, nil, nil, :Target, nil, nil, nil
       ])
       move_number = line[0]
       move_symbol = line[1].to_sym
@@ -279,7 +279,7 @@ module Compiler
         :accuracy      => line[7],
         :total_pp      => line[8],
         :effect_chance => line[9],
-        :target        => line[10],
+        :target        => GameData::Target.get(line[10]).id,
         :priority      => line[11],
         :flags         => line[12],
         :description   => line[13]
@@ -477,7 +477,7 @@ module Compiler
           :height                => contents["Height"],
           :weight                => contents["Weight"],
           :color                 => contents["Color"],
-          :shape                 => contents["Shape"],
+          :shape                 => GameData::BodyShape.get(contents["Shape"]).id,
           :habitat               => contents["Habitat"],
           :generation            => contents["Generation"],
           :back_sprite_x         => contents["BattlerPlayerX"],
@@ -668,7 +668,7 @@ module Compiler
           :height                => contents["Height"] || base_data.height,
           :weight                => contents["Weight"] || base_data.weight,
           :color                 => contents["Color"] || base_data.color,
-          :shape                 => contents["Shape"] || base_data.shape,
+          :shape                 => (contents["Shape"]) ? GameData::BodyShape.get(contents["Shape"]).id : base_data.shape,
           :habitat               => contents["Habitat"] || base_data.habitat,
           :generation            => contents["Generation"] || base_data.generation,
           :mega_stone            => contents["MegaStone"],
diff --git a/Data/Scripts/022_Compiler/003_Compiler_WritePBS.rb b/Data/Scripts/022_Compiler/003_Compiler_WritePBS.rb
index 4d38a1714..be87a9a81 100644
--- a/Data/Scripts/022_Compiler/003_Compiler_WritePBS.rb
+++ b/Data/Scripts/022_Compiler/003_Compiler_WritePBS.rb
@@ -193,7 +193,7 @@ module Compiler
           m.accuracy,
           m.total_pp,
           m.effect_chance,
-          (getConstantName(PBTargets, m.target) rescue sprintf("%d", m.target)),
+          m.target,
           m.priority,
           csvQuote(m.flags),
           csvQuoteAlways(m.real_description)
@@ -301,7 +301,7 @@ module Compiler
         f.write(sprintf("Height = %.1f\r\n", species.height / 10.0))
         f.write(sprintf("Weight = %.1f\r\n", species.weight / 10.0))
         f.write(sprintf("Color = %s\r\n", species.color))
-        f.write(sprintf("Shape = %s\r\n", GameData::BodyShape.get(species.shape).id))
+        f.write(sprintf("Shape = %s\r\n", species.shape))
         f.write(sprintf("Habitat = %s\r\n", species.habitat)) if species.habitat != :None
         f.write(sprintf("Kind = %s\r\n", species.real_category))
         f.write(sprintf("Pokedex = %s\r\n", species.real_pokedex_entry))
@@ -397,9 +397,7 @@ module Compiler
         f.write(sprintf("Height = %.1f\r\n", species.height / 10.0)) if species.height != base_species.height
         f.write(sprintf("Weight = %.1f\r\n", species.weight / 10.0)) if species.weight != base_species.weight
         f.write(sprintf("Color = %s\r\n", species.color)) if species.color != base_species.color
-        if GameData::BodyShape.get(species.shape).id != GameData::BodyShape.get(base_species.shape).id
-          f.write(sprintf("Shape = %s\r\n", GameData::BodyShape.get(species.shape).id))
-        end
+        f.write(sprintf("Shape = %s\r\n", species.shape)) if species.shape != base_species.shape
         if species.habitat != :None && species.habitat != base_species.habitat
           f.write(sprintf("Habitat = %s\r\n", species.habitat))
         end