Merged species Type1/Type2 into Types, did the same for Pokemon and Battler

Data/Scripts/010_Data/001_Hardcoded data/007_Evolution.rb

@@ -645,7 +645,7 @@ GameData::Evolution.register({
 #===============================================================================
 def pbEvolutionEvent(number)
   return if !$player
-  $player.able_pokemon_party.each do |pkmn|
+  $player.able_party.each do |pkmn|
     pkmn.trigger_event_evolution(number)
   end
 end

Data/Scripts/010_Data/002_PBS data/008_Species.rb

@@ -8,8 +8,7 @@ module GameData
     attr_reader :real_category
     attr_reader :real_pokedex_entry
     attr_reader :pokedex_form
-    attr_reader :type1
+    attr_reader :types
-    attr_reader :type2
     attr_reader :base_stats
     attr_reader :evs
     attr_reader :base_exp
@@ -77,8 +76,7 @@ module GameData
         "FormName"          => [0, "q"],
         "Category"          => [0, "s"],
         "Pokedex"           => [0, "q"],
-        "Type1"             => [0, "e", :Type],
+        "Types"             => [0, "eE", :Type, :Type],
-        "Type2"             => [0, "e", :Type],
         "BaseStats"         => [0, "vvvvvv"],
         "EVs"               => [0, "uuuuuu"],
         "BaseExp"           => [0, "v"],
@@ -110,6 +108,8 @@ module GameData
         "BattlerShadowSize" => [0, "u"],
         # All properties below here are old names for some properties above.
         # They will be removed in v21.
+        "Type1"             => [0, "e", :Type],
+        "Type2"             => [0, "e", :Type],
         "Rareness"          => [0, "u"],
         "Compatibility"     => [0, "*e", :EggGroup],
         "Kind"              => [0, "s"],
@@ -142,51 +142,50 @@ module GameData
     end
 
     def initialize(hash)
-      @id                    = hash[:id]
+      @id                 = hash[:id]
-      @species               = hash[:species]               || @id
+      @species            = hash[:species]            || @id
-      @form                  = hash[:form]                  || 0
+      @form               = hash[:form]               || 0
-      @real_name             = hash[:name]                  || "Unnamed"
+      @real_name          = hash[:name]               || "Unnamed"
-      @real_form_name        = hash[:form_name]
+      @real_form_name     = hash[:form_name]
-      @real_category         = hash[:category]              || "???"
+      @real_category      = hash[:category]           || "???"
-      @real_pokedex_entry    = hash[:pokedex_entry]         || "???"
+      @real_pokedex_entry = hash[:pokedex_entry]      || "???"
-      @pokedex_form          = hash[:pokedex_form]          || @form
+      @pokedex_form       = hash[:pokedex_form]       || @form
-      @type1                 = hash[:type1]                 || :NORMAL
+      @types              = hash[:types]              || [:NORMAL]
-      @type2                 = hash[:type2]                 || @type1
+      @base_stats         = hash[:base_stats]         || {}
-      @base_stats            = hash[:base_stats]            || {}
+      @evs                = hash[:evs]                || {}
-      @evs                   = hash[:evs]                   || {}
       GameData::Stat.each_main do |s|
         @base_stats[s.id] = 1 if !@base_stats[s.id] || @base_stats[s.id] <= 0
         @evs[s.id]        = 0 if !@evs[s.id] || @evs[s.id] < 0
       end
-      @base_exp              = hash[:base_exp]              || 100
+      @base_exp           = hash[:base_exp]           || 100
-      @growth_rate           = hash[:growth_rate]           || :Medium
+      @growth_rate        = hash[:growth_rate]        || :Medium
-      @gender_ratio          = hash[:gender_ratio]          || :Female50Percent
+      @gender_ratio       = hash[:gender_ratio]       || :Female50Percent
-      @catch_rate            = hash[:catch_rate]            || 255
+      @catch_rate         = hash[:catch_rate]         || 255
-      @happiness             = hash[:happiness]             || 70
+      @happiness          = hash[:happiness]          || 70
-      @moves                 = hash[:moves]                 || []
+      @moves              = hash[:moves]              || []
-      @tutor_moves           = hash[:tutor_moves]           || []
+      @tutor_moves        = hash[:tutor_moves]        || []
-      @egg_moves             = hash[:egg_moves]             || []
+      @egg_moves          = hash[:egg_moves]          || []
-      @abilities             = hash[:abilities]             || []
+      @abilities          = hash[:abilities]          || []
-      @hidden_abilities      = hash[:hidden_abilities]      || []
+      @hidden_abilities   = hash[:hidden_abilities]   || []
-      @wild_item_common      = hash[:wild_item_common]      || []
+      @wild_item_common   = hash[:wild_item_common]   || []
-      @wild_item_uncommon    = hash[:wild_item_uncommon]    || []
+      @wild_item_uncommon = hash[:wild_item_uncommon] || []
-      @wild_item_rare        = hash[:wild_item_rare]        || []
+      @wild_item_rare     = hash[:wild_item_rare]     || []
-      @egg_groups            = hash[:egg_groups]            || [:Undiscovered]
+      @egg_groups         = hash[:egg_groups]         || [:Undiscovered]
-      @hatch_steps           = hash[:hatch_steps]           || 1
+      @hatch_steps        = hash[:hatch_steps]        || 1
-      @incense               = hash[:incense]
+      @incense            = hash[:incense]
-      @offspring             = hash[:offspring]             || []
+      @offspring          = hash[:offspring]          || []
-      @evolutions            = hash[:evolutions]            || []
+      @evolutions         = hash[:evolutions]         || []
-      @height                = hash[:height]                || 1
+      @height             = hash[:height]             || 1
-      @weight                = hash[:weight]                || 1
+      @weight             = hash[:weight]             || 1
-      @color                 = hash[:color]                 || :Red
+      @color              = hash[:color]              || :Red
-      @shape                 = hash[:shape]                 || :Head
+      @shape              = hash[:shape]              || :Head
-      @habitat               = hash[:habitat]               || :None
+      @habitat            = hash[:habitat]            || :None
-      @generation            = hash[:generation]            || 0
+      @generation         = hash[:generation]         || 0
-      @flags                 = hash[:flags]                 || []
+      @flags              = hash[:flags]              || []
-      @mega_stone            = hash[:mega_stone]
+      @mega_stone         = hash[:mega_stone]
-      @mega_move             = hash[:mega_move]
+      @mega_move          = hash[:mega_move]
-      @unmega_form           = hash[:unmega_form]           || 0
+      @unmega_form        = hash[:unmega_form]        || 0
-      @mega_message          = hash[:mega_message]          || 0
+      @mega_message       = hash[:mega_message]       || 0
     end
 
     # @return [String] the translated name of this species

Data/Scripts/011_Battle/002_Battler/001_Battle_Battler.rb

@@ -6,8 +6,7 @@ class Battle::Battler
   attr_reader   :pokemon
   attr_accessor :pokemonIndex
   attr_accessor :species
-  attr_accessor :type1
+  attr_accessor :types
-  attr_accessor :type2
   attr_accessor :ability_id
   attr_accessor :item_id
   attr_accessor :moves
@@ -304,8 +303,7 @@ class Battle::Battler
   # same type more than once, and should not include any invalid type numbers
   # (e.g. -1).
   def pbTypes(withType3=false)
-    ret = [@type1]
+    ret = @types.clone
-    ret.push(@type2) if @type2!=@type1
     # Burn Up erases the Fire-type.
     ret.delete(:FIRE) if @effects[PBEffects::BurnUp]
     # Roost erases the Flying-type. If there are no types left, adds the Normal-

Data/Scripts/011_Battle/002_Battler/002_Battler_Initialize.rb

@@ -20,7 +20,7 @@ class Battle::Battler
     @form           = 0
     @level          = 0
     @hp = @totalhp  = 0
-    @type1 = @type2 = nil
+    @types          = []
     @ability_id     = nil
     @item_id        = nil
     @gender         = 0
@@ -44,8 +44,7 @@ class Battle::Battler
     @level        = pkmn.level
     @hp           = pkmn.hp
     @totalhp      = pkmn.totalhp
-    @type1        = pkmn.type1
+    @types        = pkmn.types
-    @type2        = pkmn.type2
     # ability and item intentionally not copied across here
     @gender       = pkmn.gender
     @attack       = pkmn.attack
@@ -78,8 +77,7 @@ class Battle::Battler
     @level        = pkmn.level
     @hp           = pkmn.hp
     @totalhp      = pkmn.totalhp
-    @type1        = pkmn.type1
+    @types        = pkmn.types
-    @type2        = pkmn.type2
     @ability_id   = pkmn.ability_id
     @item_id      = pkmn.item_id
     @gender       = pkmn.gender
@@ -312,8 +310,7 @@ class Battle::Battler
       @spdef        = @pokemon.spdef
       @speed        = @pokemon.speed
       if fullChange
-        @type1      = @pokemon.type1
+        @types      = @pokemon.types
-        @type2      = @pokemon.type2
         @ability_id = @pokemon.ability_id
       end
     end

Data/Scripts/011_Battle/002_Battler/003_Battler_ChangeSelf.rb

@@ -127,13 +127,11 @@ class Battle::Battler
       newTypes.push(:NORMAL) if newTypes.length == 0
       newType3 = newType.effects[PBEffects::Type3]
       newType3 = nil if newTypes.include?(newType3)
-      @type1 = newTypes[0]
+      @types = newTypes.clone
-      @type2 = (newTypes.length == 1) ? newTypes[0] : newTypes[1]
       @effects[PBEffects::Type3] = newType3
     else
       newType = GameData::Type.get(newType).id
-      @type1 = newType
+      @types = [newType]
-      @type2 = newType
       @effects[PBEffects::Type3] = nil
     end
     @effects[PBEffects::BurnUp] = false
@@ -141,8 +139,7 @@ class Battle::Battler
   end
 
   def pbResetTypes
-    @type1 = @pokemon.type1
+    @types = @pokemon.types
-    @type2 = @pokemon.type2
     @effects[PBEffects::Type3]  = nil
     @effects[PBEffects::BurnUp] = false
     @effects[PBEffects::Roost]  = false

Data/Scripts/011_Battle/005_AI/005_AI_Move_EffectScores.rb

@@ -2458,8 +2458,8 @@ class Battle::AI
     when "UseTargetDefenseInsteadOfTargetSpDef"
     #---------------------------------------------------------------------------
     when "FailsUnlessTargetSharesTypeWithUser"
-      if !target.pbHasType?(user.type1) &&
+      if !(user.types[0] && target.pbHasType?(user.types[0])) &&
-         !target.pbHasType?(user.type2)
+         !(user.types[1] && target.pbHasType?(user.types[1]))
         score -= 90
       end
     #---------------------------------------------------------------------------

Data/Scripts/011_Battle/005_AI/006_AI_Move_Utilities.rb

@@ -82,10 +82,10 @@ class Battle::AI
   # For switching. Determines the effectiveness of a potential switch-in against
   # an opposing battler.
   def pbCalcTypeModPokemon(battlerThis,_battlerOther)
-    mod1 = Effectiveness.calculate(battlerThis.type1,target.type1,target.type2)
+    mod1 = Effectiveness.calculate(battlerThis.types[0], target.types[0], target.types[1])
     mod2 = Effectiveness::NORMAL_EFFECTIVE
-    if battlerThis.type1!=battlerThis.type2
+    if battlerThis.types.length > 1
-      mod2 = Effectiveness.calculate(battlerThis.type2,target.type1,target.type2)
+      mod2 = Effectiveness.calculate(battlerThis.types[1], target.types[0], target.types[1])
       mod2 = mod2.to_f / Effectivenesss::NORMAL_EFFECTIVE
     end
     return mod1*mod2
@@ -275,7 +275,7 @@ class Battle::AI
           baseDmg = (baseDmg.to_f*mult/Effectiveness::NORMAL_EFFECTIVE).round
         else
           mult = Effectiveness.calculate(:FLYING,
-             target.type1,target.type2,target.effects[PBEffects::Type3])
+             target.types[0], target.types[1], target.effects[PBEffects::Type3])
           baseDmg = (baseDmg.to_f*mult/Effectiveness::NORMAL_EFFECTIVE).round
         end
       end

Data/Scripts/011_Battle/006_Other battle code/008_Battle_AbilityEffects.rb

@@ -2590,19 +2590,17 @@ Battle::AbilityEffects::OnSwitchIn.add(:ANTICIPATION,
   proc { |ability,battler,battle|
     next if !battler.pbOwnedByPlayer?
     battlerTypes = battler.pbTypes(true)
-    type1 = battlerTypes[0]
+    types = battlerTypes
-    type2 = battlerTypes[1] || type1
-    type3 = battlerTypes[2] || type2
     found = false
     battle.allOtherSideBattlers(battler.index).each do |b|
       b.eachMove do |m|
         next if m.statusMove?
-        if type1
+        if types.length > 0
           moveType = m.type
           if Settings::MECHANICS_GENERATION >= 6 && m.function == "TypeDependsOnUserIVs"   # Hidden Power
             moveType = pbHiddenPower(b.pokemon)[0]
           end
-          eff = Effectiveness.calculate(moveType,type1,type2,type3)
+          eff = Effectiveness.calculate(moveType, types[0], types[1], types[2])
           next if Effectiveness.ineffective?(eff)
           next if !Effectiveness.super_effective?(eff) &&
                   !["OHKO", "OHKOIce", "OHKOHitsUndergroundTarget"].include?(m.function)

Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb

@@ -305,9 +305,7 @@ class PokemonEncounters
         new_enc_list = []
         enc_list.each do |enc|
           species_data = GameData::Species.get(enc[1])
-          t1 = species_data.type1
+          new_enc_list.push(enc) if species_data.types.include?(favored_type)
-          t2 = species_data.type2
-          new_enc_list.push(enc) if t1 == favored_type || t2 == favored_type
         end
         enc_list = new_enc_list if new_enc_list.length > 0
       end

Data/Scripts/012_Overworld/006_Overworld_BerryPlants.rb

@@ -192,9 +192,9 @@ class BerryPlantMoistureSprite
   def update_graphic
     case @moisture_stage
     when -1 then @sprite.setBitmap("")
-    when 0  then @sprite.setBitmap("Graphics/Characters/berrytreeDry")
+    when 0  then @sprite.setBitmap("Graphics/Characters/berrytreedry")
-    when 1  then @sprite.setBitmap("Graphics/Characters/berrytreeDamp")
+    when 1  then @sprite.setBitmap("Graphics/Characters/berrytreedamp")
-    when 2  then @sprite.setBitmap("Graphics/Characters/berrytreeWet")
+    when 2  then @sprite.setBitmap("Graphics/Characters/berrytreewet")
     end
   end
 

Data/Scripts/014_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb

@@ -192,10 +192,7 @@ class Battle::Battler
     __shadow__pbInitPokemon(*arg)
     # Called into battle
     if shadowPokemon?
-      if GameData::Type.exists?(:SHADOW)
+      self.types = [:SHADOW] if GameData::Type.exists?(:SHADOW)
-        self.type1 = :SHADOW
-        self.type2 = :SHADOW
-      end
       self.pokemon.change_heart_gauge("battle") if pbOwnedByPlayer?
     end
   end

Data/Scripts/014_Pokemon/001_Pokemon.rb

@@ -304,23 +304,21 @@ class Pokemon
   # Types
   #=============================================================================
 
-  # @return [Symbol] this Pokémon's first type
-  def type1
-    return species_data.type1
-  end
-
-  # @return [Symbol] this Pokémon's second type, or the first type if none is defined
-  def type2
-    sp_data = species_data
-    return sp_data.type2 || sp_data.type1
-  end
-
   # @return [Array<Symbol>] an array of this Pokémon's types
   def types
-    sp_data = species_data
+    return species_data.types.clone
-    ret = [sp_data.type1]
+  end
-    ret.push(sp_data.type2) if sp_data.type2 && sp_data.type2 != sp_data.type1
+
-    return ret
+  # @deprecated This method is slated to be removed in v21.
+  def type1
+    Deprecation.warn_method('type1', 'v21', 'pkmn.types')
+    return types[0]
+  end
+
+  # @deprecated This method is slated to be removed in v21.
+  def type2
+    Deprecation.warn_method('type2', 'v21', 'pkmn.types')
+    return types[1] || types[0]
   end
 
   # @param type [Symbol, String, GameData::Type] type to check

Data/Scripts/016_UI/003_UI_Pokedex_Main.rb

@@ -359,8 +359,8 @@ class PokemonPokedex_Scene
       _gender, form = $player.pokedex.last_form_seen(species)
       species_data = GameData::Species.get_species_form(species, form)
       color  = species_data.color
-      type1  = species_data.type1
+      type1  = species_data.types[0]
-      type2  = species_data.type2 || type1
+      type2  = species_data.types[1] || type1
       shape  = species_data.shape
       height = species_data.height
       weight = species_data.weight

Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb

@@ -258,14 +258,11 @@ class PokemonPokedexInfo_Scene
       # Show the owned icon
       imagepos.push(["Graphics/Pictures/Pokedex/icon_own", 212, 44])
       # Draw the type icon(s)
-      type1 = species_data.type1
+      species_data.types.each_with_index do |type, i|
-      type2 = species_data.type2
+        type_number = GameData::Type.get(type).icon_position
-      type1_number = GameData::Type.get(type1).icon_position
+        type_rect = Rect.new(0, type_number * 32, 96, 32)
-      type2_number = GameData::Type.get(type2).icon_position
+        overlay.blt(296 + 100 * i, 120, @typebitmap.bitmap, type_rect)
-      type1rect = Rect.new(0, type1_number * 32, 96, 32)
+      end
-      type2rect = Rect.new(0, type2_number * 32, 96, 32)
-      overlay.blt(296, 120, @typebitmap.bitmap, type1rect)
-      overlay.blt(396, 120, @typebitmap.bitmap, type2rect) if type1 != type2
     else
       # Write the category
       textpos.push([_INTL("????? Pokémon"), 246, 68, 0, base, shadow])

Data/Scripts/016_UI/006_UI_Summary.rb

@@ -452,15 +452,11 @@ class PokemonSummary_Scene
     # Draw all text
     pbDrawTextPositions(overlay,textpos)
     # Draw Pokémon type(s)
-    type1_number = GameData::Type.get(@pokemon.type1).icon_position
+    @pokemon.types.each_with_index do |type, i|
-    type2_number = GameData::Type.get(@pokemon.type2).icon_position
+      type_number = GameData::Type.get(type).icon_position
-    type1rect = Rect.new(0, type1_number * 28, 64, 28)
+      type_rect = Rect.new(0, type_number * 28, 64, 28)
-    type2rect = Rect.new(0, type2_number * 28, 64, 28)
+      type_x = (@pokemon.types.length == 1) ? 402 : 370 + 66 * i
-    if @pokemon.type1==@pokemon.type2
+      overlay.blt(type_x, 146, @typebitmap.bitmap, type_rect)
-      overlay.blt(402,146,@typebitmap.bitmap,type1rect)
-    else
-      overlay.blt(370,146,@typebitmap.bitmap,type1rect)
-      overlay.blt(436,146,@typebitmap.bitmap,type2rect)
     end
     # Draw Exp bar
     if @pokemon.level<GameData::GrowthRate.max_level
@@ -790,15 +786,11 @@ class PokemonSummary_Scene
     pbDrawTextPositions(overlay,textpos)
     pbDrawImagePositions(overlay,imagepos)
     # Draw Pokémon's type icon(s)
-    type1_number = GameData::Type.get(@pokemon.type1).icon_position
+    @pokemon.types.each_with_index do |type, i|
-    type2_number = GameData::Type.get(@pokemon.type2).icon_position
+      type_number = GameData::Type.get(type).icon_position
-    type1rect = Rect.new(0, type1_number * 28, 64, 28)
+      type_rect = Rect.new(0, type_number * 28, 64, 28)
-    type2rect = Rect.new(0, type2_number * 28, 64, 28)
+      type_x = (@pokemon.types.length == 1) ? 130 : 96 + 70 * i
-    if @pokemon.type1==@pokemon.type2
+      overlay.blt(type_x, 78, @typebitmap.bitmap, type_rect)
-      overlay.blt(130,78,@typebitmap.bitmap,type1rect)
-    else
-      overlay.blt(96,78,@typebitmap.bitmap,type1rect)
-      overlay.blt(166,78,@typebitmap.bitmap,type2rect)
     end
   end
 

Data/Scripts/016_UI/017_UI_PokemonStorage.rb

@@ -1442,15 +1442,11 @@ class PokemonStorageScene
         imagepos.push(["Graphics/Pictures/shiny",156,198])
       end
       typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types"))
-      type1_number = GameData::Type.get(pokemon.type1).icon_position
+      pokemon.types.each_with_index do |type, i|
-      type2_number = GameData::Type.get(pokemon.type2).icon_position
+        type_number = GameData::Type.get(type).icon_position
-      type1rect = Rect.new(0, type1_number * 28, 64, 28)
+        type_rect = Rect.new(0, type_number * 28, 64, 28)
-      type2rect = Rect.new(0, type2_number * 28, 64, 28)
+        type_x = (pokemon.types.length == 1) ? 52 : 18 + 70 * i
-      if pokemon.type1==pokemon.type2
+        overlay.blt(type_x, 272, typebitmap.bitmap, type_rect)
-        overlay.blt(52,272,typebitmap.bitmap,type1rect)
-      else
-        overlay.blt(18,272,typebitmap.bitmap,type1rect)
-        overlay.blt(88,272,typebitmap.bitmap,type2rect)
       end
       drawMarkings(overlay,70,240,128,20,pokemon.markings)
       pbDrawImagePositions(overlay,imagepos)

Data/Scripts/016_UI/021_UI_MoveRelearner.rb

@@ -52,15 +52,11 @@ class MoveRelearner_Scene
   def pbDrawMoveList
     overlay=@sprites["overlay"].bitmap
     overlay.clear
-    type1_number = GameData::Type.get(@pokemon.type1).icon_position
+    @pokemon.types.each_with_index do |type, i|
-    type2_number = GameData::Type.get(@pokemon.type2).icon_position
+      type_number = GameData::Type.get(type).icon_position
-    type1rect=Rect.new(0, type1_number * 28, 64, 28)
+      type_rect = Rect.new(0, type_number * 28, 64, 28)
-    type2rect=Rect.new(0, type2_number * 28, 64, 28)
+      type_x = (@pokemon.types.length == 1) ? 400 : 366 + 70 * i
-    if @pokemon.type1==@pokemon.type2
+      overlay.blt(type_x, 70, @typebitmap.bitmap, type_rect)
-      overlay.blt(400,70,@typebitmap.bitmap,type1rect)
-    else
-      overlay.blt(366,70,@typebitmap.bitmap,type1rect)
-      overlay.blt(436,70,@typebitmap.bitmap,type2rect)
     end
     textpos=[
        [_INTL("Teach which move?"),16,2,0,Color.new(88,88,80),Color.new(168,184,184)]

Data/Scripts/016_UI/022_UI_PurifyChamber.rb

@@ -147,7 +147,7 @@ class PurifyChamberSet
   end
 
   def self.isSuperEffective(p1,p2)
-    return (typeAdvantage(p1.type1,p2.type1) || typeAdvantage(p1.type1,p2.type2))
+    return (typeAdvantage(p1.types[0], p2.types[0]) || typeAdvantage(p1.types[0], p2.types[1]))
   end
 end
 
@@ -272,7 +272,7 @@ class PurifyChamber
   end
 
   def debugAdd(set,shadow,type1,type2=nil)
-    pkmn=PseudoPokemon.new(shadow,type1,type2||type1)
+    pkmn = PseudoPokemon.new(shadow, type1, type2 || type1)
     if pkmn.shadowPokemon?
       self.setShadow(set,pkmn)
     else
@@ -946,13 +946,15 @@ class PurifyChamberSetView < SpriteWrapper
     pbSetSmallFont(@info.bitmap)
     textpos=[]
     if pkmn
-      if pkmn.type1==pkmn.type2
+      if pkmn.types.length == 1
-        textpos.push([_INTL("{1}  Lv.{2}  {3}",pkmn.name,pkmn.level,GameData::Type.get(pkmn.type1).name),2,-6,0,
+        textpos.push([_INTL("{1}  Lv.{2}  {3}", pkmn.name, pkmn.level,
-           Color.new(248,248,248),Color.new(128,128,128)])
+           GameData::Type.get(pkmn.types[0]).name),
+           2, -6, 0, Color.new(248, 248, 248), Color.new(128, 128, 128)])
       else
-        textpos.push([_INTL("{1}  Lv.{2}  {3}/{4}",pkmn.name,pkmn.level,GameData::Type.get(pkmn.type1).name,
+        textpos.push([_INTL("{1}  Lv.{2}  {3}/{4}", pkmn.name, pkmn.level,
-           GameData::Type.get(pkmn.type2).name),2,-6,0,
+           GameData::Type.get(pkmn.types[0]).name,
-           Color.new(248,248,248),Color.new(128,128,128)])
+           GameData::Type.get(pkmn.types[1]).name),
+           2, -6, 0, Color.new(248, 248, 248), Color.new(128, 128, 128)])
       end
       textpos.push([_INTL("FLOW"),2+@info.bitmap.width/2,18,0,
          Color.new(248,248,248),Color.new(128,128,128)])

Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb

@@ -21,8 +21,8 @@ class TriadCard
     spAtk   = baseStats[:SPECIAL_ATTACK]
     spDef   = baseStats[:SPECIAL_DEFENSE]
     speed   = baseStats[:SPEED]
-    @type  = species_data.type1
+    @type  = species_data.types[0]
-    @type  = species_data.type2 if @type == :NORMAL && species_data.type2
+    @type  = species_data.types[1] if @type == :NORMAL && species_data.types[1]
     @west  = baseStatToValue(attack + speed / 3)
     @east  = baseStatToValue(defense + hp / 3)
     @north = baseStatToValue(spAtk + speed / 3)

Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/002_ChallengeGenerator_Pokemon.rb

@@ -344,9 +344,8 @@ def pbRandomPokemonFromRule(rules, trainer)
       item = :LEFTOVERS
     end
     if item == :BLACKSLUDGE
-      type1 = GameData::Species.get(species).type1
+      types = GameData::Species.get(species).types
-      type2 = GameData::Species.get(species).type2 || type1
+      item = :LEFTOVERS if !types.include?(:POISON)
-      item = :LEFTOVERS if type1 != :POISON && type2 != :POISON
     end
     if item == :HEATROCK && !moves.any? { |m| m == :SUNNYDAY }
       item = :LEFTOVERS

Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/003_ChallengeGenerator_Trainers.rb

@@ -3,9 +3,7 @@
 #===============================================================================
 def getTypes(species)
   species_data = GameData::Species.get(species)
-  type1 = species_data.type1
+  return species_data.types.clone
-  type2 = species_data.type2
-  return (type1 == type2) ? [type1] : [type1, type2]
 end
 
 #===============================================================================

Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/004_ChallengeGenerator_BattleSim.rb

@@ -333,8 +333,8 @@ def pbDecideWinnerScore(party0, party1, rating)
   types2 = []
   abilities = []
   for j in 0...party1.length
-    types1.push(party1[j].type1)
+    types1.push(party1[j].types[0])
-    types2.push(party1[j].type2)
+    types2.push(party1[j].types[1] || party1[j].types[0])
     abilities.push(party1[j].ability_id)
   end
   for i in 0...party0.length

Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb

@@ -1001,8 +1001,8 @@ def pbPokemonEditor
      [_INTL("FormName"),          StringProperty,                     _INTL("Name of this form of the Pokémon.")],
      [_INTL("Category"),          StringProperty,                     _INTL("Kind of Pokémon species.")],
      [_INTL("Pokédex"),           StringProperty,                     _INTL("Description of the Pokémon as displayed in the Pokédex.")],
-     [_INTL("Type1"),             TypeProperty,                       _INTL("Pokémon's type. If same as Type2, this Pokémon has a single type.")],
+     [_INTL("Type 1"),            TypeProperty,                       _INTL("Pokémon's type. If same as Type 2, this Pokémon has a single type.")],
-     [_INTL("Type2"),             TypeProperty,                       _INTL("Pokémon's type. If same as Type1, this Pokémon has a single type.")],
+     [_INTL("Type 2"),            TypeProperty,                       _INTL("Pokémon's type. If same as Type 1, this Pokémon has a single type.")],
      [_INTL("BaseStats"),         BaseStatsProperty,                  _INTL("Base stats of the Pokémon.")],
      [_INTL("EVs"),               EffortValuesProperty,               _INTL("Effort Value points earned when this species is defeated.")],
      [_INTL("BaseExp"),           LimitProperty.new(9999),            _INTL("Base experience earned when this species is defeated.")],
@@ -1062,8 +1062,8 @@ def pbPokemonEditor
             spec.real_form_name,
             spec.real_category,
             spec.real_pokedex_entry,
-            spec.type1,
+            spec.types[0],
-            (spec.type2 == spec.type1) ? nil : spec.type2,
+            spec.types[1],
             spec.base_stats,
             spec.evs,
             spec.base_exp,
@@ -1100,10 +1100,10 @@ def pbPokemonEditor
           # Edit the properties
           if pbPropertyList(spec.id.to_s, data, species_properties, true)
             # Sanitise data
-            data[5] = data[6] if !data[5]                    # Type1
+            types = [data[5], data[6]].uniq.compact          # Types
-            data[6] = data[5] if !data[6]                    # Type2
+            types = nil if types.empty?
             egg_groups = [data[26], data[27]].uniq.compact   # Egg groups
-            egg_groups.push(:Undiscovered) if egg_groups.length == 0
+            egg_groups = nil if egg_groups.empty?
             abilities = [data[17], data[18]].uniq.compact    # Abilities
             hidden_abilities = [data[19], data[20], data[21], data[22]].uniq.compact   # Hidden abilities
             # Construct species hash
@@ -1113,8 +1113,7 @@ def pbPokemonEditor
               :form_name             => data[2],
               :category              => data[3],
               :pokedex_entry         => data[4],
-              :type1                 => data[5],
+              :types                 => types,              # 5, 6
-              :type2                 => data[6],
               :base_stats            => data[7],
               :evs                   => data[8],
               :base_exp              => data[9],

Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb

@@ -604,14 +604,16 @@ module Compiler
           end
         end
         # Construct species hash
+        types = contents["Types"] || [contents["Type1"], contents["Type2"]]
+        types = [types] if !types.is_a?(Array)
+        types = types.uniq.compact
         species_hash = {
           :id                    => contents["InternalName"].to_sym,
           :name                  => contents["Name"],
           :form_name             => contents["FormName"],
           :category              => contents["Category"] || contents["Kind"],
           :pokedex_entry         => contents["Pokedex"],
-          :type1                 => contents["Type1"],
+          :types                 => types,
-          :type2                 => contents["Type2"],
           :base_stats            => contents["BaseStats"],
           :evs                   => contents["EVs"] || contents["EffortPoints"],
           :base_exp              => contents["BaseExp"] || contents["BaseEXP"],
@@ -791,6 +793,11 @@ module Compiler
         end
         # Construct species hash
         form_symbol = sprintf("%s_%d", species_symbol.to_s, form).to_sym
+        types = contents["Types"]
+        types ||= [contents["Type1"], contents["Type2"]] if contents["Type1"]
+        types ||= base_data.types.clone
+        types = [types] if !types.is_a?(Array)
+        types = types.uniq.compact
         moves = contents["Moves"]
         if !moves
           moves = []
@@ -810,8 +817,7 @@ module Compiler
           :category              => contents["Category"] || contents["Kind"] || base_data.real_category,
           :pokedex_entry         => contents["Pokedex"] || base_data.real_pokedex_entry,
           :pokedex_form          => contents["PokedexForm"],
-          :type1                 => contents["Type1"] || base_data.type1,
+          :types                 => types,
-          :type2                 => contents["Type2"] || base_data.type2,
           :base_stats            => contents["BaseStats"] || base_data.base_stats,
           :evs                   => contents["EVs"] || contents["EffortPoints"] || base_data.evs,
           :base_exp              => contents["BaseExp"] || contents["BaseEXP"] || base_data.base_exp,
@@ -844,8 +850,6 @@ module Compiler
           :unmega_form           => contents["UnmegaForm"],
           :mega_message          => contents["MegaMessage"]
         }
-        # If form is single-typed, ensure it remains so if base species is dual-typed
-        species_hash[:type2] = contents["Type1"] if contents["Type1"] && !contents["Type2"]
         # If form has any wild items, ensure none are inherited from base species
         if (contents["WildItemCommon"] && !contents["WildItemCommon"].empty?) ||
            (contents["WildItemUncommon"] && !contents["WildItemUncommon"].empty?) ||

Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb

@@ -280,8 +280,7 @@ module Compiler
         f.write("\#-------------------------------\r\n")
         f.write(sprintf("[%s]\r\n", species.id))
         f.write(sprintf("Name = %s\r\n", species.real_name))
-        f.write(sprintf("Type1 = %s\r\n", species.type1))
+        f.write(sprintf("Types = %s\r\n", species.types.uniq.compact.join(",")))
-        f.write(sprintf("Type2 = %s\r\n", species.type2)) if species.type2 != species.type1
         stats_array = []
         evs_array = []
         GameData::Stat.each_main do |s|
@@ -379,9 +378,8 @@ module Compiler
         f.write(sprintf("MegaMove = %s\r\n", species.mega_move)) if species.mega_move
         f.write(sprintf("UnmegaForm = %d\r\n", species.unmega_form)) if species.unmega_form != 0
         f.write(sprintf("MegaMessage = %d\r\n", species.mega_message)) if species.mega_message != 0
-        if species.type1 != base_species.type1 || species.type2 != base_species.type2
+        if species.types.uniq.compact != base_species.types.uniq.compact
-          f.write(sprintf("Type1 = %s\r\n", species.type1))
+          f.write(sprintf("Types = %s\r\n", species.types.uniq.compact.join(",")))
-          f.write(sprintf("Type2 = %s\r\n", species.type2)) if species.type2 != species.type1
         end
         stats_array = []
         evs_array = []

PBS/Gen 5/pokemon_forms.txt

@@ -90,17 +90,17 @@ Generation = 3
 #-------------------------------
 [CASTFORM,1]
 FormName = Sunny Form
-Type1 = FIRE
+Types = FIRE
 Color = Red
 #-------------------------------
 [CASTFORM,2]
 FormName = Rainy Form
-Type1 = WATER
+Types = WATER
 Color = Blue
 #-------------------------------
 [CASTFORM,3]
 FormName = Snowy Form
-Type1 = ICE
+Types = ICE
 Color = White
 #-------------------------------
 [DEOXYS,1]
@@ -132,8 +132,7 @@ FormName = Trash Cloak
 #-------------------------------
 [WORMADAM,1]
 FormName = Sandy Cloak
-Type1 = BUG
+Types = BUG,GROUND
-Type2 = GROUND
 BaseStats = 60,79,105,36,59,85
 EVs = 0,0,2,0,0,0
 Moves = 1,TACKLE,10,PROTECT,15,BUGBITE,20,HIDDENPOWER,23,CONFUSION,26,ROCKBLAST,29,HARDEN,32,PSYBEAM,35,CAPTIVATE,38,FLAIL,41,ATTRACT,44,PSYCHIC,47,FISSURE
@@ -142,8 +141,7 @@ Color = Brown
 #-------------------------------
 [WORMADAM,2]
 FormName = Trash Cloak
-Type1 = BUG
+Types = BUG,STEEL
-Type2 = STEEL
 BaseStats = 60,69,95,36,69,95
 EVs = 0,0,1,0,0,1
 Moves = 1,TACKLE,10,PROTECT,15,BUGBITE,20,HIDDENPOWER,23,CONFUSION,26,MIRRORSHOT,29,METALSOUND,32,PSYBEAM,35,CAPTIVATE,38,FLAIL,41,ATTRACT,44,PSYCHIC,47,IRONHEAD
@@ -164,28 +162,23 @@ Color = Blue
 #-------------------------------
 [ROTOM,1]
 FormName = Heat Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,FIRE
-Type2 = FIRE
 #-------------------------------
 [ROTOM,2]
 FormName = Wash Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,WATER
-Type2 = WATER
 #-------------------------------
 [ROTOM,3]
 FormName = Frost Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,ICE
-Type2 = ICE
 #-------------------------------
 [ROTOM,4]
 FormName = Fan Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,FLYING
-Type2 = FLYING
 #-------------------------------
 [ROTOM,5]
 FormName = Mow Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,GRASS
-Type2 = GRASS
 #-------------------------------
 [GIRATINA,1]
 FormName = Origin Forme
@@ -199,8 +192,7 @@ Shape = Serpentine
 #-------------------------------
 [SHAYMIN,1]
 FormName = Sky Forme
-Type1 = GRASS
+Types = GRASS,FLYING
-Type2 = FLYING
 BaseStats = 100,103,75,127,120,75
 EVs = 0,0,0,3,0,0
 Abilities = SERENEGRACE
@@ -211,72 +203,72 @@ Weight = 5.2
 #-------------------------------
 [ARCEUS,1]
 FormName = Fighting Type
-Type1 = FIGHTING
+Types = FIGHTING
 #-------------------------------
 [ARCEUS,2]
 FormName = Flying Type
-Type1 = FLYING
+Types = FLYING
 #-------------------------------
 [ARCEUS,3]
 FormName = Poison Type
-Type1 = POISON
+Types = POISON
 #-------------------------------
 [ARCEUS,4]
 FormName = Ground Type
-Type1 = GROUND
+Types = GROUND
 #-------------------------------
 [ARCEUS,5]
 FormName = Rock Type
-Type1 = ROCK
+Types = ROCK
 #-------------------------------
 [ARCEUS,6]
 FormName = Bug Type
-Type1 = BUG
+Types = BUG
 #-------------------------------
 [ARCEUS,7]
 FormName = Ghost Type
-Type1 = GHOST
+Types = GHOST
 #-------------------------------
 [ARCEUS,8]
 FormName = Steel Type
-Type1 = STEEL
+Types = STEEL
 #-------------------------------
 [ARCEUS,9]
 FormName = Unknown Type
-Type1 = QMARKS
+Types = QMARKS
 #-------------------------------
 [ARCEUS,10]
 FormName = Fire Type
-Type1 = FIRE
+Types = FIRE
 #-------------------------------
 [ARCEUS,11]
 FormName = Water Type
-Type1 = WATER
+Types = WATER
 #-------------------------------
 [ARCEUS,12]
 FormName = Grass Type
-Type1 = GRASS
+Types = GRASS
 #-------------------------------
 [ARCEUS,13]
 FormName = Electric Type
-Type1 = ELECTRIC
+Types = ELECTRIC
 #-------------------------------
 [ARCEUS,14]
 FormName = Psychic Type
-Type1 = PSYCHIC
+Types = PSYCHIC
 #-------------------------------
 [ARCEUS,15]
 FormName = Ice Type
-Type1 = ICE
+Types = ICE
 #-------------------------------
 [ARCEUS,16]
 FormName = Dragon Type
-Type1 = DRAGON
+Types = DRAGON
 TutorMoves = AERIALACE,ANCIENTPOWER,AQUATAIL,BLIZZARD,BRICKBREAK,BULLDOZE,CALMMIND,CHARGEBEAM,CUT,DARKPULSE,DOUBLETEAM,DRACOMETEOR,DRAGONCLAW,DRAGONPULSE,DREAMEATER,EARTHPOWER,EARTHQUAKE,ECHOEDVOICE,ENERGYBALL,FACADE,FIREBLAST,FLAMETHROWER,FLASH,FLASHCANNON,FLY,FOCUSBLAST,FRUSTRATION,FURYCUTTER,GIGADRAIN,GIGAIMPACT,GRASSKNOT,GRAVITY,HAIL,HEADBUTT,HEATWAVE,HIDDENPOWER,HONECLAWS,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,INCINERATE,IRONDEFENSE,IRONHEAD,IRONTAIL,LASTRESORT,LIGHTSCREEN,MAGICCOAT,MUDSLAP,OMINOUSWIND,OUTRAGE,OVERHEAT,PAYBACK,POISONJAB,PROTECT,PSYCHIC,PSYCHUP,PSYSHOCK,QUASH,RAINDANCE,RECYCLE,REFLECT,REST,RETALIATE,RETURN,ROAR,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROLEPLAY,ROUND,SAFEGUARD,SANDSTORM,SHADOWBALL,SHADOWCLAW,SIGNALBEAM,SLEEPTALK,SLUDGEBOMB,SNARL,SNORE,SOLARBEAM,STEALTHROCK,STONEEDGE,STRENGTH,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWIFT,SWORDSDANCE,TAILWIND,TELEKINESIS,THUNDER,THUNDERBOLT,THUNDERWAVE,TOXIC,TRICK,TRICKROOM,TWISTER,WATERFALL,WILLOWISP,WORKUP,XSCISSOR,ZENHEADBUTT
 #-------------------------------
 [ARCEUS,17]
 FormName = Dark Type
-Type1 = DARK
+Types = DARK
 #-------------------------------
 [BASCULIN,1]
 FormName = Blue-Striped
@@ -285,8 +277,7 @@ WildItemUncommon = DEEPSEASCALE
 #-------------------------------
 [DARMANITAN,1]
 FormName = Zen Mode
-Type1 = FIRE
+Types = FIRE,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 105,30,105,55,140,105
 EVs = 0,0,0,0,2,0
 Color = Blue
@@ -374,8 +365,7 @@ TutorMoves = AERIALACE,AQUATAIL,BOUNCE,CALMMIND,COVET,CUT,DOUBLETEAM,ENDEAVOR,FA
 #-------------------------------
 [MELOETTA,1]
 FormName = Pirouette Forme
-Type1 = NORMAL
+Types = NORMAL,FIGHTING
-Type2 = FIGHTING
 BaseStats = 100,128,90,128,77,77
 EVs = 0,1,1,1,0,0
 #-------------------------------

PBS/Gen 7/pokemon_forms.txt

@@ -15,8 +15,7 @@ Generation = 6
 [CHARIZARD,1]
 FormName = Mega Charizard X
 MegaStone = CHARIZARDITEX
-Type1 = FIRE
+Types = FIRE,DRAGON
-Type2 = DRAGON
 BaseStats = 78,130,111,100,130,85
 BaseExp = 285
 Abilities = TOUGHCLAWS
@@ -74,8 +73,7 @@ Generation = 6
 #-------------------------------
 [RATTATA,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK,NORMAL
-Type2 = NORMAL
 Abilities = GLUTTONY,HUSTLE
 HiddenAbilities = THICKFAT
 TutorMoves = ATTRACT,BLIZZARD,CONFIDE,COVET,DARKPULSE,DOUBLETEAM,EMBARGO,ENDEAVOR,FACADE,FRUSTRATION,GRASSKNOT,HIDDENPOWER,ICEBEAM,ICYWIND,IRONTAIL,LASTRESORT,PROTECT,QUASH,RAINDANCE,REST,RETURN,ROUND,SHADOWBALL,SHADOWCLAW,SHOCKWAVE,SLEEPTALK,SLUDGEBOMB,SNARL,SNATCH,SNORE,SUBSTITUTE,SUNNYDAY,SUPERFANG,SWAGGER,TAUNT,THIEF,TORMENT,TOXIC,UPROAR,UTURN,ZENHEADBUTT
@@ -90,8 +88,7 @@ Evolutions = RATICATE,LevelNight,20
 #-------------------------------
 [RATICATE,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK,NORMAL
-Type2 = NORMAL
 BaseStats = 75,71,70,77,40,80
 Abilities = GLUTTONY,HUSTLE
 HiddenAbilities = THICKFAT
@@ -105,8 +102,7 @@ WildItemUncommon = PECHABERRY
 #-------------------------------
 [RAICHU,1]
 FormName = Alolan
-Type1 = ELECTRIC
+Types = ELECTRIC,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 60,85,50,110,95,85
 Abilities = SURGESURFER
 HiddenAbilities = SURGESURFER
@@ -120,8 +116,7 @@ Generation = 7
 #-------------------------------
 [SANDSHREW,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE,STEEL
-Type2 = STEEL
 BaseStats = 50,75,90,40,10,35
 Abilities = SNOWCLOAK
 HiddenAbilities = SLUSHRUSH
@@ -138,8 +133,7 @@ Evolutions = SANDSLASH,Item,ICESTONE
 #-------------------------------
 [SANDSLASH,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE,STEEL
-Type2 = STEEL
 BaseStats = 75,100,120,65,25,65
 Abilities = SNOWCLOAK
 HiddenAbilities = SLUSHRUSH
@@ -154,7 +148,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [VULPIX,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE
 Abilities = SNOWCLOAK
 HiddenAbilities = SNOWWARNING
 Moves = 1,POWDERSNOW,4,TAILWHIP,7,ROAR,9,BABYDOLLEYES,10,ICESHARD,12,CONFUSERAY,15,ICYWIND,18,PAYBACK,20,MIST,23,FEINTATTACK,26,HEX,28,AURORABEAM,31,EXTRASENSORY,34,SAFEGUARD,36,ICEBEAM,39,IMPRISON,42,BLIZZARD,44,GRUDGE,47,CAPTIVATE,50,SHEERCOLD
@@ -169,8 +163,7 @@ Evolutions = NINETALES,Item,ICESTONE
 #-------------------------------
 [NINETALES,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE,FAIRY
-Type2 = FAIRY
 BaseStats = 73,67,75,109,81,100
 EVs = 0,0,0,2,0,0
 Abilities = SNOWCLOAK
@@ -185,8 +178,7 @@ WildItemUncommon = SNOWBALL
 #-------------------------------
 [DIGLETT,1]
 FormName = Alolan
-Type1 = GROUND
+Types = GROUND,STEEL
-Type2 = STEEL
 BaseStats = 10,55,30,90,35,45
 Abilities = SANDVEIL,TANGLINGHAIR
 Moves = 1,SANDATTACK,1,METALCLAW,4,GROWL,7,ASTONISH,10,MUDSLAP,14,MAGNITUDE,18,BULLDOZE,22,SUCKERPUNCH,25,MUDBOMB,28,EARTHPOWER,31,DIG,35,IRONHEAD,39,EARTHQUAKE,43,FISSURE
@@ -199,8 +191,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [DUGTRIO,1]
 FormName = Alolan
-Type1 = GROUND
+Types = GROUND,STEEL
-Type2 = STEEL
 BaseStats = 35,100,60,110,50,70
 EVs = 0,2,0,0,0,0
 Abilities = SANDVEIL,TANGLINGHAIR
@@ -213,7 +204,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [MEOWTH,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK
 BaseStats = 40,35,35,90,50,40
 HiddenAbilities = RATTLED
 Moves = 1,SCRATCH,1,GROWL,6,BITE,9,FAKEOUT,14,FURYSWIPES,17,SCREECH,22,FEINTATTACK,25,TAUNT,30,PAYDAY,33,SLASH,38,NASTYPLOT,41,ASSURANCE,46,CAPTIVATE,49,NIGHTSLASH,50,FEINT,55,DARKPULSE
@@ -227,7 +218,7 @@ Evolutions = PERSIAN,Happiness,
 #-------------------------------
 [PERSIAN,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK
 BaseStats = 65,60,60,115,75,65
 Abilities = FURCOAT,TECHNICIAN
 HiddenAbilities = RATTLED
@@ -253,8 +244,7 @@ Generation = 6
 #-------------------------------
 [GEODUDE,1]
 FormName = Alolan
-Type1 = ROCK
+Types = ROCK,ELECTRIC
-Type2 = ELECTRIC
 Abilities = MAGNETPULL,STURDY
 HiddenAbilities = GALVANIZE
 Moves = 1,TACKLE,1,DEFENSECURL,4,CHARGE,6,ROCKPOLISH,10,ROLLOUT,12,SPARK,16,ROCKTHROW,18,SMACKDOWN,22,THUNDERPUNCH,24,SELFDESTRUCT,28,STEALTHROCK,30,ROCKBLAST,34,DISCHARGE,36,EXPLOSION,40,DOUBLEEDGE,42,STONEEDGE
@@ -269,8 +259,7 @@ WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GRAVELER,1]
 FormName = Alolan
-Type1 = ROCK
+Types = ROCK,ELECTRIC
-Type2 = ELECTRIC
 Abilities = MAGNETPULL,STURDY
 HiddenAbilities = GALVANIZE
 Moves = 1,TACKLE,1,DEFENSECURL,1,CHARGE,1,ROCKPOLISH,4,CHARGE,6,ROCKPOLISH,10,ROLLOUT,12,SPARK,16,ROCKTHROW,18,SMACKDOWN,22,THUNDERPUNCH,24,SELFDESTRUCT,30,STEALTHROCK,34,ROCKBLAST,40,DISCHARGE,44,EXPLOSION,50,DOUBLEEDGE,54,STONEEDGE
@@ -284,8 +273,7 @@ WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GOLEM,1]
 FormName = Alolan
-Type1 = ROCK
+Types = ROCK,ELECTRIC
-Type2 = ELECTRIC
 Abilities = MAGNETPULL,STURDY
 HiddenAbilities = GALVANIZE
 Moves = 1,HEAVYSLAM,1,TACKLE,1,DEFENSECURL,1,CHARGE,1,ROCKPOLISH,4,CHARGE,6,ROCKPOLISH,10,STEAMROLLER,12,SPARK,16,ROCKTHROW,18,SMACKDOWN,22,THUNDERPUNCH,24,SELFDESTRUCT,30,STEALTHROCK,34,ROCKBLAST,40,DISCHARGE,44,EXPLOSION,50,DOUBLEEDGE,54,STONEEDGE,60,HEAVYSLAM
@@ -313,8 +301,7 @@ Generation = 6
 #-------------------------------
 [GRIMER,1]
 FormName = Alolan
-Type1 = POISON
+Types = POISON,DARK
-Type2 = DARK
 Abilities = POISONTOUCH,GLUTTONY
 HiddenAbilities = POWEROFALCHEMY
 Moves = 1,POUND,1,POISONGAS,4,HARDEN,7,BITE,12,DISABLE,15,ACIDSPRAY,18,POISONFANG,21,MINIMIZE,26,FLING,29,KNOCKOFF,32,CRUNCH,37,SCREECH,40,GUNKSHOT,43,ACIDARMOR,46,BELCH,48,MEMENTO
@@ -329,8 +316,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [MUK,1]
 FormName = Alolan
-Type1 = POISON
+Types = POISON,DARK
-Type2 = DARK
 Abilities = POISONTOUCH,GLUTTONY
 HiddenAbilities = POWEROFALCHEMY
 Moves = 0,VENOMDRENCH,1,VENOMDRENCH,1,POUND,1,POISONGAS,1,HARDEN,1,BITE,4,HARDEN,7,BITE,12,DISABLE,15,ACIDSPRAY,18,POISONFANG,21,MINIMIZE,26,FLING,29,KNOCKOFF,32,CRUNCH,37,SCREECH,40,GUNKSHOT,46,ACIDARMOR,52,BELCH,57,MEMENTO
@@ -355,8 +341,7 @@ Generation = 6
 #-------------------------------
 [EXEGGUTOR,1]
 FormName = Alolan
-Type1 = GRASS
+Types = GRASS,DRAGON
-Type2 = DRAGON
 BaseStats = 95,105,85,45,125,75
 Abilities = FRISK
 Moves = 0,DRAGONHAMMER,1,DRAGONHAMMER,1,SEEDBOMB,1,BARRAGE,1,HYPNOSIS,1,CONFUSION,17,PSYSHOCK,27,EGGBOMB,37,WOODHAMMER,47,LEAFSTORM
@@ -372,8 +357,7 @@ Evolutions = MAROWAK,LevelNight,28
 #-------------------------------
 [MAROWAK,1]
 FormName = Alolan
-Type1 = FIRE
+Types = FIRE,GHOST
-Type2 = GHOST
 Abilities = CURSEDBODY,LIGHTNINGROD
 HiddenAbilities = ROCKHEAD
 Moves = 1,GROWL,1,TAILWHIP,1,BONECLUB,1,FLAMEWHEEL,3,TAILWHIP,7,BONECLUB,11,FLAMEWHEEL,13,LEER,17,HEX,21,BONEMERANG,23,WILLOWISP,27,SHADOWBONE,33,THRASH,37,FLING,43,STOMPINGTANTRUM,49,ENDEAVOR,53,FLAREBLITZ,59,RETALIATE,65,BONERUSH
@@ -397,8 +381,7 @@ Generation = 6
 [PINSIR,1]
 FormName = Mega Pinsir
 MegaStone = PINSIRITE
-Type1 = BUG
+Types = BUG,FLYING
-Type2 = FLYING
 BaseStats = 65,155,120,105,65,90
 BaseExp = 210
 Abilities = AERILATE
@@ -412,8 +395,7 @@ Generation = 6
 [GYARADOS,1]
 FormName = Mega Gyarados
 MegaStone = GYARADOSITE
-Type1 = WATER
+Types = WATER,DARK
-Type2 = DARK
 BaseStats = 95,155,109,81,70,130
 BaseExp = 224
 Abilities = MOLDBREAKER
@@ -437,8 +419,7 @@ Generation = 6
 [MEWTWO,1]
 FormName = Mega Mewtwo X
 MegaStone = MEWTWONITEX
-Type1 = PSYCHIC
+Types = PSYCHIC,FIGHTING
-Type2 = FIGHTING
 BaseStats = 106,190,100,130,154,100
 BaseExp = 351
 Abilities = STEADFAST
@@ -468,8 +449,7 @@ Evolutions = PIKACHU,None,
 [AMPHAROS,1]
 FormName = Mega Ampharos
 MegaStone = AMPHAROSITE
-Type1 = ELECTRIC
+Types = ELECTRIC,DRAGON
-Type2 = DRAGON
 BaseStats = 90,95,105,45,165,110
 BaseExp = 275
 Abilities = MOLDBREAKER
@@ -621,8 +601,7 @@ Generation = 6
 [SCEPTILE,1]
 FormName = Mega Sceptile
 MegaStone = SCEPTILITE
-Type1 = GRASS
+Types = GRASS,DRAGON
-Type2 = DRAGON
 BaseStats = 70,110,75,145,145,85
 BaseExp = 284
 Abilities = LIGHTNINGROD
@@ -685,7 +664,7 @@ Generation = 6
 [AGGRON,1]
 FormName = Mega Aggron
 MegaStone = AGGRONITE
-Type1 = STEEL
+Types = STEEL
 BaseStats = 70,140,230,50,60,80
 BaseExp = 284
 Abilities = FILTER
@@ -740,8 +719,7 @@ Generation = 6
 [ALTARIA,1]
 FormName = Mega Altaria
 MegaStone = ALTARIANITE
-Type1 = DRAGON
+Types = DRAGON,FAIRY
-Type2 = FAIRY
 BaseStats = 75,110,110,80,110,105
 BaseExp = 207
 Abilities = PIXILATE
@@ -751,19 +729,19 @@ Generation = 6
 #-------------------------------
 [CASTFORM,1]
 FormName = Sunny Form
-Type1 = FIRE
+Types = FIRE
 Color = Red
 Pokedex = This is the form Castform takes on the brightest of days. Its skin is unexpectedly hot to the touch, so approach with care.
 #-------------------------------
 [CASTFORM,2]
 FormName = Rainy Form
-Type1 = WATER
+Types = WATER
 Color = Blue
 Pokedex = This is the form Castform takes when soaked with rain. When its body is compressed, water will seep out as if from a sponge.
 #-------------------------------
 [CASTFORM,3]
 FormName = Snowy Form
-Type1 = ICE
+Types = ICE
 Color = White
 Pokedex = This is the form Castform takes when covered in snow. Its body becomes an ice-like material, with a temperature near -5 degrees Celsius.
 #-------------------------------
@@ -857,8 +835,7 @@ Generation = 6
 #-------------------------------
 [GROUDON,1]
 FormName = Primal Groudon
-Type1 = GROUND
+Types = GROUND,FIRE
-Type2 = FIRE
 BaseStats = 100,180,160,90,150,90
 BaseExp = 347
 Abilities = DESOLATELAND
@@ -909,8 +886,7 @@ Color = Red
 #-------------------------------
 [WORMADAM,1]
 FormName = Sandy Cloak
-Type1 = BUG
+Types = BUG,GROUND
-Type2 = GROUND
 BaseStats = 60,79,105,36,59,85
 EVs = 0,0,2,0,0,0
 Moves = 0,QUIVERDANCE,1,QUIVERDANCE,1,SUCKERPUNCH,1,TACKLE,1,PROTECT,1,BUGBITE,10,PROTECT,15,BUGBITE,20,HIDDENPOWER,23,CONFUSION,26,ROCKBLAST,29,HARDEN,32,PSYBEAM,35,CAPTIVATE,38,FLAIL,41,ATTRACT,44,PSYCHIC,47,FISSURE,50,BUGBUZZ
@@ -919,8 +895,7 @@ Color = Brown
 #-------------------------------
 [WORMADAM,2]
 FormName = Trash Cloak
-Type1 = BUG
+Types = BUG,STEEL
-Type2 = STEEL
 BaseStats = 60,69,95,36,69,95
 EVs = 0,0,1,0,0,1
 Moves = 0,QUIVERDANCE,1,QUIVERDANCE,1,METALBURST,1,SUCKERPUNCH,1,TACKLE,1,PROTECT,1,BUGBITE,10,PROTECT,15,BUGBITE,20,HIDDENPOWER,23,CONFUSION,26,MIRRORSHOT,29,METALSOUND,32,PSYBEAM,35,CAPTIVATE,38,FLAIL,41,ATTRACT,44,PSYCHIC,47,IRONHEAD,50,BUGBUZZ
@@ -942,8 +917,7 @@ Color = Blue
 [LOPUNNY,1]
 FormName = Mega Lopunny
 MegaStone = LOPUNNITE
-Type1 = NORMAL
+Types = NORMAL,FIGHTING
-Type2 = FIGHTING
 BaseStats = 65,136,94,135,54,96
 BaseExp = 203
 Abilities = SCRAPPY
@@ -997,40 +971,35 @@ Generation = 6
 #-------------------------------
 [ROTOM,1]
 FormName = Heat Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,FIRE
-Type2 = FIRE
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = This Rotom has possessed a convection microwave oven that uses a special motor. It also has a flair for manipulating flames.
 #-------------------------------
 [ROTOM,2]
 FormName = Wash Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,WATER
-Type2 = WATER
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = This form of Rotom enjoys coming up with water-based pranks. Be careful with it if you don't want your room flooded.
 #-------------------------------
 [ROTOM,3]
 FormName = Frost Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,ICE
-Type2 = ICE
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = Rotom assumes this form when it takes over a refrigerator powered by a special motor. It battles by spewing cold air.
 #-------------------------------
 [ROTOM,4]
 FormName = Fan Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,FLYING
-Type2 = FLYING
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = In this form, Rotom applies its new power over wind to its love of pranks. It will happily blow away any important documents it can find.
 #-------------------------------
 [ROTOM,5]
 FormName = Mow Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,GRASS
-Type2 = GRASS
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = This is Rotom after it's seized control of a lawn mower that has a special motor. As it mows down grass, it scatters the clippings everywhere.
@@ -1047,8 +1016,7 @@ Shape = Serpentine
 #-------------------------------
 [SHAYMIN,1]
 FormName = Sky Forme
-Type1 = GRASS
+Types = GRASS,FLYING
-Type2 = FLYING
 BaseStats = 100,103,75,127,120,75
 EVs = 0,0,0,3,0,0
 Abilities = SERENEGRACE
@@ -1059,83 +1027,82 @@ Weight = 5.2
 #-------------------------------
 [ARCEUS,1]
 FormName = Fighting Type
-Type1 = FIGHTING
+Types = FIGHTING
 #-------------------------------
 [ARCEUS,2]
 FormName = Flying Type
-Type1 = FLYING
+Types = FLYING
 #-------------------------------
 [ARCEUS,3]
 FormName = Poison Type
-Type1 = POISON
+Types = POISON
 #-------------------------------
 [ARCEUS,4]
 FormName = Ground Type
-Type1 = GROUND
+Types = GROUND
 #-------------------------------
 [ARCEUS,5]
 FormName = Rock Type
-Type1 = ROCK
+Types = ROCK
 #-------------------------------
 [ARCEUS,6]
 FormName = Bug Type
-Type1 = BUG
+Types = BUG
 #-------------------------------
 [ARCEUS,7]
 FormName = Ghost Type
-Type1 = GHOST
+Types = GHOST
 #-------------------------------
 [ARCEUS,8]
 FormName = Steel Type
-Type1 = STEEL
+Types = STEEL
 #-------------------------------
 [ARCEUS,9]
 FormName = Unknown Type
-Type1 = QMARKS
+Types = QMARKS
 #-------------------------------
 [ARCEUS,10]
 FormName = Fire Type
-Type1 = FIRE
+Types = FIRE
 #-------------------------------
 [ARCEUS,11]
 FormName = Water Type
-Type1 = WATER
+Types = WATER
 #-------------------------------
 [ARCEUS,12]
 FormName = Grass Type
-Type1 = GRASS
+Types = GRASS
 #-------------------------------
 [ARCEUS,13]
 FormName = Electric Type
-Type1 = ELECTRIC
+Types = ELECTRIC
 #-------------------------------
 [ARCEUS,14]
 FormName = Psychic Type
-Type1 = PSYCHIC
+Types = PSYCHIC
 #-------------------------------
 [ARCEUS,15]
 FormName = Ice Type
-Type1 = ICE
+Types = ICE
 #-------------------------------
 [ARCEUS,16]
 FormName = Dragon Type
-Type1 = DRAGON
+Types = DRAGON
 TutorMoves = AERIALACE,AQUATAIL,BLIZZARD,BRICKBREAK,BULLDOZE,CALMMIND,CHARGEBEAM,CONFIDE,CUT,DARKPULSE,DEFOG,DIVE,DOUBLETEAM,DRACOMETEOR,DRAGONCLAW,DRAGONPULSE,DREAMEATER,EARTHPOWER,EARTHQUAKE,ECHOEDVOICE,ENERGYBALL,FACADE,FIREBLAST,FLAMETHROWER,FLASHCANNON,FLY,FOCUSBLAST,FRUSTRATION,GIGADRAIN,GIGAIMPACT,GRASSKNOT,GRAVITY,HAIL,HEATWAVE,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONDEFENSE,IRONHEAD,IRONTAIL,LASERFOCUS,LASTRESORT,LIGHTSCREEN,LIQUIDATION,MAGICCOAT,OUTRAGE,OVERHEAT,PAYBACK,POISONJAB,PROTECT,PSYCHIC,PSYCHUP,PSYSHOCK,QUASH,RAINDANCE,RECYCLE,REFLECT,REST,RETURN,ROAR,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SHADOWBALL,SHADOWCLAW,SHOCKWAVE,SIGNALBEAM,SLEEPTALK,SLUDGEBOMB,SNARL,SNORE,SOLARBEAM,STEALTHROCK,STONEEDGE,STRENGTH,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWORDSDANCE,TAILWIND,TELEKINESIS,THUNDER,THUNDERBOLT,THUNDERWAVE,TOXIC,TRICK,TRICKROOM,WATERFALL,WATERPULSE,WILLOWISP,WORKUP,XSCISSOR,ZENHEADBUTT
 #-------------------------------
 [ARCEUS,17]
 FormName = Dark Type
-Type1 = DARK
+Types = DARK
 #-------------------------------
 [ARCEUS,18]
 FormName = Fairy Type
-Type1 = FAIRY
+Types = FAIRY
 Generation = 6
 #-------------------------------
 [AUDINO,1]
 FormName = Mega Audino
 MegaStone = AUDINITE
-Type1 = NORMAL
+Types = NORMAL,FAIRY
-Type2 = FAIRY
 BaseStats = 103,60,126,50,80,126
 BaseExp = 425
 Abilities = HEALER
@@ -1153,8 +1120,7 @@ WildItemUncommon = DEEPSEASCALE
 #-------------------------------
 [DARMANITAN,1]
 FormName = Zen Mode
-Type1 = FIRE
+Types = FIRE,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 105,30,105,55,140,105
 BaseExp = 189
 EVs = 0,0,0,0,2,0
@@ -1255,8 +1221,7 @@ Pokedex = The power that lay hidden in its body now covers its horn, turning it
 #-------------------------------
 [MELOETTA,1]
 FormName = Pirouette Forme
-Type1 = NORMAL
+Types = NORMAL,FIGHTING
-Type2 = FIGHTING
 BaseStats = 100,128,90,128,77,77
 EVs = 0,1,1,1,0,0
 #-------------------------------
@@ -1521,8 +1486,7 @@ Weight = 27.8
 #-------------------------------
 [HOOPA,1]
 FormName = Hoopa Unbound
-Type1 = PSYCHIC
+Types = PSYCHIC,DARK
-Type2 = DARK
 BaseStats = 80,160,60,80,170,130
 BaseExp = 306
 Moves = 1,HYPERSPACEFURY,1,TRICK,1,DESTINYBOND,1,ALLYSWITCH,1,CONFUSION,6,ASTONISH,10,MAGICCOAT,15,LIGHTSCREEN,19,PSYBEAM,25,SKILLSWAP,29,POWERSPLIT,29,GUARDSPLIT,46,KNOCKOFF,50,WONDERROOM,50,TRICKROOM,55,DARKPULSE,75,PSYCHIC,85,HYPERSPACEFURY
@@ -1532,22 +1496,19 @@ Shape = BipedalTail
 #-------------------------------
 [ORICORIO,1]
 FormName = Pom-Pom Style
-Type1 = ELECTRIC
+Types = ELECTRIC,FLYING
-Type2 = FLYING
 Color = Yellow
 Pokedex = It creates an electric charge by rubbing its feathers together. It dances over to its enemies and delivers shocking electrical punches.
 #-------------------------------
 [ORICORIO,2]
 FormName = Pa'u Style
-Type1 = PSYCHIC
+Types = PSYCHIC,FLYING
-Type2 = FLYING
 Color = Pink
 Pokedex = This Oricorio relaxes by swaying gently. This increases its psychic energy, which it then fires at its enemies.
 #-------------------------------
 [ORICORIO,3]
 FormName = Sensu Style
-Type1 = GHOST
+Types = GHOST,FLYING
-Type2 = FLYING
 Color = Purple
 Pokedex = It summons the dead with its dreamy dancing. From their malice, it draws power with which to curse its enemies.
 #-------------------------------
@@ -1590,76 +1551,76 @@ Pokedex = Weak Wishiwashi school together to concentrate their power. Their unit
 #-------------------------------
 [SILVALLY,1]
 FormName = Type: Fighting
-Type1 = FIGHTING
+Types = FIGHTING
 #-------------------------------
 [SILVALLY,2]
 FormName = Type: Flying
-Type1 = FLYING
+Types = FLYING
 #-------------------------------
 [SILVALLY,3]
 FormName = Type: Poison
-Type1 = POISON
+Types = POISON
 #-------------------------------
 [SILVALLY,4]
 FormName = Type: Ground
-Type1 = GROUND
+Types = GROUND
 #-------------------------------
 [SILVALLY,5]
 FormName = Type: Rock
-Type1 = ROCK
+Types = ROCK
 #-------------------------------
 [SILVALLY,6]
 FormName = Type: Bug
-Type1 = BUG
+Types = BUG
 #-------------------------------
 [SILVALLY,7]
 FormName = Type: Ghost
-Type1 = GHOST
+Types = GHOST
 #-------------------------------
 [SILVALLY,8]
 FormName = Type: Steel
-Type1 = STEEL
+Types = STEEL
 #-------------------------------
 [SILVALLY,9]
 FormName = Type: Unknown
-Type1 = QMARKS
+Types = QMARKS
 #-------------------------------
 [SILVALLY,10]
 FormName = Type: Fire
-Type1 = FIRE
+Types = FIRE
 #-------------------------------
 [SILVALLY,11]
 FormName = Type: Water
-Type1 = WATER
+Types = WATER
 #-------------------------------
 [SILVALLY,12]
 FormName = Type: Grass
-Type1 = GRASS
+Types = GRASS
 #-------------------------------
 [SILVALLY,13]
 FormName = Type: Electric
-Type1 = ELECTRIC
+Types = ELECTRIC
 #-------------------------------
 [SILVALLY,14]
 FormName = Type: Psychic
-Type1 = PSYCHIC
+Types = PSYCHIC
 #-------------------------------
 [SILVALLY,15]
 FormName = Type: Ice
-Type1 = ICE
+Types = ICE
 #-------------------------------
 [SILVALLY,16]
 FormName = Type: Dragon
-Type1 = DRAGON
+Types = DRAGON
 TutorMoves = AERIALACE,CONFIDE,DEFOG,DOUBLETEAM,DRACOMETEOR,DRAGONCLAW,EXPLOSION,FACADE,FLAMECHARGE,FLAMETHROWER,FLASHCANNON,FRUSTRATION,GIGAIMPACT,GRASSPLEDGE,HAIL,HEATWAVE,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONDEFENSE,IRONHEAD,LASERFOCUS,LASTRESORT,MAGICCOAT,OUTRAGE,PAYBACK,PROTECT,RAINDANCE,REST,RETURN,ROAR,ROCKSLIDE,ROUND,SANDSTORM,SHADOWBALL,SHADOWCLAW,SIGNALBEAM,SLEEPTALK,SNARL,SNORE,STEELWING,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWORDSDANCE,TAILWIND,THUNDERBOLT,THUNDERWAVE,TOXIC,UTURN,WORKUP,XSCISSOR,ZENHEADBUTT
 #-------------------------------
 [SILVALLY,17]
 FormName = Type: Dark
-Type1 = DARK
+Types = DARK
 #-------------------------------
 [SILVALLY,18]
 FormName = Type: Fairy
-Type1 = FAIRY
+Types = FAIRY
 #-------------------------------
 [MINIOR,7]
 FormName = Red Core
@@ -1737,8 +1698,7 @@ Pokedex = Sad that its true identity may be exposed, Mimikyu will mercilessly se
 #-------------------------------
 [NECROZMA,1]
 FormName = Dusk Mane
-Type1 = PSYCHIC
+Types = PSYCHIC,STEEL
-Type2 = STEEL
 BaseStats = 97,157,127,77,113,109
 BaseExp = 306
 EVs = 0,3,0,0,0,0
@@ -1750,8 +1710,7 @@ Pokedex = This is Necrozma's form while it's absorbing the power of Solgaleo, ma
 #-------------------------------
 [NECROZMA,2]
 FormName = Dawn Wings
-Type1 = PSYCHIC
+Types = PSYCHIC,GHOST
-Type2 = GHOST
 BaseStats = 97,113,109,77,157,127
 BaseExp = 306
 EVs = 0,0,0,0,3,0
@@ -1762,8 +1721,7 @@ Pokedex = Lunala no longer has a will of its own. Now under the control of Necro
 #-------------------------------
 [NECROZMA,3]
 FormName = Ultra Necrozma
-Type1 = PSYCHIC
+Types = PSYCHIC,DRAGON
-Type2 = DRAGON
 BaseStats = 97,167,97,129,167,97
 BaseExp = 339
 EVs = 0,1,0,1,1,0
@@ -1774,8 +1732,7 @@ Pokedex = The light pouring out from all over its body affects living things and
 #-------------------------------
 [NECROZMA,4]
 PokedexForm = 3
-Type1 = PSYCHIC
+Types = PSYCHIC,DRAGON
-Type2 = DRAGON
 BaseStats = 97,167,97,129,167,97
 BaseExp = 339
 EVs = 0,1,0,1,1,0

PBS/Gen 8/pokemon_forms.txt

@@ -15,8 +15,7 @@ Generation = 6
 [CHARIZARD,1]
 FormName = Mega Charizard X
 MegaStone = CHARIZARDITEX
-Type1 = FIRE
+Types = FIRE,DRAGON
-Type2 = DRAGON
 BaseStats = 78,130,111,100,130,85
 BaseExp = 317
 Abilities = TOUGHCLAWS
@@ -74,8 +73,7 @@ Generation = 6
 #-------------------------------
 [RATTATA,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK,NORMAL
-Type2 = NORMAL
 Abilities = GLUTTONY,HUSTLE
 HiddenAbilities = THICKFAT
 TutorMoves = ATTRACT,BLIZZARD,CONFIDE,COVET,DARKPULSE,DOUBLETEAM,EMBARGO,ENDEAVOR,FACADE,FRUSTRATION,GRASSKNOT,HIDDENPOWER,ICEBEAM,ICYWIND,IRONTAIL,LASTRESORT,PROTECT,QUASH,RAINDANCE,REST,RETURN,ROUND,SHADOWBALL,SHADOWCLAW,SHOCKWAVE,SLEEPTALK,SLUDGEBOMB,SNARL,SNATCH,SNORE,SUBSTITUTE,SUNNYDAY,SUPERFANG,SWAGGER,TAUNT,THIEF,TORMENT,TOXIC,UPROAR,UTURN,ZENHEADBUTT
@@ -90,8 +88,7 @@ Evolutions = RATICATE,LevelNight,20
 #-------------------------------
 [RATICATE,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK,NORMAL
-Type2 = NORMAL
 BaseStats = 75,71,70,77,40,80
 Abilities = GLUTTONY,HUSTLE
 HiddenAbilities = THICKFAT
@@ -105,8 +102,7 @@ WildItemUncommon = PECHABERRY
 #-------------------------------
 [RAICHU,1]
 FormName = Alolan
-Type1 = ELECTRIC
+Types = ELECTRIC,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 60,85,50,110,95,85
 Abilities = SURGESURFER
 HiddenAbilities = SURGESURFER
@@ -120,8 +116,7 @@ Generation = 7
 #-------------------------------
 [SANDSHREW,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE,STEEL
-Type2 = STEEL
 BaseStats = 50,75,90,40,10,35
 Abilities = SNOWCLOAK
 HiddenAbilities = SLUSHRUSH
@@ -138,8 +133,7 @@ Evolutions = SANDSLASH,Item,ICESTONE
 #-------------------------------
 [SANDSLASH,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE,STEEL
-Type2 = STEEL
 BaseStats = 75,100,120,65,25,65
 Abilities = SNOWCLOAK
 HiddenAbilities = SLUSHRUSH
@@ -154,7 +148,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [VULPIX,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE
 Abilities = SNOWCLOAK
 HiddenAbilities = SNOWWARNING
 Moves = 1,POWDERSNOW,4,TAILWHIP,7,ROAR,9,BABYDOLLEYES,10,ICESHARD,12,CONFUSERAY,15,ICYWIND,18,PAYBACK,20,MIST,23,FEINTATTACK,26,HEX,28,AURORABEAM,31,EXTRASENSORY,34,SAFEGUARD,36,ICEBEAM,39,IMPRISON,42,BLIZZARD,44,GRUDGE,47,CAPTIVATE,50,SHEERCOLD
@@ -169,8 +163,7 @@ Evolutions = NINETALES,Item,ICESTONE
 #-------------------------------
 [NINETALES,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE,FAIRY
-Type2 = FAIRY
 BaseStats = 73,67,75,109,81,100
 EVs = 0,0,0,2,0,0
 Abilities = SNOWCLOAK
@@ -185,8 +178,7 @@ WildItemUncommon = SNOWBALL
 #-------------------------------
 [DIGLETT,1]
 FormName = Alolan
-Type1 = GROUND
+Types = GROUND,STEEL
-Type2 = STEEL
 BaseStats = 10,55,30,90,35,45
 Abilities = SANDVEIL,TANGLINGHAIR
 Moves = 1,SANDATTACK,1,METALCLAW,4,GROWL,7,ASTONISH,10,MUDSLAP,14,MAGNITUDE,18,BULLDOZE,22,SUCKERPUNCH,25,MUDBOMB,28,EARTHPOWER,31,DIG,35,IRONHEAD,39,EARTHQUAKE,43,FISSURE
@@ -199,8 +191,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [DUGTRIO,1]
 FormName = Alolan
-Type1 = GROUND
+Types = GROUND,STEEL
-Type2 = STEEL
 BaseStats = 35,100,60,110,50,70
 EVs = 0,2,0,0,0,0
 Abilities = SANDVEIL,TANGLINGHAIR
@@ -213,7 +204,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [MEOWTH,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK
 BaseStats = 40,35,35,90,50,40
 HiddenAbilities = RATTLED
 Moves = 1,SCRATCH,1,GROWL,6,BITE,9,FAKEOUT,14,FURYSWIPES,17,SCREECH,22,FEINTATTACK,25,TAUNT,30,PAYDAY,33,SLASH,38,NASTYPLOT,41,ASSURANCE,46,CAPTIVATE,49,NIGHTSLASH,50,FEINT,55,DARKPULSE
@@ -227,7 +218,7 @@ Evolutions = PERSIAN,Happiness,
 #-------------------------------
 [MEOWTH,2]
 FormName = Galarian
-Type1 = STEEL
+Types = STEEL
 BaseStats = 50,65,55,40,40,40
 Abilities = PICKUP,TOUGHCLAWS
 Moves = 1,FAKEOUT,1,GROWL,4,HONECLAWS,8,SCRATCH,12,PAYDAY,16,METALCLAW,20,TAUNT,24,SWAGGER,29,FURYSWIPES,32,SCREECH,36,SLASH,40,METALSOUND,44,THRASH
@@ -243,7 +234,7 @@ Evolutions = PERRSERKER,Level,28
 #-------------------------------
 [PERSIAN,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK
 BaseStats = 65,60,60,115,75,65
 Abilities = FURCOAT,TECHNICIAN
 HiddenAbilities = RATTLED
@@ -269,8 +260,7 @@ Generation = 6
 #-------------------------------
 [GEODUDE,1]
 FormName = Alolan
-Type1 = ROCK
+Types = ROCK,ELECTRIC
-Type2 = ELECTRIC
 Abilities = MAGNETPULL,STURDY
 HiddenAbilities = GALVANIZE
 Moves = 1,TACKLE,1,DEFENSECURL,4,CHARGE,6,ROCKPOLISH,10,ROLLOUT,12,SPARK,16,ROCKTHROW,18,SMACKDOWN,22,THUNDERPUNCH,24,SELFDESTRUCT,28,STEALTHROCK,30,ROCKBLAST,34,DISCHARGE,36,EXPLOSION,40,DOUBLEEDGE,42,STONEEDGE
@@ -285,8 +275,7 @@ WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GRAVELER,1]
 FormName = Alolan
-Type1 = ROCK
+Types = ROCK,ELECTRIC
-Type2 = ELECTRIC
 Abilities = MAGNETPULL,STURDY
 HiddenAbilities = GALVANIZE
 Moves = 1,TACKLE,1,DEFENSECURL,1,CHARGE,1,ROCKPOLISH,4,CHARGE,6,ROCKPOLISH,10,ROLLOUT,12,SPARK,16,ROCKTHROW,18,SMACKDOWN,22,THUNDERPUNCH,24,SELFDESTRUCT,30,STEALTHROCK,34,ROCKBLAST,40,DISCHARGE,44,EXPLOSION,50,DOUBLEEDGE,54,STONEEDGE
@@ -300,8 +289,7 @@ WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GOLEM,1]
 FormName = Alolan
-Type1 = ROCK
+Types = ROCK,ELECTRIC
-Type2 = ELECTRIC
 Abilities = MAGNETPULL,STURDY
 HiddenAbilities = GALVANIZE
 Moves = 1,HEAVYSLAM,1,TACKLE,1,DEFENSECURL,1,CHARGE,1,ROCKPOLISH,4,CHARGE,6,ROCKPOLISH,10,STEAMROLLER,12,SPARK,16,ROCKTHROW,18,SMACKDOWN,22,THUNDERPUNCH,24,SELFDESTRUCT,30,STEALTHROCK,34,ROCKBLAST,40,DISCHARGE,44,EXPLOSION,50,DOUBLEEDGE,54,STONEEDGE,60,HEAVYSLAM
@@ -316,7 +304,7 @@ WildItemCommon = CELLBATTERY
 #-------------------------------
 [PONYTA,1]
 FormName = Galarian
-Type1 = PSYCHIC
+Types = PSYCHIC
 Abilities = RUNAWAY,PASTELVEIL
 HiddenAbilities = ANTICIPATION
 Moves = 1,TACKLE,1,GROWL,5,TAILWHIP,10,CONFUSION,15,FAIRYWIND,20,AGILITY,25,PSYBEAM,30,STOMP,35,HEALPULSE,41,TAKEDOWN,45,DAZZLINGGLEAM,50,PSYCHIC,55,HEALINGWISH
@@ -331,8 +319,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [RAPIDASH,1]
 FormName = Galarian
-Type1 = PSYCHIC
+Types = PSYCHIC,FAIRY
-Type2 = FAIRY
 Abilities = RUNAWAY,PASTELVEIL
 HiddenAbilities = ANTICIPATION
 Moves = 0,PSYCHOCUT,1,PSYCHOCUT,1,MEGAHORN,1,TACKLE,1,QUICKATTACK,1,GROWL,1,TAILWHIP,1,CONFUSION,15,FAIRYWIND,20,AGILITY,25,PSYBEAM,30,STOMP,35,HEALPULSE,43,TAKEDOWN,49,DAZZLINGGLEAM,56,PSYCHIC,63,HEALINGWISH
@@ -346,7 +333,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [SLOWPOKE,1]
 FormName = Galarian
-Type1 = PSYCHIC
+Types = PSYCHIC
 Abilities = GLUTTONY,OWNTEMPO
 Moves = 1,TACKLE,1,CURSE,3,GROWL,6,ACID,9,YAWN,12,CONFUSION,15,DISABLE,18,WATERPULSE,21,HEADBUTT,24,ZENHEADBUTT,27,AMNESIA,30,SURF,33,SLACKOFF,36,PSYCHIC,39,PSYCHUP,42,RAINDANCE,45,HEALPULSE
 TutorMoves = AMNESIA,ATTRACT,BLIZZARD,BODYSLAM,BRINE,BULLDOZE,CALMMIND,DIG,DIVE,EARTHQUAKE,ENDURE,EXPANDINGFORCE,FACADE,FIREBLAST,FLAMETHROWER,FOULPLAY,FUTURESIGHT,GRASSKNOT,HAIL,HIDDENPOWER,HYDROPUMP,ICEBEAM,ICYWIND,IMPRISON,IRONTAIL,LIGHTSCREEN,LIQUIDATION,MUDSHOT,PAYDAY,PROTECT,PSYCHIC,PSYCHICTERRAIN,PSYSHOCK,RAINDANCE,REST,ROUND,SAFEGUARD,SCALD,SHADOWBALL,SKILLSWAP,SLEEPTALK,SNORE,STOREDPOWER,SUBSTITUTE,SUNNYDAY,SURF,SWIFT,THUNDERWAVE,TRIATTACK,TRICK,TRICKROOM,WEATHERBALL,WHIRLPOOL,WONDERROOM,ZENHEADBUTT
@@ -357,8 +344,7 @@ Evolutions = SLOWBRO,Item,GALARICACUFF,SLOWKING,Item,GALARICAWREATH
 #-------------------------------
 [SLOWBRO,1]
 FormName = Galarian
-Type1 = POISON
+Types = POISON,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 95,100,95,30,100,70
 Abilities = QUICKDRAW,OWNTEMPO
 Moves = 0,SHELLSIDEARM,1,SHELLSIDEARM,1,WITHDRAW,1,TACKLE,1,CURSE,1,GROWL,1,ACID,9,YAWN,12,CONFUSION,15,DISABLE,18,WATERPULSE,21,HEADBUTT,24,ZENHEADBUTT,27,AMNESIA,30,SURF,33,SLACKOFF,36,PSYCHIC,39,PSYCHUP,42,RAINDANCE,45,HEALPULSE
@@ -383,7 +369,7 @@ Generation = 6
 #-------------------------------
 [FARFETCHD,1]
 FormName = Galarian
-Type1 = FIGHTING
+Types = FIGHTING
 BaseStats = 52,95,55,55,58,62
 Abilities = STEADFAST
 HiddenAbilities = SCRAPPY
@@ -399,8 +385,7 @@ Evolutions = SIRFETCHD,BattleDealCriticalHit,3
 #-------------------------------
 [GRIMER,1]
 FormName = Alolan
-Type1 = POISON
+Types = POISON,DARK
-Type2 = DARK
 Abilities = POISONTOUCH,GLUTTONY
 HiddenAbilities = POWEROFALCHEMY
 Moves = 1,POUND,1,POISONGAS,4,HARDEN,7,BITE,12,DISABLE,15,ACIDSPRAY,18,POISONFANG,21,MINIMIZE,26,FLING,29,KNOCKOFF,32,CRUNCH,37,SCREECH,40,GUNKSHOT,43,ACIDARMOR,46,BELCH,48,MEMENTO
@@ -415,8 +400,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [MUK,1]
 FormName = Alolan
-Type1 = POISON
+Types = POISON,DARK
-Type2 = DARK
 Abilities = POISONTOUCH,GLUTTONY
 HiddenAbilities = POWEROFALCHEMY
 Moves = 0,VENOMDRENCH,1,VENOMDRENCH,1,POUND,1,POISONGAS,1,HARDEN,1,BITE,4,HARDEN,7,BITE,12,DISABLE,15,ACIDSPRAY,18,POISONFANG,21,MINIMIZE,26,FLING,29,KNOCKOFF,32,CRUNCH,37,SCREECH,40,GUNKSHOT,46,ACIDARMOR,52,BELCH,57,MEMENTO
@@ -441,8 +425,7 @@ Generation = 6
 #-------------------------------
 [EXEGGUTOR,1]
 FormName = Alolan
-Type1 = GRASS
+Types = GRASS,DRAGON
-Type2 = DRAGON
 BaseStats = 95,105,85,45,125,75
 Abilities = FRISK
 Moves = 0,DRAGONHAMMER,1,DRAGONHAMMER,1,SEEDBOMB,1,BARRAGE,1,HYPNOSIS,1,CONFUSION,17,PSYSHOCK,27,EGGBOMB,37,WOODHAMMER,47,LEAFSTORM
@@ -458,8 +441,7 @@ Evolutions = MAROWAK,LevelNight,28
 #-------------------------------
 [MAROWAK,1]
 FormName = Alolan
-Type1 = FIRE
+Types = FIRE,GHOST
-Type2 = GHOST
 Abilities = CURSEDBODY,LIGHTNINGROD
 HiddenAbilities = ROCKHEAD
 Moves = 1,GROWL,1,TAILWHIP,1,BONECLUB,1,FLAMEWHEEL,3,TAILWHIP,7,BONECLUB,11,FLAMEWHEEL,13,LEER,17,HEX,21,BONEMERANG,23,WILLOWISP,27,SHADOWBONE,33,THRASH,37,FLING,43,STOMPINGTANTRUM,49,ENDEAVOR,53,FLAREBLITZ,59,RETALIATE,65,BONERUSH
@@ -471,8 +453,7 @@ Generation = 7
 #-------------------------------
 [WEEZING,1]
 FormName = Galarian
-Type1 = POISON
+Types = POISON,FAIRY
-Type2 = FAIRY
 HiddenAbilities = MISTYSURGE
 Moves = 0,DOUBLEHIT,1,DOUBLEHIT,1,STRANGESTEAM,1,DEFOG,1,HEATWAVE,1,SMOG,1,SMOKESCREEN,1,HAZE,1,POISONGAS,1,TACKLE,1,FAIRYWIND,1,AROMATICMIST,12,CLEARSMOG,16,ASSURANCE,20,SLUDGE,24,AROMATHERAPY,28,SELFDESTRUCT,32,SLUDGEBOMB,38,TOXIC,44,BELCH,50,EXPLOSION,56,MEMENTO,62,DESTINYBOND,68,MISTYTERRAIN
 TutorMoves = ASSURANCE,ATTRACT,BRUTALSWING,CORROSIVEGAS,DARKPULSE,DAZZLINGGLEAM,ENDURE,FACADE,FIREBLAST,FLAMETHROWER,GIGAIMPACT,GYROBALL,HEATWAVE,HIDDENPOWER,HYPERBEAM,MISTYEXPLOSION,MISTYTERRAIN,OVERHEAT,PAYBACK,PLAYROUGH,PROTECT,RAINDANCE,REST,ROUND,SCREECH,SELFDESTRUCT,SHADOWBALL,SLEEPTALK,SLUDGEBOMB,SLUDGEWAVE,SNORE,SUBSTITUTE,SUNNYDAY,TAUNT,THIEF,THUNDER,THUNDERBOLT,TOXICSPIKES,UPROAR,VENOMDRENCH,VENOSHOCK,WILLOWISP,WONDERROOM
@@ -496,8 +477,7 @@ Generation = 6
 #-------------------------------
 [MRMIME,1]
 FormName = Galarian
-Type1 = ICE
+Types = ICE,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 50,65,65,100,90,90
 EVs = 0,0,0,2,0,0
 Abilities = VITALSPIRIT,SCREENCLEANER
@@ -516,8 +496,7 @@ Evolutions = MRRIME,Level,42
 [PINSIR,1]
 FormName = Mega Pinsir
 MegaStone = PINSIRITE
-Type1 = BUG
+Types = BUG,FLYING
-Type2 = FLYING
 BaseStats = 65,155,120,105,65,90
 BaseExp = 210
 Abilities = AERILATE
@@ -531,8 +510,7 @@ Generation = 6
 [GYARADOS,1]
 FormName = Mega Gyarados
 MegaStone = GYARADOSITE
-Type1 = WATER
+Types = WATER,DARK
-Type2 = DARK
 BaseStats = 95,155,109,81,70,130
 BaseExp = 224
 Abilities = MOLDBREAKER
@@ -555,8 +533,7 @@ Generation = 6
 #-------------------------------
 [ARTICUNO,1]
 FormName = Galarian
-Type1 = PSYCHIC
+Types = PSYCHIC,FLYING
-Type2 = FLYING
 BaseStats = 90,85,85,95,125,100
 EVs = 0,0,0,0,3,0
 Abilities = COMPETITIVE
@@ -571,8 +548,7 @@ Generation = 8
 #-------------------------------
 [ZAPDOS,1]
 FormName = Galarian
-Type1 = FIGHTING
+Types = FIGHTING,FLYING
-Type2 = FLYING
 BaseStats = 90,125,90,100,85,90
 EVs = 0,3,0,0,0,0
 Abilities = DEFIANT
@@ -586,8 +562,7 @@ Generation = 8
 #-------------------------------
 [MOLTRES,1]
 FormName = Galarian
-Type1 = DARK
+Types = DARK,FLYING
-Type2 = FLYING
 BaseStats = 90,85,90,90,100,125
 EVs = 0,0,0,0,0,3
 Abilities = BERSERK
@@ -603,8 +578,7 @@ Generation = 8
 [MEWTWO,1]
 FormName = Mega Mewtwo X
 MegaStone = MEWTWONITEX
-Type1 = PSYCHIC
+Types = PSYCHIC,FIGHTING
-Type2 = FIGHTING
 BaseStats = 106,190,100,130,154,100
 BaseExp = 390
 Abilities = STEADFAST
@@ -634,8 +608,7 @@ Evolutions = PIKACHU,None,
 [AMPHAROS,1]
 FormName = Mega Ampharos
 MegaStone = AMPHAROSITE
-Type1 = ELECTRIC
+Types = ELECTRIC,DRAGON
-Type2 = DRAGON
 BaseStats = 90,95,105,45,165,110
 BaseExp = 305
 Abilities = MOLDBREAKER
@@ -645,8 +618,7 @@ Generation = 6
 #-------------------------------
 [SLOWKING,1]
 FormName = Galarian
-Type1 = POISON
+Types = POISON,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 95,65,80,30,110,110
 Abilities = CURIOUSMEDICINE,OWNTEMPO
 Moves = 0,EERIESPELL,1,EERIESPELL,1,POWERGEM,1,NASTYPLOT,1,SWAGGER,1,TACKLE,1,CURSE,1,GROWL,1,ACID,9,YAWN,12,CONFUSION,15,DISABLE,18,WATERPULSE,21,HEADBUTT,24,ZENHEADBUTT,27,AMNESIA,30,SURF,33,SLACKOFF,36,PSYCHIC,39,PSYCHUP,42,RAINDANCE,45,HEALPULSE
@@ -777,7 +749,7 @@ Generation = 6
 #-------------------------------
 [CORSOLA,1]
 FormName = Galarian
-Type1 = GHOST
+Types = GHOST
 BaseStats = 60,55,100,30,65,100
 Abilities = WEAKARMOR
 HiddenAbilities = CURSEDBODY
@@ -817,8 +789,7 @@ Generation = 6
 [SCEPTILE,1]
 FormName = Mega Sceptile
 MegaStone = SCEPTILITE
-Type1 = GRASS
+Types = GRASS,DRAGON
-Type2 = DRAGON
 BaseStats = 70,110,75,145,145,85
 BaseExp = 315
 Abilities = LIGHTNINGROD
@@ -848,8 +819,7 @@ Generation = 6
 #-------------------------------
 [ZIGZAGOON,1]
 FormName = Galarian
-Type1 = DARK
+Types = DARK,NORMAL
-Type2 = NORMAL
 Moves = 1,TACKLE,1,LEER,3,SANDATTACK,6,LICK,9,SNARL,12,HEADBUTT,15,BABYDOLLEYES,18,PINMISSILE,21,REST,24,TAKEDOWN,27,SCARYFACE,30,COUNTER,33,TAUNT,36,DOUBLEEDGE
 TutorMoves = ASSURANCE,ATTRACT,BLIZZARD,BODYSLAM,DIG,ENDURE,FACADE,FAKETEARS,FLING,GRASSKNOT,GUNKSHOT,HELPINGHAND,HIDDENPOWER,HYPERVOICE,ICEBEAM,ICYWIND,IRONTAIL,LASHOUT,MUDSHOT,PAYBACK,PINMISSILE,PROTECT,RAINDANCE,REST,RETALIATE,ROUND,SCARYFACE,SCREECH,SEEDBOMB,SHADOWBALL,SLEEPTALK,SNARL,SNORE,SUBSTITUTE,SUNNYDAY,SURF,SWIFT,TAUNT,THIEF,THUNDER,THUNDERBOLT,THUNDERWAVE,TRICK,WHIRLPOOL,WORKUP
 EggMoves = KNOCKOFF,PARTINGSHOT,QUICKGUARD
@@ -860,8 +830,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [LINOONE,1]
 FormName = Galarian
-Type1 = DARK
+Types = DARK,NORMAL
-Type2 = NORMAL
 Moves = 0,NIGHTSLASH,1,NIGHTSLASH,1,SWITCHEROO,1,PINMISSILE,1,BABYDOLLEYES,1,TACKLE,1,LEER,1,SANDATTACK,1,LICK,9,SNARL,12,HEADBUTT,15,HONECLAWS,18,FURYSWIPES,23,REST,28,TAKEDOWN,33,SCARYFACE,38,COUNTER,43,TAUNT,48,DOUBLEEDGE
 TutorMoves = ASSURANCE,ATTRACT,BLIZZARD,BODYPRESS,BODYSLAM,DIG,ENDURE,FACADE,FAKETEARS,FLING,GIGAIMPACT,GRASSKNOT,GUNKSHOT,HELPINGHAND,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONTAIL,LASHOUT,MUDSHOT,PAYBACK,PINMISSILE,PROTECT,RAINDANCE,REST,RETALIATE,ROUND,SCARYFACE,SCREECH,SEEDBOMB,SHADOWBALL,SHADOWCLAW,SLEEPTALK,SNARL,SNORE,STOMPINGTANTRUM,SUBSTITUTE,SUNNYDAY,SURF,SWIFT,TAUNT,THIEF,THROATCHOP,THUNDER,THUNDERBOLT,THUNDERWAVE,TRICK,WHIRLPOOL,WORKUP
 Pokedex = It uses its long tongue to taunt opponents. Once the opposition is enraged, this Pokémon hurls itself at the opponent, tackling them forcefully.
@@ -904,7 +873,7 @@ Generation = 6
 [AGGRON,1]
 FormName = Mega Aggron
 MegaStone = AGGRONITE
-Type1 = STEEL
+Types = STEEL
 BaseStats = 70,140,230,50,60,80
 Abilities = FILTER
 HiddenAbilities = FILTER
@@ -958,8 +927,7 @@ Generation = 6
 [ALTARIA,1]
 FormName = Mega Altaria
 MegaStone = ALTARIANITE
-Type1 = DRAGON
+Types = DRAGON,FAIRY
-Type2 = FAIRY
 BaseStats = 75,110,110,80,110,105
 BaseExp = 207
 Abilities = PIXILATE
@@ -969,19 +937,19 @@ Generation = 6
 #-------------------------------
 [CASTFORM,1]
 FormName = Sunny Form
-Type1 = FIRE
+Types = FIRE
 Color = Red
 Pokedex = This is the form Castform takes on the brightest of days. Its skin is unexpectedly hot to the touch, so approach with care.
 #-------------------------------
 [CASTFORM,2]
 FormName = Rainy Form
-Type1 = WATER
+Types = WATER
 Color = Blue
 Pokedex = This is the form Castform takes when soaked with rain. When its body is compressed, water will seep out as if from a sponge.
 #-------------------------------
 [CASTFORM,3]
 FormName = Snowy Form
-Type1 = ICE
+Types = ICE
 Color = White
 Pokedex = This is the form Castform takes when covered in snow. Its body becomes an ice-like material, with a temperature near -5 degrees Celsius.
 #-------------------------------
@@ -1075,8 +1043,7 @@ Generation = 6
 #-------------------------------
 [GROUDON,1]
 FormName = Primal Groudon
-Type1 = GROUND
+Types = GROUND,FIRE
-Type2 = FIRE
 BaseStats = 100,180,160,90,150,90
 BaseExp = 385
 Abilities = DESOLATELAND
@@ -1127,8 +1094,7 @@ Color = Red
 #-------------------------------
 [WORMADAM,1]
 FormName = Sandy Cloak
-Type1 = BUG
+Types = BUG,GROUND
-Type2 = GROUND
 BaseStats = 60,79,105,36,59,85
 EVs = 0,0,2,0,0,0
 Moves = 0,QUIVERDANCE,1,QUIVERDANCE,1,SUCKERPUNCH,1,TACKLE,1,PROTECT,1,BUGBITE,10,PROTECT,15,BUGBITE,20,HIDDENPOWER,23,CONFUSION,26,ROCKBLAST,29,HARDEN,32,PSYBEAM,35,CAPTIVATE,38,FLAIL,41,ATTRACT,44,PSYCHIC,47,FISSURE,50,BUGBUZZ
@@ -1137,8 +1103,7 @@ Color = Brown
 #-------------------------------
 [WORMADAM,2]
 FormName = Trash Cloak
-Type1 = BUG
+Types = BUG,STEEL
-Type2 = STEEL
 BaseStats = 60,69,95,36,69,95
 EVs = 0,0,1,0,0,1
 Moves = 0,QUIVERDANCE,1,QUIVERDANCE,1,METALBURST,1,SUCKERPUNCH,1,TACKLE,1,PROTECT,1,BUGBITE,10,PROTECT,15,BUGBITE,20,HIDDENPOWER,23,CONFUSION,26,MIRRORSHOT,29,METALSOUND,32,PSYBEAM,35,CAPTIVATE,38,FLAIL,41,ATTRACT,44,PSYCHIC,47,IRONHEAD,50,BUGBUZZ
@@ -1163,8 +1128,7 @@ Pokedex = Its body is covered in a sticky slime. It's very susceptible to dehydr
 [LOPUNNY,1]
 FormName = Mega Lopunny
 MegaStone = LOPUNNITE
-Type1 = NORMAL
+Types = NORMAL,FIGHTING
-Type2 = FIGHTING
 BaseStats = 65,136,94,135,54,96
 BaseExp = 203
 Abilities = SCRAPPY
@@ -1218,40 +1182,35 @@ Generation = 6
 #-------------------------------
 [ROTOM,1]
 FormName = Heat Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,FIRE
-Type2 = FIRE
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = This Rotom has possessed a convection microwave oven that uses a special motor. It also has a flair for manipulating flames.
 #-------------------------------
 [ROTOM,2]
 FormName = Wash Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,WATER
-Type2 = WATER
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = This form of Rotom enjoys coming up with water-based pranks. Be careful with it if you don't want your room flooded.
 #-------------------------------
 [ROTOM,3]
 FormName = Frost Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,ICE
-Type2 = ICE
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = Rotom assumes this form when it takes over a refrigerator powered by a special motor. It battles by spewing cold air.
 #-------------------------------
 [ROTOM,4]
 FormName = Fan Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,FLYING
-Type2 = FLYING
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = In this form, Rotom applies its new power over wind to its love of pranks. It will happily blow away any important documents it can find.
 #-------------------------------
 [ROTOM,5]
 FormName = Mow Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,GRASS
-Type2 = GRASS
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = This is Rotom after it's seized control of a lawn mower that has a special motor. As it mows down grass, it scatters the clippings everywhere.
@@ -1268,8 +1227,7 @@ Shape = Serpentine
 #-------------------------------
 [SHAYMIN,1]
 FormName = Sky Forme
-Type1 = GRASS
+Types = GRASS,FLYING
-Type2 = FLYING
 BaseStats = 100,103,75,127,120,75
 EVs = 0,0,0,3,0,0
 Abilities = SERENEGRACE
@@ -1280,83 +1238,82 @@ Weight = 5.2
 #-------------------------------
 [ARCEUS,1]
 FormName = Fighting Type
-Type1 = FIGHTING
+Types = FIGHTING
 #-------------------------------
 [ARCEUS,2]
 FormName = Flying Type
-Type1 = FLYING
+Types = FLYING
 #-------------------------------
 [ARCEUS,3]
 FormName = Poison Type
-Type1 = POISON
+Types = POISON
 #-------------------------------
 [ARCEUS,4]
 FormName = Ground Type
-Type1 = GROUND
+Types = GROUND
 #-------------------------------
 [ARCEUS,5]
 FormName = Rock Type
-Type1 = ROCK
+Types = ROCK
 #-------------------------------
 [ARCEUS,6]
 FormName = Bug Type
-Type1 = BUG
+Types = BUG
 #-------------------------------
 [ARCEUS,7]
 FormName = Ghost Type
-Type1 = GHOST
+Types = GHOST
 #-------------------------------
 [ARCEUS,8]
 FormName = Steel Type
-Type1 = STEEL
+Types = STEEL
 #-------------------------------
 [ARCEUS,9]
 FormName = Unknown Type
-Type1 = QMARKS
+Types = QMARKS
 #-------------------------------
 [ARCEUS,10]
 FormName = Fire Type
-Type1 = FIRE
+Types = FIRE
 #-------------------------------
 [ARCEUS,11]
 FormName = Water Type
-Type1 = WATER
+Types = WATER
 #-------------------------------
 [ARCEUS,12]
 FormName = Grass Type
-Type1 = GRASS
+Types = GRASS
 #-------------------------------
 [ARCEUS,13]
 FormName = Electric Type
-Type1 = ELECTRIC
+Types = ELECTRIC
 #-------------------------------
 [ARCEUS,14]
 FormName = Psychic Type
-Type1 = PSYCHIC
+Types = PSYCHIC
 #-------------------------------
 [ARCEUS,15]
 FormName = Ice Type
-Type1 = ICE
+Types = ICE
 #-------------------------------
 [ARCEUS,16]
 FormName = Dragon Type
-Type1 = DRAGON
+Types = DRAGON
 TutorMoves = AERIALACE,AQUATAIL,BLIZZARD,BRICKBREAK,BULLDOZE,CALMMIND,CHARGEBEAM,CONFIDE,CUT,DARKPULSE,DEFOG,DIVE,DOUBLETEAM,DRACOMETEOR,DRAGONCLAW,DRAGONPULSE,DREAMEATER,EARTHPOWER,EARTHQUAKE,ECHOEDVOICE,ENERGYBALL,FACADE,FIREBLAST,FLAMETHROWER,FLASHCANNON,FLY,FOCUSBLAST,FRUSTRATION,GIGADRAIN,GIGAIMPACT,GRASSKNOT,GRAVITY,HAIL,HEATWAVE,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONDEFENSE,IRONHEAD,IRONTAIL,LASERFOCUS,LASTRESORT,LIGHTSCREEN,LIQUIDATION,MAGICCOAT,OUTRAGE,OVERHEAT,PAYBACK,POISONJAB,PROTECT,PSYCHIC,PSYCHUP,PSYSHOCK,QUASH,RAINDANCE,RECYCLE,REFLECT,REST,RETURN,ROAR,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SHADOWBALL,SHADOWCLAW,SHOCKWAVE,SIGNALBEAM,SLEEPTALK,SLUDGEBOMB,SNARL,SNORE,SOLARBEAM,STEALTHROCK,STONEEDGE,STRENGTH,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWORDSDANCE,TAILWIND,TELEKINESIS,THUNDER,THUNDERBOLT,THUNDERWAVE,TOXIC,TRICK,TRICKROOM,WATERFALL,WATERPULSE,WILLOWISP,WORKUP,XSCISSOR,ZENHEADBUTT
 #-------------------------------
 [ARCEUS,17]
 FormName = Dark Type
-Type1 = DARK
+Types = DARK
 #-------------------------------
 [ARCEUS,18]
 FormName = Fairy Type
-Type1 = FAIRY
+Types = FAIRY
 Generation = 6
 #-------------------------------
 [AUDINO,1]
 FormName = Mega Audino
 MegaStone = AUDINITE
-Type1 = NORMAL
+Types = NORMAL,FAIRY
-Type2 = FAIRY
 BaseStats = 103,60,126,50,80,126
 BaseExp = 425
 Abilities = HEALER
@@ -1374,7 +1331,7 @@ WildItemUncommon = DEEPSEASCALE
 #-------------------------------
 [DARUMAKA,2]
 FormName = Galarian
-Type1 = ICE
+Types = ICE
 Moves = 1,POWDERSNOW,1,TACKLE,4,TAUNT,8,BITE,12,AVALANCHE,16,WORKUP,20,ICEFANG,24,HEADBUTT,28,ICEPUNCH,32,UPROAR,36,BELLYDRUM,40,BLIZZARD,44,THRASH,48,SUPERPOWER
 TutorMoves = ATTRACT,AVALANCHE,BLIZZARD,BRICKBREAK,DIG,ENCORE,ENDURE,FACADE,FIREBLAST,FIREFANG,FIREPUNCH,FIRESPIN,FLAMETHROWER,FLAREBLITZ,FLING,FOCUSENERGY,GRASSKNOT,GYROBALL,HEATWAVE,HIDDENPOWER,ICEBEAM,ICEFANG,ICEPUNCH,MEGAKICK,MEGAPUNCH,OVERHEAT,PROTECT,REST,ROCKSLIDE,ROCKTOMB,ROUND,SLEEPTALK,SNORE,SOLARBEAM,SUBSTITUTE,SUNNYDAY,SUPERPOWER,TAUNT,THIEF,UPROAR,UTURN,WILLOWISP,WORKUP,ZENHEADBUTT
 EggMoves = FLAMEWHEEL,FOCUSPUNCH,FREEZEDRY,HAMMERARM,INCINERATE,POWERUPPUNCH,TAKEDOWN,YAWN
@@ -1388,8 +1345,7 @@ Evolutions = DARMANITAN,Item,ICESTONE
 #-------------------------------
 [DARMANITAN,1]
 FormName = Zen Mode
-Type1 = FIRE
+Types = FIRE,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 105,30,105,55,140,105
 BaseExp = 189
 EVs = 0,0,0,0,2,0
@@ -1398,7 +1354,7 @@ Pokedex = When wounded, it stops moving. It goes as still as stone to meditate,
 #-------------------------------
 [DARMANITAN,2]
 FormName = Galarian Standard Mode
-Type1 = ICE
+Types = ICE
 Abilities = GORILLATACTICS
 Moves = 0,ICICLECRASH,1,ICICLECRASH,1,POWDERSNOW,1,TACKLE,1,TAUNT,1,BITE,12,AVALANCHE,16,WORKUP,20,ICEFANG,24,HEADBUTT,28,ICEPUNCH,32,UPROAR,38,BELLYDRUM,44,BLIZZARD,50,THRASH,56,SUPERPOWER
 TutorMoves = ATTRACT,AVALANCHE,BLIZZARD,BODYPRESS,BODYSLAM,BRICKBREAK,BULKUP,BULLDOZE,BURNINGJEALOUSY,DIG,EARTHQUAKE,ENCORE,ENDURE,FACADE,FIREBLAST,FIREFANG,FIREPUNCH,FIRESPIN,FLAMETHROWER,FLAREBLITZ,FLING,FOCUSBLAST,FOCUSENERGY,GIGAIMPACT,GRASSKNOT,GYROBALL,HEATWAVE,HIDDENPOWER,HYPERBEAM,ICEBEAM,ICEFANG,ICEPUNCH,IRONDEFENSE,IRONHEAD,LASHOUT,MEGAKICK,MEGAPUNCH,OVERHEAT,PAYBACK,PROTECT,PSYCHIC,REST,REVERSAL,ROCKSLIDE,ROCKTOMB,ROUND,SLEEPTALK,SNORE,SOLARBEAM,STONEEDGE,SUBSTITUTE,SUNNYDAY,SUPERPOWER,TAUNT,THIEF,UPROAR,UTURN,WILLOWISP,WORKUP,ZENHEADBUTT
@@ -1412,8 +1368,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [DARMANITAN,3]
 FormName = Galarian Zen Mode
-Type1 = ICE
+Types = ICE,FIRE
-Type2 = FIRE
 BaseStats = 105,160,55,135,30,55
 BaseExp = 189
 EVs = 0,0,0,0,2,0
@@ -1429,8 +1384,7 @@ Generation = 8
 #-------------------------------
 [YAMASK,1]
 FormName = Galarian
-Type1 = GROUND
+Types = GROUND,GHOST
-Type2 = GHOST
 BaseStats = 38,55,85,30,30,65
 Abilities = WANDERINGSPIRIT
 Moves = 1,ASTONISH,1,PROTECT,4,HAZE,8,NIGHTSHADE,12,DISABLE,16,BRUTALSWING,20,CRAFTYSHIELD,24,HEX,28,MEANLOOK,32,SLAM,36,CURSE,40,SHADOWBALL,44,EARTHQUAKE,48,POWERSPLIT,48,GUARDSPLIT,52,DESTINYBOND
@@ -1463,8 +1417,7 @@ FormName = Winter Form
 #-------------------------------
 [STUNFISK,1]
 FormName = Galarian
-Type1 = GROUND
+Types = GROUND,STEEL
-Type2 = STEEL
 BaseStats = 109,81,99,32,66,84
 Abilities = MIMICRY
 HiddenAbilities = MIMICRY
@@ -1550,8 +1503,7 @@ Pokedex = The power that lay hidden in its body now covers its horn, turning it
 #-------------------------------
 [MELOETTA,1]
 FormName = Pirouette Forme
-Type1 = NORMAL
+Types = NORMAL,FIGHTING
-Type2 = FIGHTING
 BaseStats = 100,128,90,128,77,77
 EVs = 0,1,1,1,0,0
 #-------------------------------
@@ -1824,8 +1776,7 @@ Weight = 27.8
 #-------------------------------
 [HOOPA,1]
 FormName = Hoopa Unbound
-Type1 = PSYCHIC
+Types = PSYCHIC,DARK
-Type2 = DARK
 BaseStats = 80,160,60,80,170,130
 BaseExp = 340
 Moves = 1,HYPERSPACEFURY,1,TRICK,1,DESTINYBOND,1,ALLYSWITCH,1,CONFUSION,6,ASTONISH,10,MAGICCOAT,15,LIGHTSCREEN,19,PSYBEAM,25,SKILLSWAP,29,POWERSPLIT,29,GUARDSPLIT,46,KNOCKOFF,50,WONDERROOM,50,TRICKROOM,55,DARKPULSE,75,PSYCHIC,85,HYPERSPACEFURY
@@ -1835,22 +1786,19 @@ Shape = BipedalTail
 #-------------------------------
 [ORICORIO,1]
 FormName = Pom-Pom Style
-Type1 = ELECTRIC
+Types = ELECTRIC,FLYING
-Type2 = FLYING
 Color = Yellow
 Pokedex = It creates an electric charge by rubbing its feathers together. It dances over to its enemies and delivers shocking electrical punches.
 #-------------------------------
 [ORICORIO,2]
 FormName = Pa'u Style
-Type1 = PSYCHIC
+Types = PSYCHIC,FLYING
-Type2 = FLYING
 Color = Pink
 Pokedex = This Oricorio relaxes by swaying gently. This increases its psychic energy, which it then fires at its enemies.
 #-------------------------------
 [ORICORIO,3]
 FormName = Sensu Style
-Type1 = GHOST
+Types = GHOST,FLYING
-Type2 = FLYING
 Color = Purple
 Pokedex = It summons the dead with its dreamy dancing. From their malice, it draws power with which to curse its enemies.
 #-------------------------------
@@ -1893,76 +1841,76 @@ Pokedex = Weak Wishiwashi school together to concentrate their power. Their unit
 #-------------------------------
 [SILVALLY,1]
 FormName = Type: Fighting
-Type1 = FIGHTING
+Types = FIGHTING
 #-------------------------------
 [SILVALLY,2]
 FormName = Type: Flying
-Type1 = FLYING
+Types = FLYING
 #-------------------------------
 [SILVALLY,3]
 FormName = Type: Poison
-Type1 = POISON
+Types = POISON
 #-------------------------------
 [SILVALLY,4]
 FormName = Type: Ground
-Type1 = GROUND
+Types = GROUND
 #-------------------------------
 [SILVALLY,5]
 FormName = Type: Rock
-Type1 = ROCK
+Types = ROCK
 #-------------------------------
 [SILVALLY,6]
 FormName = Type: Bug
-Type1 = BUG
+Types = BUG
 #-------------------------------
 [SILVALLY,7]
 FormName = Type: Ghost
-Type1 = GHOST
+Types = GHOST
 #-------------------------------
 [SILVALLY,8]
 FormName = Type: Steel
-Type1 = STEEL
+Types = STEEL
 #-------------------------------
 [SILVALLY,9]
 FormName = Type: Unknown
-Type1 = QMARKS
+Types = QMARKS
 #-------------------------------
 [SILVALLY,10]
 FormName = Type: Fire
-Type1 = FIRE
+Types = FIRE
 #-------------------------------
 [SILVALLY,11]
 FormName = Type: Water
-Type1 = WATER
+Types = WATER
 #-------------------------------
 [SILVALLY,12]
 FormName = Type: Grass
-Type1 = GRASS
+Types = GRASS
 #-------------------------------
 [SILVALLY,13]
 FormName = Type: Electric
-Type1 = ELECTRIC
+Types = ELECTRIC
 #-------------------------------
 [SILVALLY,14]
 FormName = Type: Psychic
-Type1 = PSYCHIC
+Types = PSYCHIC
 #-------------------------------
 [SILVALLY,15]
 FormName = Type: Ice
-Type1 = ICE
+Types = ICE
 #-------------------------------
 [SILVALLY,16]
 FormName = Type: Dragon
-Type1 = DRAGON
+Types = DRAGON
 TutorMoves = AERIALACE,CONFIDE,DEFOG,DOUBLETEAM,DRACOMETEOR,DRAGONCLAW,EXPLOSION,FACADE,FLAMECHARGE,FLAMETHROWER,FLASHCANNON,FRUSTRATION,GIGAIMPACT,GRASSPLEDGE,HAIL,HEATWAVE,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONDEFENSE,IRONHEAD,LASERFOCUS,LASTRESORT,MAGICCOAT,OUTRAGE,PAYBACK,PROTECT,RAINDANCE,REST,RETURN,ROAR,ROCKSLIDE,ROUND,SANDSTORM,SHADOWBALL,SHADOWCLAW,SIGNALBEAM,SLEEPTALK,SNARL,SNORE,STEELWING,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWORDSDANCE,TAILWIND,THUNDERBOLT,THUNDERWAVE,TOXIC,UTURN,WORKUP,XSCISSOR,ZENHEADBUTT
 #-------------------------------
 [SILVALLY,17]
 FormName = Type: Dark
-Type1 = DARK
+Types = DARK
 #-------------------------------
 [SILVALLY,18]
 FormName = Type: Fairy
-Type1 = FAIRY
+Types = FAIRY
 #-------------------------------
 [MINIOR,7]
 FormName = Red Core
@@ -2040,8 +1988,7 @@ Pokedex = Sad that its true identity may be exposed, Mimikyu will mercilessly se
 #-------------------------------
 [NECROZMA,1]
 FormName = Dusk Mane
-Type1 = PSYCHIC
+Types = PSYCHIC,STEEL
-Type2 = STEEL
 BaseStats = 97,157,127,77,113,109
 BaseExp = 340
 EVs = 0,3,0,0,0,0
@@ -2053,8 +2000,7 @@ Pokedex = This is Necrozma's form while it's absorbing the power of Solgaleo, ma
 #-------------------------------
 [NECROZMA,2]
 FormName = Dawn Wings
-Type1 = PSYCHIC
+Types = PSYCHIC,GHOST
-Type2 = GHOST
 BaseStats = 97,113,109,77,157,127
 BaseExp = 340
 EVs = 0,0,0,0,3,0
@@ -2065,8 +2011,7 @@ Pokedex = Lunala no longer has a will of its own. Now under the control of Necro
 #-------------------------------
 [NECROZMA,3]
 FormName = Ultra Necrozma
-Type1 = PSYCHIC
+Types = PSYCHIC,DRAGON
-Type2 = DRAGON
 BaseStats = 97,167,97,129,167,97
 BaseExp = 377
 EVs = 0,1,0,1,1,0
@@ -2077,8 +2022,7 @@ Pokedex = The light pouring out from all over its body affects living things and
 #-------------------------------
 [NECROZMA,4]
 PokedexForm = 3
-Type1 = PSYCHIC
+Types = PSYCHIC,DRAGON
-Type2 = DRAGON
 BaseStats = 97,167,97,129,167,97
 BaseExp = 377
 EVs = 0,1,0,1,1,0
@@ -2319,8 +2263,7 @@ Pokedex = Hunger hormones affect its temperament. Until its hunger is appeased,
 #-------------------------------
 [ZACIAN,1]
 FormName = Crowned Sword
-Type1 = FAIRY
+Types = FAIRY,STEEL
-Type2 = STEEL
 BaseStats = 92,170,115,148,80,115
 BaseExp = 360
 Weight = 355.0
@@ -2328,8 +2271,7 @@ Pokedex = Able to cut down anything with a single strike, it became known as the
 #-------------------------------
 [ZAMAZENTA,1]
 FormName = Crowned Shield
-Type1 = FIGHTING
+Types = FIGHTING,STEEL
-Type2 = STEEL
 BaseStats = 92,130,145,128,80,145
 BaseExp = 360
 Weight = 785.0
@@ -2337,16 +2279,14 @@ Pokedex = Its ability to deflect any attack led to it being known as the Fightin
 #-------------------------------
 [URSHIFU,1]
 FormName = Rapid Strike Style
-Type1 = FIGHTING
+Types = FIGHTING,WATER
-Type2 = WATER
 Moves = 0,SURGINGSTRIKES,1,SURGINGSTRIKES,1,AQUAJET,1,ROCKSMASH,1,LEER,1,ENDURE,1,FOCUSENERGY,12,AERIALACE,16,SCARYFACE,20,HEADBUTT,24,BRICKBREAK,28,DETECT,32,BULKUP,36,IRONHEAD,40,DYNAMICPUNCH,44,COUNTER,48,CLOSECOMBAT,52,FOCUSPUNCH
 TutorMoves = ACROBATICS,ATTRACT,AURASPHERE,BODYPRESS,BODYSLAM,BRICKBREAK,BRINE,BULKUP,CLOSECOMBAT,COACHING,DIG,DIVE,DRAINPUNCH,ENDURE,FACADE,FALSESWIPE,FIREPUNCH,FOCUSBLAST,FOCUSENERGY,GIGAIMPACT,HELPINGHAND,ICEPUNCH,IRONDEFENSE,IRONHEAD,LIQUIDATION,LOWKICK,LOWSWEEP,MEGAKICK,MEGAPUNCH,POISONJAB,PROTECT,RAINDANCE,REST,RETALIATE,REVENGE,REVERSAL,ROCKSLIDE,ROCKTOMB,ROUND,SCALD,SCARYFACE,SLEEPTALK,SNORE,STONEEDGE,SUBSTITUTE,SUPERPOWER,SWIFT,TAUNT,THUNDERPUNCH,UTURN,WATERFALL,WHIRLPOOL,WORKUP,ZENHEADBUTT
 Pokedex = It's believed that this Pokémon modeled its fighting style on the flow of a river—sometimes rapid, sometimes calm.
 #-------------------------------
 [CALYREX,1]
 FormName = Ice Rider
-Type1 = PSYCHIC
+Types = PSYCHIC,ICE
-Type2 = ICE
 BaseStats = 100,165,150,50,85,130
 BaseExp = 340
 EVs = 0,3,0,0,0,0
@@ -2362,8 +2302,7 @@ Pokedex = According to lore, this Pokémon showed no mercy to those who got in i
 #-------------------------------
 [CALYREX,2]
 FormName = Shadow Rider
-Type1 = PSYCHIC
+Types = PSYCHIC,GHOST
-Type2 = GHOST
 BaseStats = 100,85,80,150,165,100
 BaseExp = 340
 EVs = 0,0,0,0,3,0

PBS/pokemon_forms.txt

@@ -15,8 +15,7 @@ Generation = 6
 [CHARIZARD,1]
 FormName = Mega Charizard X
 MegaStone = CHARIZARDITEX
-Type1 = FIRE
+Types = FIRE,DRAGON
-Type2 = DRAGON
 BaseStats = 78,130,111,100,130,85
 BaseExp = 317
 Abilities = TOUGHCLAWS
@@ -74,8 +73,7 @@ Generation = 6
 #-------------------------------
 [RATTATA,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK,NORMAL
-Type2 = NORMAL
 Abilities = GLUTTONY,HUSTLE
 HiddenAbilities = THICKFAT
 TutorMoves = ATTRACT,BLIZZARD,CONFIDE,COVET,DARKPULSE,DOUBLETEAM,EMBARGO,ENDEAVOR,FACADE,FRUSTRATION,GRASSKNOT,HIDDENPOWER,ICEBEAM,ICYWIND,IRONTAIL,LASTRESORT,PROTECT,QUASH,RAINDANCE,REST,RETURN,ROUND,SHADOWBALL,SHADOWCLAW,SHOCKWAVE,SLEEPTALK,SLUDGEBOMB,SNARL,SNATCH,SNORE,SUBSTITUTE,SUNNYDAY,SUPERFANG,SWAGGER,TAUNT,THIEF,TORMENT,TOXIC,UPROAR,UTURN,ZENHEADBUTT
@@ -90,8 +88,7 @@ Evolutions = RATICATE,LevelNight,20
 #-------------------------------
 [RATICATE,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK,NORMAL
-Type2 = NORMAL
 BaseStats = 75,71,70,77,40,80
 Abilities = GLUTTONY,HUSTLE
 HiddenAbilities = THICKFAT
@@ -105,8 +102,7 @@ WildItemUncommon = PECHABERRY
 #-------------------------------
 [RAICHU,1]
 FormName = Alolan
-Type1 = ELECTRIC
+Types = ELECTRIC,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 60,85,50,110,95,85
 Abilities = SURGESURFER
 HiddenAbilities = SURGESURFER
@@ -120,8 +116,7 @@ Generation = 7
 #-------------------------------
 [SANDSHREW,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE,STEEL
-Type2 = STEEL
 BaseStats = 50,75,90,40,10,35
 Abilities = SNOWCLOAK
 HiddenAbilities = SLUSHRUSH
@@ -138,8 +133,7 @@ Evolutions = SANDSLASH,Item,ICESTONE
 #-------------------------------
 [SANDSLASH,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE,STEEL
-Type2 = STEEL
 BaseStats = 75,100,120,65,25,65
 Abilities = SNOWCLOAK
 HiddenAbilities = SLUSHRUSH
@@ -154,7 +148,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [VULPIX,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE
 Abilities = SNOWCLOAK
 HiddenAbilities = SNOWWARNING
 Moves = 1,POWDERSNOW,4,TAILWHIP,7,ROAR,9,BABYDOLLEYES,10,ICESHARD,12,CONFUSERAY,15,ICYWIND,18,PAYBACK,20,MIST,23,FEINTATTACK,26,HEX,28,AURORABEAM,31,EXTRASENSORY,34,SAFEGUARD,36,ICEBEAM,39,IMPRISON,42,BLIZZARD,44,GRUDGE,47,CAPTIVATE,50,SHEERCOLD
@@ -169,8 +163,7 @@ Evolutions = NINETALES,Item,ICESTONE
 #-------------------------------
 [NINETALES,1]
 FormName = Alolan
-Type1 = ICE
+Types = ICE,FAIRY
-Type2 = FAIRY
 BaseStats = 73,67,75,109,81,100
 EVs = 0,0,0,2,0,0
 Abilities = SNOWCLOAK
@@ -185,8 +178,7 @@ WildItemUncommon = SNOWBALL
 #-------------------------------
 [DIGLETT,1]
 FormName = Alolan
-Type1 = GROUND
+Types = GROUND,STEEL
-Type2 = STEEL
 BaseStats = 10,55,30,90,35,45
 Abilities = SANDVEIL,TANGLINGHAIR
 Moves = 1,SANDATTACK,1,METALCLAW,4,GROWL,7,ASTONISH,10,MUDSLAP,14,MAGNITUDE,18,BULLDOZE,22,SUCKERPUNCH,25,MUDBOMB,28,EARTHPOWER,31,DIG,35,IRONHEAD,39,EARTHQUAKE,43,FISSURE
@@ -199,8 +191,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [DUGTRIO,1]
 FormName = Alolan
-Type1 = GROUND
+Types = GROUND,STEEL
-Type2 = STEEL
 BaseStats = 35,100,60,110,50,70
 EVs = 0,2,0,0,0,0
 Abilities = SANDVEIL,TANGLINGHAIR
@@ -213,7 +204,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [MEOWTH,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK
 BaseStats = 40,35,35,90,50,40
 HiddenAbilities = RATTLED
 Moves = 1,SCRATCH,1,GROWL,6,BITE,9,FAKEOUT,14,FURYSWIPES,17,SCREECH,22,FEINTATTACK,25,TAUNT,30,PAYDAY,33,SLASH,38,NASTYPLOT,41,ASSURANCE,46,CAPTIVATE,49,NIGHTSLASH,50,FEINT,55,DARKPULSE
@@ -227,7 +218,7 @@ Evolutions = PERSIAN,Happiness,
 #-------------------------------
 [MEOWTH,2]
 FormName = Galarian
-Type1 = STEEL
+Types = STEEL
 BaseStats = 50,65,55,40,40,40
 Abilities = PICKUP,TOUGHCLAWS
 Moves = 1,FAKEOUT,1,GROWL,4,HONECLAWS,8,SCRATCH,12,PAYDAY,16,METALCLAW,20,TAUNT,24,SWAGGER,29,FURYSWIPES,32,SCREECH,36,SLASH,40,METALSOUND,44,THRASH
@@ -243,7 +234,7 @@ Evolutions = PERRSERKER,Level,28
 #-------------------------------
 [PERSIAN,1]
 FormName = Alolan
-Type1 = DARK
+Types = DARK
 BaseStats = 65,60,60,115,75,65
 Abilities = FURCOAT,TECHNICIAN
 HiddenAbilities = RATTLED
@@ -269,8 +260,7 @@ Generation = 6
 #-------------------------------
 [GEODUDE,1]
 FormName = Alolan
-Type1 = ROCK
+Types = ROCK,ELECTRIC
-Type2 = ELECTRIC
 Abilities = MAGNETPULL,STURDY
 HiddenAbilities = GALVANIZE
 Moves = 1,TACKLE,1,DEFENSECURL,4,CHARGE,6,ROCKPOLISH,10,ROLLOUT,12,SPARK,16,ROCKTHROW,18,SMACKDOWN,22,THUNDERPUNCH,24,SELFDESTRUCT,28,STEALTHROCK,30,ROCKBLAST,34,DISCHARGE,36,EXPLOSION,40,DOUBLEEDGE,42,STONEEDGE
@@ -285,8 +275,7 @@ WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GRAVELER,1]
 FormName = Alolan
-Type1 = ROCK
+Types = ROCK,ELECTRIC
-Type2 = ELECTRIC
 Abilities = MAGNETPULL,STURDY
 HiddenAbilities = GALVANIZE
 Moves = 1,TACKLE,1,DEFENSECURL,1,CHARGE,1,ROCKPOLISH,4,CHARGE,6,ROCKPOLISH,10,ROLLOUT,12,SPARK,16,ROCKTHROW,18,SMACKDOWN,22,THUNDERPUNCH,24,SELFDESTRUCT,30,STEALTHROCK,34,ROCKBLAST,40,DISCHARGE,44,EXPLOSION,50,DOUBLEEDGE,54,STONEEDGE
@@ -300,8 +289,7 @@ WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GOLEM,1]
 FormName = Alolan
-Type1 = ROCK
+Types = ROCK,ELECTRIC
-Type2 = ELECTRIC
 Abilities = MAGNETPULL,STURDY
 HiddenAbilities = GALVANIZE
 Moves = 1,HEAVYSLAM,1,TACKLE,1,DEFENSECURL,1,CHARGE,1,ROCKPOLISH,4,CHARGE,6,ROCKPOLISH,10,STEAMROLLER,12,SPARK,16,ROCKTHROW,18,SMACKDOWN,22,THUNDERPUNCH,24,SELFDESTRUCT,30,STEALTHROCK,34,ROCKBLAST,40,DISCHARGE,44,EXPLOSION,50,DOUBLEEDGE,54,STONEEDGE,60,HEAVYSLAM
@@ -316,7 +304,7 @@ WildItemCommon = CELLBATTERY
 #-------------------------------
 [PONYTA,1]
 FormName = Galarian
-Type1 = PSYCHIC
+Types = PSYCHIC
 Abilities = RUNAWAY,PASTELVEIL
 HiddenAbilities = ANTICIPATION
 Moves = 1,TACKLE,1,GROWL,5,TAILWHIP,10,CONFUSION,15,FAIRYWIND,20,AGILITY,25,PSYBEAM,30,STOMP,35,HEALPULSE,41,TAKEDOWN,45,DAZZLINGGLEAM,50,PSYCHIC,55,HEALINGWISH
@@ -331,8 +319,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [RAPIDASH,1]
 FormName = Galarian
-Type1 = PSYCHIC
+Types = PSYCHIC,FAIRY
-Type2 = FAIRY
 Abilities = RUNAWAY,PASTELVEIL
 HiddenAbilities = ANTICIPATION
 Moves = 0,PSYCHOCUT,1,PSYCHOCUT,1,MEGAHORN,1,TACKLE,1,QUICKATTACK,1,GROWL,1,TAILWHIP,1,CONFUSION,15,FAIRYWIND,20,AGILITY,25,PSYBEAM,30,STOMP,35,HEALPULSE,43,TAKEDOWN,49,DAZZLINGGLEAM,56,PSYCHIC,63,HEALINGWISH
@@ -346,7 +333,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [SLOWPOKE,1]
 FormName = Galarian
-Type1 = PSYCHIC
+Types = PSYCHIC
 Abilities = GLUTTONY,OWNTEMPO
 Moves = 1,TACKLE,1,CURSE,3,GROWL,6,ACID,9,YAWN,12,CONFUSION,15,DISABLE,18,WATERPULSE,21,HEADBUTT,24,ZENHEADBUTT,27,AMNESIA,30,SURF,33,SLACKOFF,36,PSYCHIC,39,PSYCHUP,42,RAINDANCE,45,HEALPULSE
 TutorMoves = AMNESIA,ATTRACT,BLIZZARD,BODYSLAM,BRINE,BULLDOZE,CALMMIND,DIG,DIVE,EARTHQUAKE,ENDURE,EXPANDINGFORCE,FACADE,FIREBLAST,FLAMETHROWER,FOULPLAY,FUTURESIGHT,GRASSKNOT,HAIL,HIDDENPOWER,HYDROPUMP,ICEBEAM,ICYWIND,IMPRISON,IRONTAIL,LIGHTSCREEN,LIQUIDATION,MUDSHOT,PAYDAY,PROTECT,PSYCHIC,PSYCHICTERRAIN,PSYSHOCK,RAINDANCE,REST,ROUND,SAFEGUARD,SCALD,SHADOWBALL,SKILLSWAP,SLEEPTALK,SNORE,STOREDPOWER,SUBSTITUTE,SUNNYDAY,SURF,SWIFT,THUNDERWAVE,TRIATTACK,TRICK,TRICKROOM,WEATHERBALL,WHIRLPOOL,WONDERROOM,ZENHEADBUTT
@@ -357,8 +344,7 @@ Evolutions = SLOWBRO,Item,GALARICACUFF,SLOWKING,Item,GALARICAWREATH
 #-------------------------------
 [SLOWBRO,1]
 FormName = Galarian
-Type1 = POISON
+Types = POISON,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 95,100,95,30,100,70
 Abilities = QUICKDRAW,OWNTEMPO
 Moves = 0,SHELLSIDEARM,1,SHELLSIDEARM,1,WITHDRAW,1,TACKLE,1,CURSE,1,GROWL,1,ACID,9,YAWN,12,CONFUSION,15,DISABLE,18,WATERPULSE,21,HEADBUTT,24,ZENHEADBUTT,27,AMNESIA,30,SURF,33,SLACKOFF,36,PSYCHIC,39,PSYCHUP,42,RAINDANCE,45,HEALPULSE
@@ -383,7 +369,7 @@ Generation = 6
 #-------------------------------
 [FARFETCHD,1]
 FormName = Galarian
-Type1 = FIGHTING
+Types = FIGHTING
 BaseStats = 52,95,55,55,58,62
 Abilities = STEADFAST
 HiddenAbilities = SCRAPPY
@@ -399,8 +385,7 @@ Evolutions = SIRFETCHD,BattleDealCriticalHit,3
 #-------------------------------
 [GRIMER,1]
 FormName = Alolan
-Type1 = POISON
+Types = POISON,DARK
-Type2 = DARK
 Abilities = POISONTOUCH,GLUTTONY
 HiddenAbilities = POWEROFALCHEMY
 Moves = 1,POUND,1,POISONGAS,4,HARDEN,7,BITE,12,DISABLE,15,ACIDSPRAY,18,POISONFANG,21,MINIMIZE,26,FLING,29,KNOCKOFF,32,CRUNCH,37,SCREECH,40,GUNKSHOT,43,ACIDARMOR,46,BELCH,48,MEMENTO
@@ -415,8 +400,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [MUK,1]
 FormName = Alolan
-Type1 = POISON
+Types = POISON,DARK
-Type2 = DARK
 Abilities = POISONTOUCH,GLUTTONY
 HiddenAbilities = POWEROFALCHEMY
 Moves = 0,VENOMDRENCH,1,VENOMDRENCH,1,POUND,1,POISONGAS,1,HARDEN,1,BITE,4,HARDEN,7,BITE,12,DISABLE,15,ACIDSPRAY,18,POISONFANG,21,MINIMIZE,26,FLING,29,KNOCKOFF,32,CRUNCH,37,SCREECH,40,GUNKSHOT,46,ACIDARMOR,52,BELCH,57,MEMENTO
@@ -441,8 +425,7 @@ Generation = 6
 #-------------------------------
 [EXEGGUTOR,1]
 FormName = Alolan
-Type1 = GRASS
+Types = GRASS,DRAGON
-Type2 = DRAGON
 BaseStats = 95,105,85,45,125,75
 Abilities = FRISK
 Moves = 0,DRAGONHAMMER,1,DRAGONHAMMER,1,SEEDBOMB,1,BARRAGE,1,HYPNOSIS,1,CONFUSION,17,PSYSHOCK,27,EGGBOMB,37,WOODHAMMER,47,LEAFSTORM
@@ -458,8 +441,7 @@ Evolutions = MAROWAK,LevelNight,28
 #-------------------------------
 [MAROWAK,1]
 FormName = Alolan
-Type1 = FIRE
+Types = FIRE,GHOST
-Type2 = GHOST
 Abilities = CURSEDBODY,LIGHTNINGROD
 HiddenAbilities = ROCKHEAD
 Moves = 1,GROWL,1,TAILWHIP,1,BONECLUB,1,FLAMEWHEEL,3,TAILWHIP,7,BONECLUB,11,FLAMEWHEEL,13,LEER,17,HEX,21,BONEMERANG,23,WILLOWISP,27,SHADOWBONE,33,THRASH,37,FLING,43,STOMPINGTANTRUM,49,ENDEAVOR,53,FLAREBLITZ,59,RETALIATE,65,BONERUSH
@@ -471,8 +453,7 @@ Generation = 7
 #-------------------------------
 [WEEZING,1]
 FormName = Galarian
-Type1 = POISON
+Types = POISON,FAIRY
-Type2 = FAIRY
 HiddenAbilities = MISTYSURGE
 Moves = 0,DOUBLEHIT,1,DOUBLEHIT,1,STRANGESTEAM,1,DEFOG,1,HEATWAVE,1,SMOG,1,SMOKESCREEN,1,HAZE,1,POISONGAS,1,TACKLE,1,FAIRYWIND,1,AROMATICMIST,12,CLEARSMOG,16,ASSURANCE,20,SLUDGE,24,AROMATHERAPY,28,SELFDESTRUCT,32,SLUDGEBOMB,38,TOXIC,44,BELCH,50,EXPLOSION,56,MEMENTO,62,DESTINYBOND,68,MISTYTERRAIN
 TutorMoves = ASSURANCE,ATTRACT,BRUTALSWING,CORROSIVEGAS,DARKPULSE,DAZZLINGGLEAM,ENDURE,FACADE,FIREBLAST,FLAMETHROWER,GIGAIMPACT,GYROBALL,HEATWAVE,HIDDENPOWER,HYPERBEAM,MISTYEXPLOSION,MISTYTERRAIN,OVERHEAT,PAYBACK,PLAYROUGH,PROTECT,RAINDANCE,REST,ROUND,SCREECH,SELFDESTRUCT,SHADOWBALL,SLEEPTALK,SLUDGEBOMB,SLUDGEWAVE,SNORE,SUBSTITUTE,SUNNYDAY,TAUNT,THIEF,THUNDER,THUNDERBOLT,TOXICSPIKES,UPROAR,VENOMDRENCH,VENOSHOCK,WILLOWISP,WONDERROOM
@@ -496,8 +477,7 @@ Generation = 6
 #-------------------------------
 [MRMIME,1]
 FormName = Galarian
-Type1 = ICE
+Types = ICE,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 50,65,65,100,90,90
 EVs = 0,0,0,2,0,0
 Abilities = VITALSPIRIT,SCREENCLEANER
@@ -516,8 +496,7 @@ Evolutions = MRRIME,Level,42
 [PINSIR,1]
 FormName = Mega Pinsir
 MegaStone = PINSIRITE
-Type1 = BUG
+Types = BUG,FLYING
-Type2 = FLYING
 BaseStats = 65,155,120,105,65,90
 BaseExp = 210
 Abilities = AERILATE
@@ -531,8 +510,7 @@ Generation = 6
 [GYARADOS,1]
 FormName = Mega Gyarados
 MegaStone = GYARADOSITE
-Type1 = WATER
+Types = WATER,DARK
-Type2 = DARK
 BaseStats = 95,155,109,81,70,130
 BaseExp = 224
 Abilities = MOLDBREAKER
@@ -555,8 +533,7 @@ Generation = 6
 #-------------------------------
 [ARTICUNO,1]
 FormName = Galarian
-Type1 = PSYCHIC
+Types = PSYCHIC,FLYING
-Type2 = FLYING
 BaseStats = 90,85,85,95,125,100
 EVs = 0,0,0,0,3,0
 Abilities = COMPETITIVE
@@ -571,8 +548,7 @@ Generation = 8
 #-------------------------------
 [ZAPDOS,1]
 FormName = Galarian
-Type1 = FIGHTING
+Types = FIGHTING,FLYING
-Type2 = FLYING
 BaseStats = 90,125,90,100,85,90
 EVs = 0,3,0,0,0,0
 Abilities = DEFIANT
@@ -586,8 +562,7 @@ Generation = 8
 #-------------------------------
 [MOLTRES,1]
 FormName = Galarian
-Type1 = DARK
+Types = DARK,FLYING
-Type2 = FLYING
 BaseStats = 90,85,90,90,100,125
 EVs = 0,0,0,0,0,3
 Abilities = BERSERK
@@ -603,8 +578,7 @@ Generation = 8
 [MEWTWO,1]
 FormName = Mega Mewtwo X
 MegaStone = MEWTWONITEX
-Type1 = PSYCHIC
+Types = PSYCHIC,FIGHTING
-Type2 = FIGHTING
 BaseStats = 106,190,100,130,154,100
 BaseExp = 390
 Abilities = STEADFAST
@@ -634,8 +608,7 @@ Evolutions = PIKACHU,None,
 [AMPHAROS,1]
 FormName = Mega Ampharos
 MegaStone = AMPHAROSITE
-Type1 = ELECTRIC
+Types = ELECTRIC,DRAGON
-Type2 = DRAGON
 BaseStats = 90,95,105,45,165,110
 BaseExp = 305
 Abilities = MOLDBREAKER
@@ -645,8 +618,7 @@ Generation = 6
 #-------------------------------
 [SLOWKING,1]
 FormName = Galarian
-Type1 = POISON
+Types = POISON,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 95,65,80,30,110,110
 Abilities = CURIOUSMEDICINE,OWNTEMPO
 Moves = 0,EERIESPELL,1,EERIESPELL,1,POWERGEM,1,NASTYPLOT,1,SWAGGER,1,TACKLE,1,CURSE,1,GROWL,1,ACID,9,YAWN,12,CONFUSION,15,DISABLE,18,WATERPULSE,21,HEADBUTT,24,ZENHEADBUTT,27,AMNESIA,30,SURF,33,SLACKOFF,36,PSYCHIC,39,PSYCHUP,42,RAINDANCE,45,HEALPULSE
@@ -777,7 +749,7 @@ Generation = 6
 #-------------------------------
 [CORSOLA,1]
 FormName = Galarian
-Type1 = GHOST
+Types = GHOST
 BaseStats = 60,55,100,30,65,100
 Abilities = WEAKARMOR
 HiddenAbilities = CURSEDBODY
@@ -817,8 +789,7 @@ Generation = 6
 [SCEPTILE,1]
 FormName = Mega Sceptile
 MegaStone = SCEPTILITE
-Type1 = GRASS
+Types = GRASS,DRAGON
-Type2 = DRAGON
 BaseStats = 70,110,75,145,145,85
 BaseExp = 315
 Abilities = LIGHTNINGROD
@@ -848,8 +819,7 @@ Generation = 6
 #-------------------------------
 [ZIGZAGOON,1]
 FormName = Galarian
-Type1 = DARK
+Types = DARK,NORMAL
-Type2 = NORMAL
 Moves = 1,TACKLE,1,LEER,3,SANDATTACK,6,LICK,9,SNARL,12,HEADBUTT,15,BABYDOLLEYES,18,PINMISSILE,21,REST,24,TAKEDOWN,27,SCARYFACE,30,COUNTER,33,TAUNT,36,DOUBLEEDGE
 TutorMoves = ASSURANCE,ATTRACT,BLIZZARD,BODYSLAM,DIG,ENDURE,FACADE,FAKETEARS,FLING,GRASSKNOT,GUNKSHOT,HELPINGHAND,HIDDENPOWER,HYPERVOICE,ICEBEAM,ICYWIND,IRONTAIL,LASHOUT,MUDSHOT,PAYBACK,PINMISSILE,PROTECT,RAINDANCE,REST,RETALIATE,ROUND,SCARYFACE,SCREECH,SEEDBOMB,SHADOWBALL,SLEEPTALK,SNARL,SNORE,SUBSTITUTE,SUNNYDAY,SURF,SWIFT,TAUNT,THIEF,THUNDER,THUNDERBOLT,THUNDERWAVE,TRICK,WHIRLPOOL,WORKUP
 EggMoves = KNOCKOFF,PARTINGSHOT,QUICKGUARD
@@ -860,8 +830,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [LINOONE,1]
 FormName = Galarian
-Type1 = DARK
+Types = DARK,NORMAL
-Type2 = NORMAL
 Moves = 0,NIGHTSLASH,1,NIGHTSLASH,1,SWITCHEROO,1,PINMISSILE,1,BABYDOLLEYES,1,TACKLE,1,LEER,1,SANDATTACK,1,LICK,9,SNARL,12,HEADBUTT,15,HONECLAWS,18,FURYSWIPES,23,REST,28,TAKEDOWN,33,SCARYFACE,38,COUNTER,43,TAUNT,48,DOUBLEEDGE
 TutorMoves = ASSURANCE,ATTRACT,BLIZZARD,BODYPRESS,BODYSLAM,DIG,ENDURE,FACADE,FAKETEARS,FLING,GIGAIMPACT,GRASSKNOT,GUNKSHOT,HELPINGHAND,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONTAIL,LASHOUT,MUDSHOT,PAYBACK,PINMISSILE,PROTECT,RAINDANCE,REST,RETALIATE,ROUND,SCARYFACE,SCREECH,SEEDBOMB,SHADOWBALL,SHADOWCLAW,SLEEPTALK,SNARL,SNORE,STOMPINGTANTRUM,SUBSTITUTE,SUNNYDAY,SURF,SWIFT,TAUNT,THIEF,THROATCHOP,THUNDER,THUNDERBOLT,THUNDERWAVE,TRICK,WHIRLPOOL,WORKUP
 Pokedex = It uses its long tongue to taunt opponents. Once the opposition is enraged, this Pokémon hurls itself at the opponent, tackling them forcefully.
@@ -904,7 +873,7 @@ Generation = 6
 [AGGRON,1]
 FormName = Mega Aggron
 MegaStone = AGGRONITE
-Type1 = STEEL
+Types = STEEL
 BaseStats = 70,140,230,50,60,80
 Abilities = FILTER
 HiddenAbilities = FILTER
@@ -958,8 +927,7 @@ Generation = 6
 [ALTARIA,1]
 FormName = Mega Altaria
 MegaStone = ALTARIANITE
-Type1 = DRAGON
+Types = DRAGON,FAIRY
-Type2 = FAIRY
 BaseStats = 75,110,110,80,110,105
 BaseExp = 207
 Abilities = PIXILATE
@@ -969,19 +937,19 @@ Generation = 6
 #-------------------------------
 [CASTFORM,1]
 FormName = Sunny Form
-Type1 = FIRE
+Types = FIRE
 Color = Red
 Pokedex = This is the form Castform takes on the brightest of days. Its skin is unexpectedly hot to the touch, so approach with care.
 #-------------------------------
 [CASTFORM,2]
 FormName = Rainy Form
-Type1 = WATER
+Types = WATER
 Color = Blue
 Pokedex = This is the form Castform takes when soaked with rain. When its body is compressed, water will seep out as if from a sponge.
 #-------------------------------
 [CASTFORM,3]
 FormName = Snowy Form
-Type1 = ICE
+Types = ICE
 Color = White
 Pokedex = This is the form Castform takes when covered in snow. Its body becomes an ice-like material, with a temperature near -5 degrees Celsius.
 #-------------------------------
@@ -1075,8 +1043,7 @@ Generation = 6
 #-------------------------------
 [GROUDON,1]
 FormName = Primal Groudon
-Type1 = GROUND
+Types = GROUND,FIRE
-Type2 = FIRE
 BaseStats = 100,180,160,90,150,90
 BaseExp = 385
 Abilities = DESOLATELAND
@@ -1127,8 +1094,7 @@ Color = Red
 #-------------------------------
 [WORMADAM,1]
 FormName = Sandy Cloak
-Type1 = BUG
+Types = BUG,GROUND
-Type2 = GROUND
 BaseStats = 60,79,105,36,59,85
 EVs = 0,0,2,0,0,0
 Moves = 0,QUIVERDANCE,1,QUIVERDANCE,1,SUCKERPUNCH,1,TACKLE,1,PROTECT,1,BUGBITE,10,PROTECT,15,BUGBITE,20,HIDDENPOWER,23,CONFUSION,26,ROCKBLAST,29,HARDEN,32,PSYBEAM,35,CAPTIVATE,38,FLAIL,41,ATTRACT,44,PSYCHIC,47,FISSURE,50,BUGBUZZ
@@ -1137,8 +1103,7 @@ Color = Brown
 #-------------------------------
 [WORMADAM,2]
 FormName = Trash Cloak
-Type1 = BUG
+Types = BUG,STEEL
-Type2 = STEEL
 BaseStats = 60,69,95,36,69,95
 EVs = 0,0,1,0,0,1
 Moves = 0,QUIVERDANCE,1,QUIVERDANCE,1,METALBURST,1,SUCKERPUNCH,1,TACKLE,1,PROTECT,1,BUGBITE,10,PROTECT,15,BUGBITE,20,HIDDENPOWER,23,CONFUSION,26,MIRRORSHOT,29,METALSOUND,32,PSYBEAM,35,CAPTIVATE,38,FLAIL,41,ATTRACT,44,PSYCHIC,47,IRONHEAD,50,BUGBUZZ
@@ -1163,8 +1128,7 @@ Pokedex = Its body is covered in a sticky slime. It's very susceptible to dehydr
 [LOPUNNY,1]
 FormName = Mega Lopunny
 MegaStone = LOPUNNITE
-Type1 = NORMAL
+Types = NORMAL,FIGHTING
-Type2 = FIGHTING
 BaseStats = 65,136,94,135,54,96
 BaseExp = 203
 Abilities = SCRAPPY
@@ -1218,40 +1182,35 @@ Generation = 6
 #-------------------------------
 [ROTOM,1]
 FormName = Heat Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,FIRE
-Type2 = FIRE
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = This Rotom has possessed a convection microwave oven that uses a special motor. It also has a flair for manipulating flames.
 #-------------------------------
 [ROTOM,2]
 FormName = Wash Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,WATER
-Type2 = WATER
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = This form of Rotom enjoys coming up with water-based pranks. Be careful with it if you don't want your room flooded.
 #-------------------------------
 [ROTOM,3]
 FormName = Frost Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,ICE
-Type2 = ICE
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = Rotom assumes this form when it takes over a refrigerator powered by a special motor. It battles by spewing cold air.
 #-------------------------------
 [ROTOM,4]
 FormName = Fan Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,FLYING
-Type2 = FLYING
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = In this form, Rotom applies its new power over wind to its love of pranks. It will happily blow away any important documents it can find.
 #-------------------------------
 [ROTOM,5]
 FormName = Mow Rotom
-Type1 = ELECTRIC
+Types = ELECTRIC,GRASS
-Type2 = GRASS
 BaseStats = 50,65,107,86,105,107
 BaseExp = 182
 Pokedex = This is Rotom after it's seized control of a lawn mower that has a special motor. As it mows down grass, it scatters the clippings everywhere.
@@ -1268,8 +1227,7 @@ Shape = Serpentine
 #-------------------------------
 [SHAYMIN,1]
 FormName = Sky Forme
-Type1 = GRASS
+Types = GRASS,FLYING
-Type2 = FLYING
 BaseStats = 100,103,75,127,120,75
 EVs = 0,0,0,3,0,0
 Abilities = SERENEGRACE
@@ -1280,83 +1238,82 @@ Weight = 5.2
 #-------------------------------
 [ARCEUS,1]
 FormName = Fighting Type
-Type1 = FIGHTING
+Types = FIGHTING
 #-------------------------------
 [ARCEUS,2]
 FormName = Flying Type
-Type1 = FLYING
+Types = FLYING
 #-------------------------------
 [ARCEUS,3]
 FormName = Poison Type
-Type1 = POISON
+Types = POISON
 #-------------------------------
 [ARCEUS,4]
 FormName = Ground Type
-Type1 = GROUND
+Types = GROUND
 #-------------------------------
 [ARCEUS,5]
 FormName = Rock Type
-Type1 = ROCK
+Types = ROCK
 #-------------------------------
 [ARCEUS,6]
 FormName = Bug Type
-Type1 = BUG
+Types = BUG
 #-------------------------------
 [ARCEUS,7]
 FormName = Ghost Type
-Type1 = GHOST
+Types = GHOST
 #-------------------------------
 [ARCEUS,8]
 FormName = Steel Type
-Type1 = STEEL
+Types = STEEL
 #-------------------------------
 [ARCEUS,9]
 FormName = Unknown Type
-Type1 = QMARKS
+Types = QMARKS
 #-------------------------------
 [ARCEUS,10]
 FormName = Fire Type
-Type1 = FIRE
+Types = FIRE
 #-------------------------------
 [ARCEUS,11]
 FormName = Water Type
-Type1 = WATER
+Types = WATER
 #-------------------------------
 [ARCEUS,12]
 FormName = Grass Type
-Type1 = GRASS
+Types = GRASS
 #-------------------------------
 [ARCEUS,13]
 FormName = Electric Type
-Type1 = ELECTRIC
+Types = ELECTRIC
 #-------------------------------
 [ARCEUS,14]
 FormName = Psychic Type
-Type1 = PSYCHIC
+Types = PSYCHIC
 #-------------------------------
 [ARCEUS,15]
 FormName = Ice Type
-Type1 = ICE
+Types = ICE
 #-------------------------------
 [ARCEUS,16]
 FormName = Dragon Type
-Type1 = DRAGON
+Types = DRAGON
 TutorMoves = AERIALACE,AQUATAIL,BLIZZARD,BRICKBREAK,BULLDOZE,CALMMIND,CHARGEBEAM,CONFIDE,CUT,DARKPULSE,DEFOG,DIVE,DOUBLETEAM,DRACOMETEOR,DRAGONCLAW,DRAGONPULSE,DREAMEATER,EARTHPOWER,EARTHQUAKE,ECHOEDVOICE,ENERGYBALL,FACADE,FIREBLAST,FLAMETHROWER,FLASHCANNON,FLY,FOCUSBLAST,FRUSTRATION,GIGADRAIN,GIGAIMPACT,GRASSKNOT,GRAVITY,HAIL,HEATWAVE,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONDEFENSE,IRONHEAD,IRONTAIL,LASERFOCUS,LASTRESORT,LIGHTSCREEN,LIQUIDATION,MAGICCOAT,OUTRAGE,OVERHEAT,PAYBACK,POISONJAB,PROTECT,PSYCHIC,PSYCHUP,PSYSHOCK,QUASH,RAINDANCE,RECYCLE,REFLECT,REST,RETURN,ROAR,ROCKSLIDE,ROCKSMASH,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SHADOWBALL,SHADOWCLAW,SHOCKWAVE,SIGNALBEAM,SLEEPTALK,SLUDGEBOMB,SNARL,SNORE,SOLARBEAM,STEALTHROCK,STONEEDGE,STRENGTH,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWORDSDANCE,TAILWIND,TELEKINESIS,THUNDER,THUNDERBOLT,THUNDERWAVE,TOXIC,TRICK,TRICKROOM,WATERFALL,WATERPULSE,WILLOWISP,WORKUP,XSCISSOR,ZENHEADBUTT
 #-------------------------------
 [ARCEUS,17]
 FormName = Dark Type
-Type1 = DARK
+Types = DARK
 #-------------------------------
 [ARCEUS,18]
 FormName = Fairy Type
-Type1 = FAIRY
+Types = FAIRY
 Generation = 6
 #-------------------------------
 [AUDINO,1]
 FormName = Mega Audino
 MegaStone = AUDINITE
-Type1 = NORMAL
+Types = NORMAL,FAIRY
-Type2 = FAIRY
 BaseStats = 103,60,126,50,80,126
 BaseExp = 425
 Abilities = HEALER
@@ -1374,7 +1331,7 @@ WildItemUncommon = DEEPSEASCALE
 #-------------------------------
 [DARUMAKA,2]
 FormName = Galarian
-Type1 = ICE
+Types = ICE
 Moves = 1,POWDERSNOW,1,TACKLE,4,TAUNT,8,BITE,12,AVALANCHE,16,WORKUP,20,ICEFANG,24,HEADBUTT,28,ICEPUNCH,32,UPROAR,36,BELLYDRUM,40,BLIZZARD,44,THRASH,48,SUPERPOWER
 TutorMoves = ATTRACT,AVALANCHE,BLIZZARD,BRICKBREAK,DIG,ENCORE,ENDURE,FACADE,FIREBLAST,FIREFANG,FIREPUNCH,FIRESPIN,FLAMETHROWER,FLAREBLITZ,FLING,FOCUSENERGY,GRASSKNOT,GYROBALL,HEATWAVE,HIDDENPOWER,ICEBEAM,ICEFANG,ICEPUNCH,MEGAKICK,MEGAPUNCH,OVERHEAT,PROTECT,REST,ROCKSLIDE,ROCKTOMB,ROUND,SLEEPTALK,SNORE,SOLARBEAM,SUBSTITUTE,SUNNYDAY,SUPERPOWER,TAUNT,THIEF,UPROAR,UTURN,WILLOWISP,WORKUP,ZENHEADBUTT
 EggMoves = FLAMEWHEEL,FOCUSPUNCH,FREEZEDRY,HAMMERARM,INCINERATE,POWERUPPUNCH,TAKEDOWN,YAWN
@@ -1388,8 +1345,7 @@ Evolutions = DARMANITAN,Item,ICESTONE
 #-------------------------------
 [DARMANITAN,1]
 FormName = Zen Mode
-Type1 = FIRE
+Types = FIRE,PSYCHIC
-Type2 = PSYCHIC
 BaseStats = 105,30,105,55,140,105
 BaseExp = 189
 EVs = 0,0,0,0,2,0
@@ -1398,7 +1354,7 @@ Pokedex = When wounded, it stops moving. It goes as still as stone to meditate,
 #-------------------------------
 [DARMANITAN,2]
 FormName = Galarian Standard Mode
-Type1 = ICE
+Types = ICE
 Abilities = GORILLATACTICS
 Moves = 0,ICICLECRASH,1,ICICLECRASH,1,POWDERSNOW,1,TACKLE,1,TAUNT,1,BITE,12,AVALANCHE,16,WORKUP,20,ICEFANG,24,HEADBUTT,28,ICEPUNCH,32,UPROAR,38,BELLYDRUM,44,BLIZZARD,50,THRASH,56,SUPERPOWER
 TutorMoves = ATTRACT,AVALANCHE,BLIZZARD,BODYPRESS,BODYSLAM,BRICKBREAK,BULKUP,BULLDOZE,BURNINGJEALOUSY,DIG,EARTHQUAKE,ENCORE,ENDURE,FACADE,FIREBLAST,FIREFANG,FIREPUNCH,FIRESPIN,FLAMETHROWER,FLAREBLITZ,FLING,FOCUSBLAST,FOCUSENERGY,GIGAIMPACT,GRASSKNOT,GYROBALL,HEATWAVE,HIDDENPOWER,HYPERBEAM,ICEBEAM,ICEFANG,ICEPUNCH,IRONDEFENSE,IRONHEAD,LASHOUT,MEGAKICK,MEGAPUNCH,OVERHEAT,PAYBACK,PROTECT,PSYCHIC,REST,REVERSAL,ROCKSLIDE,ROCKTOMB,ROUND,SLEEPTALK,SNORE,SOLARBEAM,STONEEDGE,SUBSTITUTE,SUNNYDAY,SUPERPOWER,TAUNT,THIEF,UPROAR,UTURN,WILLOWISP,WORKUP,ZENHEADBUTT
@@ -1412,8 +1368,7 @@ Flags = InheritFormWithEverStone
 #-------------------------------
 [DARMANITAN,3]
 FormName = Galarian Zen Mode
-Type1 = ICE
+Types = ICE,FIRE
-Type2 = FIRE
 BaseStats = 105,160,55,135,30,55
 BaseExp = 189
 EVs = 0,0,0,0,2,0
@@ -1429,8 +1384,7 @@ Generation = 8
 #-------------------------------
 [YAMASK,1]
 FormName = Galarian
-Type1 = GROUND
+Types = GROUND,GHOST
-Type2 = GHOST
 BaseStats = 38,55,85,30,30,65
 Abilities = WANDERINGSPIRIT
 Moves = 1,ASTONISH,1,PROTECT,4,HAZE,8,NIGHTSHADE,12,DISABLE,16,BRUTALSWING,20,CRAFTYSHIELD,24,HEX,28,MEANLOOK,32,SLAM,36,CURSE,40,SHADOWBALL,44,EARTHQUAKE,48,POWERSPLIT,48,GUARDSPLIT,52,DESTINYBOND
@@ -1463,8 +1417,7 @@ FormName = Winter Form
 #-------------------------------
 [STUNFISK,1]
 FormName = Galarian
-Type1 = GROUND
+Types = GROUND,STEEL
-Type2 = STEEL
 BaseStats = 109,81,99,32,66,84
 Abilities = MIMICRY
 HiddenAbilities = MIMICRY
@@ -1550,8 +1503,7 @@ Pokedex = The power that lay hidden in its body now covers its horn, turning it
 #-------------------------------
 [MELOETTA,1]
 FormName = Pirouette Forme
-Type1 = NORMAL
+Types = NORMAL,FIGHTING
-Type2 = FIGHTING
 BaseStats = 100,128,90,128,77,77
 EVs = 0,1,1,1,0,0
 #-------------------------------
@@ -1824,8 +1776,7 @@ Weight = 27.8
 #-------------------------------
 [HOOPA,1]
 FormName = Hoopa Unbound
-Type1 = PSYCHIC
+Types = PSYCHIC,DARK
-Type2 = DARK
 BaseStats = 80,160,60,80,170,130
 BaseExp = 340
 Moves = 1,HYPERSPACEFURY,1,TRICK,1,DESTINYBOND,1,ALLYSWITCH,1,CONFUSION,6,ASTONISH,10,MAGICCOAT,15,LIGHTSCREEN,19,PSYBEAM,25,SKILLSWAP,29,POWERSPLIT,29,GUARDSPLIT,46,KNOCKOFF,50,WONDERROOM,50,TRICKROOM,55,DARKPULSE,75,PSYCHIC,85,HYPERSPACEFURY
@@ -1835,22 +1786,19 @@ Shape = BipedalTail
 #-------------------------------
 [ORICORIO,1]
 FormName = Pom-Pom Style
-Type1 = ELECTRIC
+Types = ELECTRIC,FLYING
-Type2 = FLYING
 Color = Yellow
 Pokedex = It creates an electric charge by rubbing its feathers together. It dances over to its enemies and delivers shocking electrical punches.
 #-------------------------------
 [ORICORIO,2]
 FormName = Pa'u Style
-Type1 = PSYCHIC
+Types = PSYCHIC,FLYING
-Type2 = FLYING
 Color = Pink
 Pokedex = This Oricorio relaxes by swaying gently. This increases its psychic energy, which it then fires at its enemies.
 #-------------------------------
 [ORICORIO,3]
 FormName = Sensu Style
-Type1 = GHOST
+Types = GHOST,FLYING
-Type2 = FLYING
 Color = Purple
 Pokedex = It summons the dead with its dreamy dancing. From their malice, it draws power with which to curse its enemies.
 #-------------------------------
@@ -1893,76 +1841,76 @@ Pokedex = Weak Wishiwashi school together to concentrate their power. Their unit
 #-------------------------------
 [SILVALLY,1]
 FormName = Type: Fighting
-Type1 = FIGHTING
+Types = FIGHTING
 #-------------------------------
 [SILVALLY,2]
 FormName = Type: Flying
-Type1 = FLYING
+Types = FLYING
 #-------------------------------
 [SILVALLY,3]
 FormName = Type: Poison
-Type1 = POISON
+Types = POISON
 #-------------------------------
 [SILVALLY,4]
 FormName = Type: Ground
-Type1 = GROUND
+Types = GROUND
 #-------------------------------
 [SILVALLY,5]
 FormName = Type: Rock
-Type1 = ROCK
+Types = ROCK
 #-------------------------------
 [SILVALLY,6]
 FormName = Type: Bug
-Type1 = BUG
+Types = BUG
 #-------------------------------
 [SILVALLY,7]
 FormName = Type: Ghost
-Type1 = GHOST
+Types = GHOST
 #-------------------------------
 [SILVALLY,8]
 FormName = Type: Steel
-Type1 = STEEL
+Types = STEEL
 #-------------------------------
 [SILVALLY,9]
 FormName = Type: Unknown
-Type1 = QMARKS
+Types = QMARKS
 #-------------------------------
 [SILVALLY,10]
 FormName = Type: Fire
-Type1 = FIRE
+Types = FIRE
 #-------------------------------
 [SILVALLY,11]
 FormName = Type: Water
-Type1 = WATER
+Types = WATER
 #-------------------------------
 [SILVALLY,12]
 FormName = Type: Grass
-Type1 = GRASS
+Types = GRASS
 #-------------------------------
 [SILVALLY,13]
 FormName = Type: Electric
-Type1 = ELECTRIC
+Types = ELECTRIC
 #-------------------------------
 [SILVALLY,14]
 FormName = Type: Psychic
-Type1 = PSYCHIC
+Types = PSYCHIC
 #-------------------------------
 [SILVALLY,15]
 FormName = Type: Ice
-Type1 = ICE
+Types = ICE
 #-------------------------------
 [SILVALLY,16]
 FormName = Type: Dragon
-Type1 = DRAGON
+Types = DRAGON
 TutorMoves = AERIALACE,CONFIDE,DEFOG,DOUBLETEAM,DRACOMETEOR,DRAGONCLAW,EXPLOSION,FACADE,FLAMECHARGE,FLAMETHROWER,FLASHCANNON,FRUSTRATION,GIGAIMPACT,GRASSPLEDGE,HAIL,HEATWAVE,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONDEFENSE,IRONHEAD,LASERFOCUS,LASTRESORT,MAGICCOAT,OUTRAGE,PAYBACK,PROTECT,RAINDANCE,REST,RETURN,ROAR,ROCKSLIDE,ROUND,SANDSTORM,SHADOWBALL,SHADOWCLAW,SIGNALBEAM,SLEEPTALK,SNARL,SNORE,STEELWING,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWORDSDANCE,TAILWIND,THUNDERBOLT,THUNDERWAVE,TOXIC,UTURN,WORKUP,XSCISSOR,ZENHEADBUTT
 #-------------------------------
 [SILVALLY,17]
 FormName = Type: Dark
-Type1 = DARK
+Types = DARK
 #-------------------------------
 [SILVALLY,18]
 FormName = Type: Fairy
-Type1 = FAIRY
+Types = FAIRY
 #-------------------------------
 [MINIOR,7]
 FormName = Red Core
@@ -2040,8 +1988,7 @@ Pokedex = Sad that its true identity may be exposed, Mimikyu will mercilessly se
 #-------------------------------
 [NECROZMA,1]
 FormName = Dusk Mane
-Type1 = PSYCHIC
+Types = PSYCHIC,STEEL
-Type2 = STEEL
 BaseStats = 97,157,127,77,113,109
 BaseExp = 340
 EVs = 0,3,0,0,0,0
@@ -2053,8 +2000,7 @@ Pokedex = This is Necrozma's form while it's absorbing the power of Solgaleo, ma
 #-------------------------------
 [NECROZMA,2]
 FormName = Dawn Wings
-Type1 = PSYCHIC
+Types = PSYCHIC,GHOST
-Type2 = GHOST
 BaseStats = 97,113,109,77,157,127
 BaseExp = 340
 EVs = 0,0,0,0,3,0
@@ -2065,8 +2011,7 @@ Pokedex = Lunala no longer has a will of its own. Now under the control of Necro
 #-------------------------------
 [NECROZMA,3]
 FormName = Ultra Necrozma
-Type1 = PSYCHIC
+Types = PSYCHIC,DRAGON
-Type2 = DRAGON
 BaseStats = 97,167,97,129,167,97
 BaseExp = 377
 EVs = 0,1,0,1,1,0
@@ -2077,8 +2022,7 @@ Pokedex = The light pouring out from all over its body affects living things and
 #-------------------------------
 [NECROZMA,4]
 PokedexForm = 3
-Type1 = PSYCHIC
+Types = PSYCHIC,DRAGON
-Type2 = DRAGON
 BaseStats = 97,167,97,129,167,97
 BaseExp = 377
 EVs = 0,1,0,1,1,0
@@ -2319,8 +2263,7 @@ Pokedex = Hunger hormones affect its temperament. Until its hunger is appeased,
 #-------------------------------
 [ZACIAN,1]
 FormName = Crowned Sword
-Type1 = FAIRY
+Types = FAIRY,STEEL
-Type2 = STEEL
 BaseStats = 92,170,115,148,80,115
 BaseExp = 360
 Weight = 355.0
@@ -2328,8 +2271,7 @@ Pokedex = Able to cut down anything with a single strike, it became known as the
 #-------------------------------
 [ZAMAZENTA,1]
 FormName = Crowned Shield
-Type1 = FIGHTING
+Types = FIGHTING,STEEL
-Type2 = STEEL
 BaseStats = 92,130,145,128,80,145
 BaseExp = 360
 Weight = 785.0
@@ -2337,16 +2279,14 @@ Pokedex = Its ability to deflect any attack led to it being known as the Fightin
 #-------------------------------
 [URSHIFU,1]
 FormName = Rapid Strike Style
-Type1 = FIGHTING
+Types = FIGHTING,WATER
-Type2 = WATER
 Moves = 0,SURGINGSTRIKES,1,SURGINGSTRIKES,1,AQUAJET,1,ROCKSMASH,1,LEER,1,ENDURE,1,FOCUSENERGY,12,AERIALACE,16,SCARYFACE,20,HEADBUTT,24,BRICKBREAK,28,DETECT,32,BULKUP,36,IRONHEAD,40,DYNAMICPUNCH,44,COUNTER,48,CLOSECOMBAT,52,FOCUSPUNCH
 TutorMoves = ACROBATICS,ATTRACT,AURASPHERE,BODYPRESS,BODYSLAM,BRICKBREAK,BRINE,BULKUP,CLOSECOMBAT,COACHING,DIG,DIVE,DRAINPUNCH,ENDURE,FACADE,FALSESWIPE,FIREPUNCH,FOCUSBLAST,FOCUSENERGY,GIGAIMPACT,HELPINGHAND,ICEPUNCH,IRONDEFENSE,IRONHEAD,LIQUIDATION,LOWKICK,LOWSWEEP,MEGAKICK,MEGAPUNCH,POISONJAB,PROTECT,RAINDANCE,REST,RETALIATE,REVENGE,REVERSAL,ROCKSLIDE,ROCKTOMB,ROUND,SCALD,SCARYFACE,SLEEPTALK,SNORE,STONEEDGE,SUBSTITUTE,SUPERPOWER,SWIFT,TAUNT,THUNDERPUNCH,UTURN,WATERFALL,WHIRLPOOL,WORKUP,ZENHEADBUTT
 Pokedex = It's believed that this Pokémon modeled its fighting style on the flow of a river—sometimes rapid, sometimes calm.
 #-------------------------------
 [CALYREX,1]
 FormName = Ice Rider
-Type1 = PSYCHIC
+Types = PSYCHIC,ICE
-Type2 = ICE
 BaseStats = 100,165,150,50,85,130
 BaseExp = 340
 EVs = 0,3,0,0,0,0
@@ -2362,8 +2302,7 @@ Pokedex = According to lore, this Pokémon showed no mercy to those who got in i
 #-------------------------------
 [CALYREX,2]
 FormName = Shadow Rider
-Type1 = PSYCHIC
+Types = PSYCHIC,GHOST
-Type2 = GHOST
 BaseStats = 100,85,80,150,165,100
 BaseExp = 340
 EVs = 0,0,0,0,3,0