Created and implemented GameData::Species

2026-01-26 00:06:00 +00:00 · 2020-12-24 21:25:16 +00:00
parent 1ffeddc41c
commit ad21fc92cb
91 changed files with 6733 additions and 7963 deletions
--- a/Data/Scripts/016_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/016_Pokemon/001_Pokemon.rb
@@ -7,6 +7,13 @@ class Pokemon
  attr_accessor :name
  # @return [Integer] this Pokémon's national Pokédex number
  attr_reader   :species
+  # If defined, is the time (in Integer form) when this Pokémon's form was set.
+  # @return [Integer, nil] the time this Pokémon's form was set
+  attr_accessor :formTime
+  # If defined, this Pokémon's form will be this value even if a MultipleForms
+  # handler tries to say otherwise.
+  # @return [Integer, nil] this Pokémon's form
+  attr_accessor :forcedForm
  # @return [Integer] the current experience points
  attr_reader   :exp
  # @return [Integer] the current HP
@@ -196,12 +203,12 @@ class Pokemon

  # @return [Integer] this Pokémon's growth rate (from PBGrowthRates)
  def growthrate
-    return pbGetSpeciesData(@species, formSimple, SpeciesData::GROWTH_RATE)
+    return species_data.growth_rate
  end

  # @return [Integer] this Pokémon's base Experience value
  def baseExp
-    return pbGetSpeciesData(@species, formSimple, SpeciesData::BASE_EXP)
+    return species_data.base_exp
  end

  # @return [Float] a number between 0 and 1 indicating how much of the current level's
@@ -221,8 +228,8 @@ class Pokemon

  # @return [0, 1, 2] this Pokémon's gender (0 = male, 1 = female, 2 = genderless)
  def gender
+    gender_rate = species_data.gender_rate
    # Return sole gender option for all male/all female/genderless species
-    gender_rate = pbGetSpeciesData(@species, formSimple, SpeciesData::GENDER_RATE)
    case gender_rate
    when PBGenderRates::AlwaysMale   then return 0
    when PBGenderRates::AlwaysFemale then return 1
@@ -236,7 +243,7 @@ class Pokemon
  # @return [Boolean] whether this Pokémon species is restricted to only ever being one
  #   gender (or genderless)
  def singleGendered?
-    gender_rate = pbGetSpeciesData(@species, formSimple, SpeciesData::GENDER_RATE)
+    gender_rate = species_data.gender_rate
    return gender_rate == PBGenderRates::AlwaysMale ||
           gender_rate == PBGenderRates::AlwaysFemale ||
           gender_rate == PBGenderRates::Genderless
@@ -272,122 +279,6 @@ class Pokemon
  # Makes this Pokémon female.
  def makeFemale; setGender(1); end

-  #=============================================================================
-  # Ability
-  #=============================================================================
-
-  # @return [Integer] the index of this Pokémon's ability
-  def abilityIndex
-    return @abilityflag || (@personalID & 1)
-  end
-
-  # @return [GameData::Ability, nil] an Ability object corresponding to this Pokémon's ability
-  def ability
-    ret = ability_id
-    return GameData::Ability.try_get(ret)
-  end
-
-  # @return [Symbol, nil] the ability symbol of this Pokémon's ability
-  def ability_id
-    abilIndex = abilityIndex
-    # Hidden ability
-    if abilIndex >= 2
-      hiddenAbil = pbGetSpeciesData(@species, formSimple, SpeciesData::HIDDEN_ABILITY)
-      if hiddenAbil.is_a?(Array)
-        ret = hiddenAbil[abilIndex - 2]
-        return ret if GameData::Ability.exists?(ret)
-      elsif abilIndex == 2
-        return hiddenAbil if GameData::Ability.exists?(hiddenAbil)
-      end
-      abilIndex = (@personalID & 1)
-    end
-    # Natural ability
-    abilities = pbGetSpeciesData(@species, formSimple, SpeciesData::ABILITIES)
-    if abilities.is_a?(Array)
-      ret = abilities[abilIndex]
-      ret = abilities[(abilIndex + 1) % 2] if !GameData::Ability.exists?(ret)
-      return ret
-    end
-    return abilities
-  end
-
-  # Returns whether this Pokémon has a particular ability. If no value
-  # is given, returns whether this Pokémon has an ability set.
-  # @param check_ability [Symbol, GameData::Ability, Integer] ability ID to check
-  # @return [Boolean] whether this Pokémon has a particular ability or
-  #   an ability at all
-  def hasAbility?(check_ability = nil)
-    current_ability = self.ability
-    return !current_ability.nil? if check_ability.nil?
-    return current_ability == check_ability
-  end
-
-  # Sets this Pokémon's ability index.
-  # @param value [Integer] new ability index
-  def setAbility(value)
-    @abilityflag = value
-  end
-
-  # @return [Boolean] whether this Pokémon has a hidden ability
-  def hasHiddenAbility?
-    abil = abilityIndex
-    return abil >= 2
-  end
-
-  # @return [Array<Array<Integer>>] the list of abilities this Pokémon can have,
-  #   where every element is [ability ID, ability index]
-  def getAbilityList
-    ret = []
-    abilities = pbGetSpeciesData(@species, formSimple, SpeciesData::ABILITIES)
-    if abilities.is_a?(Array)
-      abilities.each_with_index { |a, i| ret.push([a, i]) if a }
-    else
-      ret.push([abilities, 0]) if abilities > 0
-    end
-    hiddenAbil = pbGetSpeciesData(@species, formSimple, SpeciesData::HIDDEN_ABILITY)
-    if hiddenAbil.is_a?(Array)
-      hiddenAbil.each_with_index { |a, i| ret.push([a, i + 2]) if a }
-    else
-      ret.push([hiddenAbil, 2]) if hiddenAbil > 0
-    end
-    return ret
-  end
-
-  #=============================================================================
-  # Nature
-  #=============================================================================
-
-  # @return [Integer] the ID of this Pokémon's nature
-  def nature
-    return @natureflag || (@personalID % 25)
-  end
-
-  # Returns the calculated nature, taking into account things that change its
-  # stat-altering effect (i.e. Gen 8 mints). Only used for calculating stats.
-  # @return [Integer] this Pokémon's calculated nature
-  def calcNature
-    return @natureOverride if @natureOverride
-    return self.nature
-  end
-
-  # Returns whether this Pokémon has a particular nature. If no value
-  # is given, returns whether this Pokémon has a nature set.
-  # @param nature [Integer] nature ID to check
-  # @return [Boolean] whether this Pokémon has a particular nature or
-  #   a nature at all
-  def hasNature?(nature = -1)
-    current_nature = self.nature
-    return current_nature >= 0 if nature < 0
-    return current_nature == getID(PBNatures, nature)
-  end
-
-  # Sets this Pokémon's nature to a particular nature.
-  # @param value [Integer, String, Symbol] nature to change to
-  def setNature(value)
-    @natureflag = getID(PBNatures, value)
-    calcStats
-  end
-
  #=============================================================================
  # Shininess
  #=============================================================================
@@ -413,71 +304,26 @@ class Pokemon
    @shinyflag = false
  end

-  #=============================================================================
-  # Pokérus
-  #=============================================================================
-
-  # @return [Integer] the Pokérus infection stage for this Pokémon
-  def pokerusStrain
-    return @pokerus / 16
-  end
-
-  # Returns the Pokérus infection stage for this Pokémon. The possible stages are
-  # 0 (not infected), 1 (infected) and 2 (cured)
-  # @return [0, 1, 2] current Pokérus infection stage
-  def pokerusStage
-    return 0 if !@pokerus || @pokerus == 0
-    return 2 if @pokerus > 0 && (@pokerus % 16) == 0
-    return 1
-  end
-
-  # Gives this Pokémon Pokérus (either the specified strain or a random one).
-  # @param strain [Integer] Pokérus strain to give
-  def givePokerus(strain = 0)
-    return if self.pokerusStage == 2   # Can't re-infect a cured Pokémon
-    strain = 1 + rand(15) if strain <= 0 || strain >= 16
-    time = 1 + (strain % 4)
-    @pokerus = time
-    @pokerus |= strain << 4
-  end
-
-  # Resets the infection time for this Pokémon's Pokérus (even if cured).
-  def resetPokerusTime
-    return if @pokerus == 0
-    strain = @pokerus % 16
-    time = 1 + (strain % 4)
-    @pokerus = time
-    @pokerus |= strain << 4
-  end
-
-  # Reduces the time remaining for this Pokémon's Pokérus (if infected).
-  def lowerPokerusCount
-    return if self.pokerusStage != 1
-    @pokerus -= 1
-  end
-
  #=============================================================================
  # Types
  #=============================================================================

  # @return [Integer] this Pokémon's first type
  def type1
-    return pbGetSpeciesData(@species, formSimple, SpeciesData::TYPE1)
+    return species_data.type1
  end

  # @return [Integer] this Pokémon's second type, or the first type if none is defined
  def type2
-    ret = pbGetSpeciesData(@species, formSimple, SpeciesData::TYPE2)
-    ret = pbGetSpeciesData(@species, formSimple, SpeciesData::TYPE1) if !ret
-    return ret
+    sp_data = species_data
+    return sp_data.type2 || sp_data.type1
  end

  # @return [Array<Integer>] an array of this Pokémon's types
  def types
-    ret1 = pbGetSpeciesData(@species, formSimple, SpeciesData::TYPE1)
-    ret2 = pbGetSpeciesData(@species, formSimple, SpeciesData::TYPE2)
-    ret = [ret1]
-    ret.push(ret2) if ret2 && ret2 != ret1
+    sp_data = species_data
+    ret = [sp_data.type1]
+    ret.push(sp_data.type2) if sp_data.type2 && sp_data.type2 != sp_data.type1
    return ret
  end

@@ -488,6 +334,69 @@ class Pokemon
    return self.types.include?(type)
  end

+  #=============================================================================
+  # Ability
+  #=============================================================================
+
+  # @return [Integer] the index of this Pokémon's ability
+  def abilityIndex
+    return @abilityflag || (@personalID & 1)
+  end
+
+  # @return [GameData::Ability, nil] an Ability object corresponding to this Pokémon's ability
+  def ability
+    ret = ability_id
+    return GameData::Ability.try_get(ret)
+  end
+
+  # @return [Symbol, nil] the ability symbol of this Pokémon's ability
+  def ability_id
+    sp_data = species_data
+    abil_index = abilityIndex
+    # Hidden ability
+    if abil_index >= 2
+      ret = sp_data.hidden_abilities[abil_index - 2]
+      return ret if ret
+      abil_index = (@personalID & 1)
+    end
+    # Natural ability
+    ret = sp_data.abilities[abil_index]
+    return ret || sp_data.abilities[0]
+  end
+
+  # Returns whether this Pokémon has a particular ability. If no value
+  # is given, returns whether this Pokémon has an ability set.
+  # @param check_ability [Symbol, GameData::Ability, Integer] ability ID to check
+  # @return [Boolean] whether this Pokémon has a particular ability or
+  #   an ability at all
+  def hasAbility?(check_ability = nil)
+    current_ability = self.ability
+    return !current_ability.nil? if check_ability.nil?
+    return current_ability == check_ability
+  end
+
+  # Sets this Pokémon's ability index.
+  # @param value [Integer] new ability index
+  def setAbility(value)
+    @abilityflag = value
+  end
+
+  # @return [Boolean] whether this Pokémon has a hidden ability
+  def hasHiddenAbility?
+    abil = abilityIndex
+    return abil >= 2
+  end
+
+  # @return [Array<Array<Symbol,Integer>>] the abilities this Pokémon can have,
+  #   where every element is [ability ID, ability index]
+  def getAbilityList
+    ret = []
+    sp_data = species_data
+    sp_data.abilities.each_with_index { |a, i| ret.push([a, i]) if a }
+    sp_data.hidden_abilities.each_with_index { |a, i| ret.push([a, i + 2]) if a }
+    return ret
+  end
+
  #=============================================================================
  # Moves
  #=============================================================================
@@ -507,9 +416,9 @@ class Pokemon
  alias knowsMove? hasMove?

  # Returns the list of moves this Pokémon can learn by levelling up.
-  # @return [Array<Array<Integer>>] this Pokémon's move list, where every element is [level, move ID]
+  # @return [Array<Array<Integer,Symbol>>] this Pokémon's move list, where every element is [level, move ID]
  def getMoveList
-    return pbGetSpeciesMoveset(@species, formSimple)
+    return species_data.moves
  end

  # Sets this Pokémon's movelist to the default movelist it originally had.
@@ -597,7 +506,138 @@ class Pokemon
  # @param move [Integer, Symbol, String] ID of the move to check
  # @return [Boolean] whether the Pokémon is compatible with the given move
  def compatibleWithMove?(move_id)
-    return pbSpeciesCompatible?(self.fSpecies, move_id)
+    move_data = GameData::Move.try_get(move_id)
+    return move_data && species_data.tutor_moves.include?(move_data.id)
+  end
+
+  #=============================================================================
+  # Items
+  #=============================================================================
+
+  # @return [GameData::Item, nil] an Item object corresponding to this Pokémon's item
+  def item
+    ret = @item_id
+    return GameData::Item.try_get(ret)
+  end
+
+  # Returns whether this Pokémon is holding an item. If an item id is passed,
+  # returns whether the Pokémon is holding that item.
+  # @param check_item [Symbol, GameData::Item, Integer] item ID to check
+  # @return [Boolean] whether the Pokémon is holding the specified item or
+  #   an item at all
+  def hasItem?(check_item = nil)
+    current_item = self.item
+    return !current_item.nil? if check_item.nil?
+    return current_item == check_item
+  end
+
+  # Gives an item to this Pokémon. Passing 0 as the argument removes the held item.
+  # @param value [Symbol, GameData::Item, Integer] id of the item to give to this
+  #   Pokémon (a non-valid value sets it to nil)
+  def setItem(value)
+    new_item = GameData::Item.try_get(value)
+    @item_id = (new_item) ? new_item.id : nil
+  end
+
+  # @return [Array<Integer>] the items this species can be found holding in the wild
+  def wildHoldItems
+    sp_data = species_data
+    return [sp_data.wild_item_common, sp_data.wild_item_uncommon, sp_data.wild_item_rare]
+  end
+
+  # @return [PokemonMail, nil] mail held by this Pokémon (nil if there is none)
+  def mail
+    return nil if !@mail
+    @mail = nil if !@mail.item || !hasItem?(@mail.item)
+    return @mail
+  end
+
+  # If mail is a PokemonMail object, gives that mail to this Pokémon. If nil is given,
+  # removes the held mail.
+  # @param mail [PokemonMail, nil] mail to be held by this Pokémon (nil if mail is to be removed)
+  def mail=(mail)
+    if !mail.nil? && !mail.is_a?(PokemonMail)
+      raise ArgumentError, _INTL('Invalid value {1} given', mail.inspect)
+    end
+    @mail = mail
+  end
+
+  #=============================================================================
+  # Nature
+  #=============================================================================
+
+  # @return [Integer] the ID of this Pokémon's nature
+  def nature
+    return @natureflag || (@personalID % 25)
+  end
+
+  # Returns the calculated nature, taking into account things that change its
+  # stat-altering effect (i.e. Gen 8 mints). Only used for calculating stats.
+  # @return [Integer] this Pokémon's calculated nature
+  def calcNature
+    return @natureOverride if @natureOverride
+    return self.nature
+  end
+
+  # Returns whether this Pokémon has a particular nature. If no value
+  # is given, returns whether this Pokémon has a nature set.
+  # @param nature [Integer] nature ID to check
+  # @return [Boolean] whether this Pokémon has a particular nature or
+  #   a nature at all
+  def hasNature?(nature = -1)
+    current_nature = self.nature
+    return current_nature >= 0 if nature < 0
+    return current_nature == getID(PBNatures, nature)
+  end
+
+  # Sets this Pokémon's nature to a particular nature.
+  # @param value [Integer, String, Symbol] nature to change to
+  def setNature(value)
+    @natureflag = getID(PBNatures, value)
+    calcStats
+  end
+
+  #=============================================================================
+  # Pokérus
+  #=============================================================================
+
+  # @return [Integer] the Pokérus infection stage for this Pokémon
+  def pokerusStrain
+    return @pokerus / 16
+  end
+
+  # Returns the Pokérus infection stage for this Pokémon. The possible stages are
+  # 0 (not infected), 1 (infected) and 2 (cured)
+  # @return [0, 1, 2] current Pokérus infection stage
+  def pokerusStage
+    return 0 if !@pokerus || @pokerus == 0
+    return 2 if @pokerus > 0 && (@pokerus % 16) == 0
+    return 1
+  end
+
+  # Gives this Pokémon Pokérus (either the specified strain or a random one).
+  # @param strain [Integer] Pokérus strain to give
+  def givePokerus(strain = 0)
+    return if self.pokerusStage == 2   # Can't re-infect a cured Pokémon
+    strain = 1 + rand(15) if strain <= 0 || strain >= 16
+    time = 1 + (strain % 4)
+    @pokerus = time
+    @pokerus |= strain << 4
+  end
+
+  # Resets the infection time for this Pokémon's Pokérus (even if cured).
+  def resetPokerusTime
+    return if @pokerus == 0
+    strain = @pokerus % 16
+    time = 1 + (strain % 4)
+    @pokerus = time
+    @pokerus |= strain << 4
+  end
+
+  # Reduces the time remaining for this Pokémon's Pokérus (if infected).
+  def lowerPokerusCount
+    return if self.pokerusStage != 1
+    @pokerus -= 1
  end

  #=============================================================================
@@ -625,7 +665,7 @@ class Pokemon
  end

  # @return [Integer] this Pokémon's tough contest attribute
-  def tough;
+  def tough
    return @tough || 0
  end

@@ -697,61 +737,6 @@ class Pokemon
    @ribbons = []
  end

-  #=============================================================================
-  # Items
-  #=============================================================================
-
-  # @return [GameData::Item, nil] an Item object corresponding to this Pokémon's item
-  def item
-    ret = @item_id
-    return GameData::Item.try_get(ret)
-  end
-
-  # Returns whether this Pokémon is holding an item. If an item id is passed,
-  # returns whether the Pokémon is holding that item.
-  # @param check_item [Symbol, GameData::Item, Integer] item ID to check
-  # @return [Boolean] whether the Pokémon is holding the specified item or
-  #   an item at all
-  def hasItem?(check_item = nil)
-    current_item = self.item
-    return !current_item.nil? if check_item.nil?
-    return current_item == check_item
-  end
-
-  # Gives an item to this Pokémon. Passing 0 as the argument removes the held item.
-  # @param value [Symbol, GameData::Item, Integer] id of the item to give to this
-  #   Pokémon (a non-valid value sets it to nil)
-  def setItem(value)
-    new_item = GameData::Item.try_get(value)
-    @item_id = (new_item) ? new_item.id : nil
-  end
-
-  # @return [Array<Integer>] the items this species can be found holding in the wild
-  def wildHoldItems
-    ret = []
-    ret.push(pbGetSpeciesData(@species, formSimple, SpeciesData::WILD_ITEM_COMMON))
-    ret.push(pbGetSpeciesData(@species, formSimple, SpeciesData::WILD_ITEM_UNCOMMON))
-    ret.push(pbGetSpeciesData(@species, formSimple, SpeciesData::WILD_ITEM_RARE))
-    return ret
-  end
-
-  # @return [PokemonMail, nil] mail held by this Pokémon (nil if there is none)
-  def mail
-    return nil if !@mail
-    @mail = nil if !@mail.item || !hasItem?(@mail.item)
-    return @mail
-  end
-
-  # If mail is a PokemonMail object, gives that mail to this Pokémon. If nil is given,
-  # removes the held mail.
-  # @param mail [PokemonMail, nil] mail to be held by this Pokémon (nil if mail is to be removed)
-  def mail=(mail)
-    if !mail.nil? && !mail.is_a?(PokemonMail)
-      raise ArgumentError, _INTL('Invalid value {1} given', mail.inspect)
-    end
-    @mail = mail
-  end
-
  #=============================================================================
  # Status
  #=============================================================================
@@ -819,15 +804,17 @@ class Pokemon
  end

  #=============================================================================
-  # Other
+  # Species and form
  #=============================================================================

  # Changes the Pokémon's species and re-calculates its statistics.
  # @param species_id [Integer] id of the species to change this Pokémon to
  def species=(species_id)
+    new_species_data = GameData::Species.get(species_id)
+    return if @species == new_species_data.species
    has_nickname = nicknamed?
-    @species, new_form = pbGetSpeciesFromFSpecies(species_id)
-    @form = new_form if @species != value
+    @species    = new_species_data.species
+    @form       = new_species_data.form if new_species_data.form != 0
    @name       = speciesName unless has_nickname
    @level      = nil   # In case growth rate is different for the new species
    @forcedForm = nil
@@ -836,14 +823,51 @@ class Pokemon

  # @param species [Integer, Symbol, String] id of the species to check for
  # @return [Boolean] whether this Pokémon is of the specified species
-  def isSpecies?(species)
-    species = getID(PBSpecies, species)
-    return species && @species == species
+  def isSpecies?(check_species)
+    return @species == check_species || @species == GameData::Species.get(check_species).species
  end

+  def form
+    return @forcedForm if !@forcedForm.nil?
+    return @form if $game_temp.in_battle
+    v = MultipleForms.call("getForm", self)
+    self.form = v if v != nil && (!@form || v != @form)
+    return @form
+  end
+
+  def formSimple
+    return @forcedForm || @form
+  end
+
+  def form=(value)
+    oldForm = @form
+    @form = value
+    yield if block_given?
+    MultipleForms.call("onSetForm", self, value, oldForm)
+    calcStats
+    pbSeenForm(self)
+  end
+
+  def setForm(value)
+    self.form = value
+  end
+
+  def formSimple=(value)
+    @form = value
+    calcStats
+  end
+
+  def species_data
+    return GameData::Species.get_species_form(@species, formSimple)
+  end
+
+  #=============================================================================
+  # Other
+  #=============================================================================
+
  # @return [String] the species name of this Pokémon
  def speciesName
-    return PBSpecies.getName(@species)
+    return species_data.name
  end

  # @return [Boolean] whether this Pokémon has been nicknamed
@@ -863,12 +887,17 @@ class Pokemon

  # @return [Integer] the height of this Pokémon in decimetres (0.1 metres)
  def height
-    return pbGetSpeciesData(@species, formSimple, SpeciesData::HEIGHT)
+    return species_data.height
  end

  # @return [Integer] the weight of this Pokémon in hectograms (0.1 kilograms)
  def weight
-    return pbGetSpeciesData(@species, formSimple, SpeciesData::WEIGHT)
+    return species_data.weight
+  end
+
+  # @return [Array<Integer>] the EV yield of this Pokémon (an array of six values)
+  def evYield
+    return species_data.evs.clone
  end

  # Returns an array of booleans indicating whether a stat is made to have
@@ -889,12 +918,6 @@ class Pokemon
    return ret
  end

-  # @return [Array<Integer>] the EV yield of this Pokémon (an array of six values)
-  def evYield
-    ret = pbGetSpeciesData(@species, formSimple, SpeciesData::EFFORT_POINTS)
-    return ret.clone
-  end
-
  # Sets the Pokémon's health.
  # @param value [Integer] new hp value
  def hp=(value)
@@ -971,8 +994,7 @@ class Pokemon

  # @return [Array<Integer>] this Pokémon's base stats, an array of six values
  def baseStats
-    ret = pbGetSpeciesData(@species, formSimple, SpeciesData::BASE_STATS)
-    return ret.clone
+    return species_data.base_stats.clone
  end

  # @return [Integer] the maximum HP of this Pokémon
@@ -1031,21 +1053,16 @@ class Pokemon
  end

  # Creates a new Pokémon object.
-  # @param species [Integer, Symbol, String] Pokémon species
+  # @param species [Symbol, String, Integer] Pokémon species
  # @param level [Integer] Pokémon level
  # @param owner [Owner, PokeBattle_Trainer] Pokémon owner (the player by default)
  # @param withMoves [Boolean] whether the Pokémon should have moves
  def initialize(species, level, owner = $Trainer, withMoves = true)
-    ospecies = species.to_s
-    species = getID(PBSpecies, species)
-    cname = getConstantName(PBSpecies, species) rescue nil
-    realSpecies = pbGetSpeciesFromFSpecies(species)[0] if species && species > 0
-    if !species || species <= 0 || realSpecies > PBSpecies.maxValue || !cname
-      raise ArgumentError.new(_INTL("The species given ({1}) is invalid.", ospecies))
-    end
-    @species      = realSpecies
-    @name         = speciesName
-    @personalID   = rand(2**16) | rand(2**16) << 16
+    species_data = GameData::Species.get(species)
+    @species      = species_data.species
+    @form         = species_data.form
+    @name         = species_data.name
+    @personalID   = rand(2 ** 16) | rand(2 ** 16) << 16
    @hp           = 1
    @totalhp      = 1
    @iv           = []
@@ -1081,7 +1098,14 @@ class Pokemon
    self.level    = level
    calcStats
    @hp           = @totalhp
-    @happiness    = pbGetSpeciesData(@species, formSimple, SpeciesData::HAPPINESS)
-    self.resetMoves if withMoves
+    @happiness    = species_data.happiness
+    resetMoves if withMoves
+    if @form == 0
+      f = MultipleForms.call("getFormOnCreation", self)
+      if f
+        self.form = f
+        resetMoves
+      end
+    end
  end
 end
--- a/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb
+++ b/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb
@@ -1,75 +1,3 @@
-class Pokemon
-  attr_accessor :formTime     # Time when Furfrou's/Hoopa's form was set
-  attr_accessor :forcedForm
-
-  def form
-    return @forcedForm if @forcedForm!=nil
-    return (@form || 0) if $game_temp.in_battle
-    v = MultipleForms.call("getForm",self)
-    self.form = v if v!=nil && (!@form || v!=@form)
-    return @form || 0
-  end
-
-  def form=(value)
-    setForm(value)
-  end
-
-  def setForm(value)
-    oldForm = @form
-    @form = value
-    yield if block_given?
-    MultipleForms.call("onSetForm",self,value,oldForm)
-    self.calcStats
-    pbSeenForm(self)
-  end
-
-  def formSimple
-    return @forcedForm if @forcedForm!=nil
-    return @form || 0
-  end
-
-  def formSimple=(value)
-    @form = value
-    self.calcStats
-  end
-
-  def fSpecies
-    return pbGetFSpeciesFromForm(@species,formSimple)
-  end
-
-  alias __mf_initialize initialize
-  def initialize(*args)
-    @form = (pbGetSpeciesFromFSpecies(args[0])[1] rescue 0)
-    __mf_initialize(*args)
-    if @form==0
-      f = MultipleForms.call("getFormOnCreation",self)
-      if f
-        self.form = f
-        self.resetMoves
-      end
-    end
-  end
-end
-
-
-
-class PokeBattle_RealBattlePeer
-  def pbOnEnteringBattle(_battle,pkmn,wild=false)
-    f = MultipleForms.call("getFormOnEnteringBattle",pkmn,wild)
-    pkmn.form = f if f
-  end
-
-  # For switching out, including due to fainting, and for the end of battle
-  def pbOnLeavingBattle(battle,pkmn,usedInBattle,endBattle=false)
-    return if !pkmn
-    f = MultipleForms.call("getFormOnLeavingBattle",pkmn,battle,usedInBattle,endBattle)
-    pkmn.form = f if f && pkmn.form!=f
-    pkmn.hp = pkmn.totalhp if pkmn.hp>pkmn.totalhp
-  end
-end
-
-
-
 module MultipleForms
  @@formSpecies = SpeciesHandlerHash.new

@@ -86,13 +14,13 @@ module MultipleForms
  end

  def self.hasFunction?(pkmn,func)
-    spec = (pkmn.is_a?(Numeric)) ? pkmn : pkmn.species
+    spec = (pkmn.is_a?(Pokemon)) ? pkmn.species : pkmn
    sp = @@formSpecies[spec]
    return sp && sp[func]
  end

  def self.getFunction(pkmn,func)
-    spec = (pkmn.is_a?(Numeric)) ? pkmn : pkmn.species
+    spec = (pkmn.is_a?(Pokemon)) ? pkmn.species : pkmn
    sp = @@formSpecies[spec]
    return (sp && sp[func]) ? sp[func] : nil
  end
@@ -364,7 +292,7 @@ MultipleForms.register(:ARCEUS,{
        ret = f
        break
      end
-      break if ret>0
+      break if ret > 0
    end
    next ret
  }
--- a/Data/Scripts/016_Pokemon/003_Pokemon_MegaEvolution.rb
+++ b/Data/Scripts/016_Pokemon/003_Pokemon_MegaEvolution.rb
@@ -3,62 +3,53 @@
 # NOTE: These are treated as form changes in Essentials.
 #===============================================================================
 class Pokemon
-  def getMegaForm(checkItemOnly=false)
-    formData = pbLoadFormToSpecies
-    return 0 if !formData[@species] || formData[@species].length==0
+  def getMegaForm(checkItemOnly = false)
    ret = 0
-    speciesData = pbLoadSpeciesData
-    for i in 0...formData[@species].length
-      fSpec = formData[@species][i]
-      next if !fSpec || fSpec<=0
-      megaStone = speciesData[fSpec][SpeciesData::MEGA_STONE]
-      if megaStone && self.hasItem?(megaStone)
-        ret = i; break
-      end
-      if !checkItemOnly
-        megaMove = speciesData[fSpec][SpeciesData::MEGA_MOVE]
-        if self.hasMove?(megaMove)
-          ret = i; break
-        end
+    GameData::Species.each do |data|
+      next if data.species != @species
+      if data.mega_stone && hasItem?(data.mega_stone)
+        ret = data.form
+        break
+      elsif !checkItemOnly && data.mega_move && hasMove?(data.mega_move)
+        ret = data.form
+        break
      end
    end
    return ret   # form number, or 0 if no accessible Mega form
  end

  def getUnmegaForm
-    return -1 if !mega?
-    unmegaForm = pbGetSpeciesData(@species,formSimple,SpeciesData::UNMEGA_FORM)
-    return unmegaForm   # form number
+    return (mega?) ? species_data.unmega_form : -1
  end

  def hasMegaForm?
    megaForm = self.getMegaForm
-    return megaForm>0 && megaForm!=self.formSimple
+    return megaForm > 0 && megaForm != self.formSimple
  end

  def mega?
    megaForm = self.getMegaForm
-    return megaForm>0 && megaForm==self.formSimple
+    return megaForm > 0 && megaForm == self.formSimple
  end
  alias isMega? mega?

  def makeMega
    megaForm = self.getMegaForm
-    self.form = megaForm if megaForm>0
+    self.form = megaForm if megaForm > 0
  end

  def makeUnmega
    unmegaForm = self.getUnmegaForm
-    self.form = unmegaForm if unmegaForm>=0
+    self.form = unmegaForm if unmegaForm >= 0
  end

  def megaName
-    formName = pbGetMessage(MessageTypes::FormNames,self.fSpecies)
-    return (formName && formName!="") ? formName : _INTL("Mega {1}",PBSpecies.getName(@species))
+    formName = species_data.form_name
+    return (formName && !formName.empty?) ? formName : _INTL("Mega {1}", species_data.name)
  end

  def megaMessage   # 0=default message, 1=Rayquaza message
-    return pbGetSpeciesData(@species,getMegaForm,SpeciesData::MEGA_MESSAGE)
+    return species_data.mega_message
  end
 end

--- a/Data/Scripts/016_Pokemon/004_Pokemon_ShadowPokemon.rb
+++ b/Data/Scripts/016_Pokemon/004_Pokemon_ShadowPokemon.rb
@@ -50,9 +50,8 @@ def pbPurify(pokemon,scene)
    pbChangeLevel(pokemon,newlevel,scene) # for convenience
    pokemon.exp = newexp
  end
-  speciesname = PBSpecies.getName(pokemon.species)
-  if scene.pbConfirm(_INTL("Would you like to give a nickname to {1}?",speciesname))
-    newname = pbEnterPokemonName(_INTL("{1}'s nickname?",speciesname),
+  if scene.pbConfirm(_INTL("Would you like to give a nickname to {1}?", pokemon.speciesName))
+    newname = pbEnterPokemonName(_INTL("{1}'s nickname?", pokemon.speciesName),
                                 0, Pokemon::MAX_NAME_SIZE, "", pokemon)
    pokemon.name = newname if newname!=""
  end
@@ -281,8 +280,8 @@ class Pokemon
    self.savedev     = [0,0,0,0,0,0]
    self.shadowmoves = []
    # Retrieve Shadow moveset for this Pokémon
-    shadow_moveset = pbLoadShadowMovesets[self.fSpecies]
-    shadow_moveset = pbLoadShadowMovesets[self.species] if !shadow_moveset || shadow_moveset.length == 0
+    shadow_moveset = pbLoadShadowMovesets[species_data.id]
+    shadow_moveset = pbLoadShadowMovesets[@species] if !shadow_moveset || shadow_moveset.length == 0
    # Record this Pokémon's Shadow moves
    if shadow_moveset && shadow_moveset.length > 0
      for i in 0...[shadow_moveset.length, MAX_MOVES].min
--- a/Data/Scripts/016_Pokemon/005_Pokemon_Evolution.rb
+++ b/Data/Scripts/016_Pokemon/005_Pokemon_Evolution.rb
@@ -98,33 +98,6 @@ module PBEvolution
  end
 end

-#===============================================================================
-# Evolutions data cache
-#===============================================================================
-class PokemonTemp
-  attr_accessor :evolutionsData
-end
-
-def pbLoadEvolutionsData
-  $PokemonTemp = PokemonTemp.new if !$PokemonTemp
-  if !$PokemonTemp.evolutionsData
-    $PokemonTemp.evolutionsData = load_data("Data/species_evolutions.dat") || []
-  end
-  return $PokemonTemp.evolutionsData
-end
-
-def pbGetEvolutionData(species)
-  species = getID(PBSpecies,species)
-  evosData = pbLoadEvolutionsData
-  return evosData[species] || nil
-end
-
-alias __evolutionsData__pbClearData pbClearData
-def pbClearData
-  $PokemonTemp.evolutionsData = nil if $PokemonTemp
-  __evolutionsData__pbClearData
-end
-
 #===============================================================================
 # Evolution helper functions
 #===============================================================================
@@ -133,7 +106,7 @@ module EvolutionHelper

  def evolutions(species, ignore_none = false)
    ret = []
-    evoData = pbGetEvolutionData(species)
+    evoData =  GameData::Species.get(species).evolutions
    return ret if !evoData || evoData.length == 0
    evoData.each do |evo|
      next if evo[3]   # Is the prevolution
@@ -143,9 +116,10 @@ module EvolutionHelper
    return ret
  end

-  def family_evolutions(species)
-    evos = self.evolutions(species, true)
+  def family_evolutions(species, ignore_none = true)
+    evos = self.evolutions(species, ignore_none)
    return nil if evos.length == 0
+    evos.sort! { |a, b| GameData::Species.get(a[2]).id_number <=> GameData::Species.get(b[2]).id_number }
    ret = []
    for i in 0...evos.length
      ret.push([species].concat(evos[i]))
@@ -155,8 +129,15 @@ module EvolutionHelper
    return ret
  end

+  def all_related_species(species)
+    species = self.baby_species(species)
+    evos = self.family_evolutions(species, false)
+    return [species] if !evos || evos.length == 0
+    return [species].concat(evos.map { |e| e[3] }).uniq
+  end
+
  def previous_species(species)
-    evoData = pbGetEvolutionData(species)
+    evoData =  GameData::Species.get(species).evolutions
    return species if !evoData || evoData.length == 0
    evoData.each do |evo|
      return evo[0] if evo[3]   # Is the prevolution
@@ -166,12 +147,12 @@ module EvolutionHelper

  def baby_species(species, check_items = false, item1 = nil, item2 = nil)
    ret = species
-    evoData = pbGetEvolutionData(species)
+    evoData =  GameData::Species.get(species).evolutions
    return ret if !evoData || evoData.length == 0
    evoData.each do |evo|
      next if !evo[3]   # Not the prevolution
      if check_items
-        incense = pbGetSpeciesData(evo[0], 0, SpeciesData::INCENSE)
+        incense = GameData::Species.get(evo[0]).incense
        ret = evo[0] if !incense || item1 == incense || item2 == incense
      else
        ret = evo[0]   # Species of prevolution
@@ -183,7 +164,7 @@ module EvolutionHelper
  end

  def minimum_level(species)
-    evoData = pbGetEvolutionData(species)
+    evoData =  GameData::Species.get(species).evolutions
    return 1 if !evoData || evoData.length == 0
    ret = -1
    evoData.each do |evo|
@@ -203,11 +184,11 @@ module EvolutionHelper
    return false if !evos || evos.length == 0
    for evo in evos
      if method.is_a?(Array)
-        next if !method.include?(evo[0])
+        next if !method.include?(evo[1])
      elsif method >= 0
-        next if evo[0] != method
+        next if evo[1] != method
      end
-      next if param && evo[1] != param
+      next if param && evo[2] != param
      return true
    end
    return false
@@ -270,39 +251,40 @@ end
 #===============================================================================
 def pbMiniCheckEvolution(pkmn, method, parameter, new_species)
  success = PBEvolution.call("levelUpCheck", method, pkmn, parameter)
-  return (success) ? new_species : -1
+  return (success) ? new_species : nil
 end

 def pbMiniCheckEvolutionItem(pkmn, method, parameter, new_species, item)
  success = PBEvolution.call("itemCheck", method, pkmn, parameter, item)
-  return (success) ? new_species : -1
+  return (success) ? new_species : nil
 end

 # Checks whether a Pokemon can evolve now. If a block is given, calls the block
 # with the following parameters:
 #   Pokemon to check; evolution method; parameter; ID of the new species
-def pbCheckEvolutionEx(pokemon)
-  return -1 if pokemon.species<=0 || pokemon.egg? || pokemon.shadowPokemon?
-  return -1 if pokemon.hasItem?(:EVERSTONE)
-  return -1 if pokemon.hasAbility?(:BATTLEBOND)
-  ret = -1
-  for form in EvolutionHelper.evolutions(pbGetFSpeciesFromForm(pokemon.species,pokemon.form), true)
-    ret = yield pokemon,form[0],form[1],form[2]
-    break if ret>0
+def pbCheckEvolutionEx(pkmn)
+  return nil if !pkmn.species || pokemon.egg? || pokemon.shadowPokemon?
+  return nil if pkmn.hasItem?(:EVERSTONE)
+  return nil if pkmn.hasAbility?(:BATTLEBOND)
+  ret = nil
+  pkmn.species_data.evolutions.each do |evo|
+    next if evo[3]   # Prevolution
+    ret = yield pkmn, evo[1], evo[2], evo[0]   # pkmn, method, parameter, new_species
+    break if ret
  end
  return ret
 end

 # Checks whether a Pokemon can evolve now. If an item is used on the Pokémon,
 # checks whether the Pokemon can evolve with the given item.
-def pbCheckEvolution(pokemon,item=nil)
+def pbCheckEvolution(pkmn, item = nil)
  if item
-    return pbCheckEvolutionEx(pokemon) { |pokemon,evonib,level,poke|
-      next pbMiniCheckEvolutionItem(pokemon,evonib,level,poke,item)
+    return pbCheckEvolutionEx(pkmn) { |pkmn, method, parameter, new_species|
+      next pbMiniCheckEvolutionItem(pkmn, method, parameter, new_species, item)
    }
  else
-    return pbCheckEvolutionEx(pokemon) { |pokemon,evonib,level,poke|
-      next pbMiniCheckEvolution(pokemon,evonib,level,poke)
+    return pbCheckEvolutionEx(pkmn) { |pkmn, method, parameter, new_species|
+      next pbMiniCheckEvolution(pkmn, method, parameter, new_species)
    }
  end
 end
@@ -662,7 +644,7 @@ PBEvolution.register(:HasMoveType, {

 PBEvolution.register(:HasInParty, {
  "minimumLevel"  => 1,   # Needs any level up
-  "parameterType" => :PBSpecies,
+  "parameterType" => :Species,
  "levelUpCheck"  => proc { |pkmn, parameter|
    next pbHasSpecies?(parameter)
  }
@@ -779,7 +761,7 @@ PBEvolution.register(:TradeItem, {
 })

 PBEvolution.register(:TradeSpecies, {
-  "parameterType" => :PBSpecies,
+  "parameterType" => :Species,
  "tradeCheck"    => proc { |pkmn, parameter, other_pkmn|
    next pkmn.species == parameter && !other_pkmn.hasItem?(:EVERSTONE)
  }
--- a/Data/Scripts/016_Pokemon/007_Pokemon_Chatter.rb
+++ b/Data/Scripts/016_Pokemon/007_Pokemon_Chatter.rb
@@ -5,7 +5,7 @@ end


 def pbChatter(pokemon)
-  iconwindow=PictureWindow.new(pbLoadPokemonBitmap(pokemon))
+  iconwindow=PictureWindow.new(GameData::Species.sprite_bitmap_from_pokemon(pokemon))
  iconwindow.x=(Graphics.width/2)-(iconwindow.width/2)
  iconwindow.y=((Graphics.height-96)/2)-(iconwindow.height/2)
  if pokemon.chatter
@@ -40,7 +40,7 @@ HiddenMoveHandlers::UseMove.add(:CHATTER,proc { |move,pokemon|

 class PokeBattle_Scene
  def pbChatter(user,_target)
-    pbPlayCry(user.pokemon,90,100) if user.pokemon
+    GameData::Species.play_cry_from_pokemon(user.pokemon, nil, 100) if user.pokemon
    Graphics.frame_rate.times do
      Graphics.update
      Input.update
--- a/Data/Scripts/016_Pokemon/008_Pokemon_Sprites.rb
+++ b/Data/Scripts/016_Pokemon/008_Pokemon_Sprites.rb
@@ -48,7 +48,7 @@ class PokemonSprite < SpriteWrapper

  def setPokemonBitmap(pokemon,back=false)
    @_iconbitmap.dispose if @_iconbitmap
-    @_iconbitmap = (pokemon) ? pbLoadPokemonBitmap(pokemon,back) : nil
+    @_iconbitmap = (pokemon) ? GameData::Species.sprite_bitmap_from_pokemon(pokemon, back) : nil
    self.bitmap = (@_iconbitmap) ? @_iconbitmap.bitmap : nil
    self.color = Color.new(0,0,0,0)
    changeOrigin
@@ -56,14 +56,14 @@ class PokemonSprite < SpriteWrapper

  def setPokemonBitmapSpecies(pokemon,species,back=false)
    @_iconbitmap.dispose if @_iconbitmap
-    @_iconbitmap = (pokemon) ? pbLoadPokemonBitmapSpecies(pokemon,species,back) : nil
+    @_iconbitmap = (pokemon) ? GameData::Species.sprite_bitmap_from_pokemon(pokemon, back, species) : nil
    self.bitmap = (@_iconbitmap) ? @_iconbitmap.bitmap : nil
    changeOrigin
  end

-  def setSpeciesBitmap(species,female=false,form=0,shiny=false,shadow=false,back=false,egg=false)
+  def setSpeciesBitmap(species, gender = 0, form = 0, shiny = false, shadow = false, back = false, egg = false)
    @_iconbitmap.dispose if @_iconbitmap
-    @_iconbitmap = pbLoadSpeciesBitmap(species,female,form,shiny,shadow,back,egg)
+    @_iconbitmap = GameData::Species.sprite_bitmap(species, form, gender, shiny, shadow, back, egg)
    self.bitmap = (@_iconbitmap) ? @_iconbitmap.bitmap : nil
    changeOrigin
  end
@@ -129,7 +129,7 @@ class PokemonIconSprite < SpriteWrapper
      @counter = 0
      return
    end
-    @animBitmap = AnimatedBitmap.new(pbPokemonIconFile(value))
+    @animBitmap = AnimatedBitmap.new(GameData::Species.icon_filename_from_pokemon(value))
    self.bitmap = @animBitmap.bitmap
    self.src_rect.width  = @animBitmap.height
    self.src_rect.height = @animBitmap.height
@@ -307,12 +307,13 @@ class PokemonSpeciesIconSprite < SpriteWrapper
  def refresh
    @animBitmap.dispose if @animBitmap
    @animBitmap = nil
-    bitmapFileName = pbCheckPokemonIconFiles([@species,(@gender==1),@shiny,@form,false])
+    bitmapFileName = GameData::Species.icon_filename(@species, @form, @gender, @shiny)
+    return if !bitmapFileName
    @animBitmap = AnimatedBitmap.new(bitmapFileName)
    self.bitmap = @animBitmap.bitmap
    self.src_rect.width  = @animBitmap.height
    self.src_rect.height = @animBitmap.height
-    @numFrames = @animBitmap.width/@animBitmap.height
+    @numFrames = @animBitmap.width / @animBitmap.height
    @currentFrame = 0 if @currentFrame>=@numFrames
    changeOrigin
  end
@@ -331,34 +332,3 @@ class PokemonSpeciesIconSprite < SpriteWrapper
    self.src_rect.x = self.src_rect.width*@currentFrame
  end
 end
-
-
-
-#===============================================================================
-# Sprite position adjustments
-#===============================================================================
-def pbApplyBattlerMetricsToSprite(sprite,index,species,shadow=false,metrics=nil)
-  metrics = pbLoadSpeciesMetrics if !metrics
-  if shadow
-    if (index&1)==1   # Foe Pokémon
-      sprite.x += (metrics[SpeciesData::METRIC_SHADOW_X][species] || 0)*2
-    end
-  else
-    if (index&1)==0   # Player's Pokémon
-      sprite.x += (metrics[SpeciesData::METRIC_PLAYER_X][species] || 0)*2
-      sprite.y += (metrics[SpeciesData::METRIC_PLAYER_Y][species] || 0)*2
-    else              # Foe Pokémon
-      sprite.x += (metrics[SpeciesData::METRIC_ENEMY_X][species] || 0)*2
-      sprite.y += (metrics[SpeciesData::METRIC_ENEMY_Y][species] || 0)*2
-      sprite.y -= (metrics[SpeciesData::METRIC_ALTITUDE][species] || 0)*2
-    end
-  end
-end
-
-# NOTE: The species parameter here is typically the fSpecies, which contains
-#       information about both the species and the form.
-def showShadow?(species)
-  return true
-#  metrics = pbLoadSpeciesMetrics
-#  return (metrics[SpeciesData::METRIC_ALTITUDE][species] || 0)>0
-end