diff --git a/.gitignore b/.gitignore
index 7b0d9e9c7..ab1bd6b25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 Audio/
 Graphics/
 Plugins/
+Screenshots/
 
 # Data folder, but not Data/Scripts folder or messages_core.dat
 Data/*
@@ -10,6 +11,7 @@ Data/*
 !Data/messages_core.dat
 
 # Files in the main project folder
+errorlog.txt
 Game.ini
 Game.rxproj
 RGSS*.dll
diff --git a/Data/Scripts.rxdata b/Data/Scripts.rxdata
index cecb93c53..d5b92295e 100644
Binary files a/Data/Scripts.rxdata and b/Data/Scripts.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index 88edb57b9..8f2aacb86 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -16,7 +16,34 @@ module Settings
   # generations 5 and later are reasonably supported.
   MECHANICS_GENERATION = 8
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Credits
+  #-----------------------------------------------------------------------------
+
+  # Your game's credits, in an array. You can allow certain lines to be
+  # translated by wrapping them in _INTL() as shown. Blank lines are just "".
+  # To split a line into two columns, put "<s>" in it. Plugin credits and
+  # Essentials engine credits are added to the end of these credits
+  # automatically.
+  def self.game_credits
+    return [
+      _INTL("My Game by:"),
+      "Maruno",
+      "",
+      _INTL("Also involved were:"),
+      "A. Lee Uss<s>Anne O'Nymus",
+      "Ecksam Pell<s>Jane Doe",
+      "Joe Dan<s>Nick Nayme",
+      "Sue Donnim<s>",
+      "",
+      _INTL("Special thanks to:"),
+      "Pizza"
+    ]
+  end
+
+  #-----------------------------------------------------------------------------
+  # The player and NPCs
+  #-----------------------------------------------------------------------------
 
   # The maximum amount of money the player can have.
   MAX_MONEY            = 999_999
@@ -28,128 +55,6 @@ module Settings
   MAX_SOOT             = 9_999
   # The maximum length, in characters, that the player's name can be.
   MAX_PLAYER_NAME_SIZE = 10
-  # The maximum number of Pokémon that can be in the party.
-  MAX_PARTY_SIZE       = 6
-  # The maximum level Pokémon can reach.
-  MAXIMUM_LEVEL        = 100
-  # The level of newly hatched Pokémon.
-  EGG_LEVEL            = 1
-  # The odds of a newly generated Pokémon being shiny (out of 65536).
-  SHINY_POKEMON_CHANCE = (MECHANICS_GENERATION >= 6) ? 16 : 8
-  # Whether super shininess is enabled (uses a different shiny animation).
-  SUPER_SHINY          = (MECHANICS_GENERATION >= 8)
-  # The odds of a wild Pokémon/bred egg having Pokérus (out of 65536).
-  POKERUS_CHANCE       = 3
-  # Whether IVs and EVs are treated as 0 when calculating a Pokémon's stats.
-  # IVs and EVs still exist, and are used by Hidden Power and some cosmetic
-  # things as normal.
-  DISABLE_IVS_AND_EVS  = false
-
-  #=============================================================================
-
-  # Whether outdoor maps should be shaded according to the time of day.
-  TIME_SHADING                               = true
-  # Whether the reflections of the player/events will ripple horizontally.
-  ANIMATE_REFLECTIONS                        = true
-  # Whether poisoned Pokémon will lose HP while walking around in the field.
-  POISON_IN_FIELD                            = (MECHANICS_GENERATION <= 4)
-  # Whether poisoned Pokémon will faint while walking around in the field
-  # (true), or survive the poisoning with 1 HP (false).
-  POISON_FAINT_IN_FIELD                      = (MECHANICS_GENERATION <= 3)
-  # Whether planted berries grow according to Gen 4 mechanics (true) or Gen 3
-  # mechanics (false).
-  NEW_BERRY_PLANTS                           = (MECHANICS_GENERATION >= 4)
-  # Whether fishing automatically hooks the Pokémon (true), or whether there is
-  # a reaction test first (false).
-  FISHING_AUTO_HOOK                          = false
-  # The ID of the common event that runs when the player starts fishing (runs
-  # instead of showing the casting animation).
-  FISHING_BEGIN_COMMON_EVENT                 = -1
-  # The ID of the common event that runs when the player stops fishing (runs
-  # instead of showing the reeling in animation).
-  FISHING_END_COMMON_EVENT                   = -1
-  # Whether Pokémon in the Day Care gain Exp for each step the player takes.
-  # This is true for the Day Care and false for the Pokémon Nursery, both of
-  # which use the same code in Essentials.
-  DAY_CARE_POKEMON_GAIN_EXP_FROM_WALKING     = (MECHANICS_GENERATION <= 6)
-  # Whether two Pokémon in the Day Care can learn egg moves from each other if
-  # they are the same species.
-  DAY_CARE_POKEMON_CAN_SHARE_EGG_MOVES       = (MECHANICS_GENERATION >= 8)
-  # Whether a bred baby Pokémon can inherit any TM/TR/HM moves from its father.
-  # It can never inherit TM/TR/HM moves from its mother.
-  BREEDING_CAN_INHERIT_MACHINE_MOVES         = (MECHANICS_GENERATION <= 5)
-  # Whether a bred baby Pokémon can inherit egg moves from its mother. It can
-  # always inherit egg moves from its father.
-  BREEDING_CAN_INHERIT_EGG_MOVES_FROM_MOTHER = (MECHANICS_GENERATION >= 6)
-  # Whether the Pokédex entry of a newly owned species will be shown after it
-  # hatches from an egg, after it evolves and after obtaining it from a trade,
-  # in addition to after catching it in battle.
-  SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN  = (MECHANICS_GENERATION >= 7)
-  # Whether you get 1 Premier Ball for every 10 of any kind of Poké Ball bought
-  # at once (true), or 1 Premier Ball for buying 10+ Poké Balls (false).
-  MORE_BONUS_PREMIER_BALLS                   = (MECHANICS_GENERATION >= 8)
-  # The number of steps allowed before a Safari Zone game is over (0=infinite).
-  SAFARI_STEPS                               = 600
-  # The number of seconds a Bug-Catching Contest lasts for (0=infinite).
-  BUG_CONTEST_TIME                           = 20 * 60   # 20 minutes
-
-  #=============================================================================
-
-  # If a move taught by a TM/HM/TR replaces another move, this setting is
-  # whether the machine's move retains the replaced move's PP (true), or whether
-  # the machine's move has full PP (false).
-  TAUGHT_MACHINES_KEEP_OLD_PP          = (MECHANICS_GENERATION == 5)
-  # Whether the Move Relearner can also teach egg moves that the Pokémon knew
-  # when it hatched and moves that the Pokémon was once taught by a TR. Moves
-  # from the Pokémon's level-up moveset of the same or a lower level than the
-  # Pokémon can always be relearned.
-  MOVE_RELEARNER_CAN_TEACH_MORE_MOVES  = (MECHANICS_GENERATION >= 6)
-  # Whether various HP-healing items heal the amounts they do in Gen 7+ (true)
-  # or in earlier Generations (false).
-  REBALANCED_HEALING_ITEM_AMOUNTS      = (MECHANICS_GENERATION >= 7)
-  # Whether Rage Candy Bar acts as a Full Heal (true) or a Potion (false).
-  RAGE_CANDY_BAR_CURES_STATUS_PROBLEMS = (MECHANICS_GENERATION >= 7)
-  # Whether vitamins can add EVs no matter how many that stat already has in it
-  # (true), or whether they can't make that stat's EVs greater than 100 (false).
-  NO_VITAMIN_EV_CAP                    = (MECHANICS_GENERATION >= 8)
-  # Whether Rare Candy can be used on a Pokémon that is already at its maximum
-  # level if it is able to evolve by level-up (if so, triggers that evolution).
-  RARE_CANDY_USABLE_AT_MAX_LEVEL       = (MECHANICS_GENERATION >= 8)
-  # Whether the player can choose how many of an item to use at once on a
-  # Pokémon. This applies to Exp-changing items (Rare Candy, Exp Candies) and
-  # EV-changing items (vitamins, feathers, EV-lowering berries).
-  USE_MULTIPLE_STAT_ITEMS_AT_ONCE      = (MECHANICS_GENERATION >= 8)
-
-  #=============================================================================
-
-  # Whether Repel uses the level of the first Pokémon in the party regardless of
-  # its HP (true), or it uses the level of the first unfainted Pokémon (false).
-  REPEL_COUNTS_FAINTED_POKEMON             = (MECHANICS_GENERATION >= 6)
-  # Whether more abilities affect whether wild Pokémon appear, which Pokémon
-  # they are, etc.
-  MORE_ABILITIES_AFFECT_WILD_ENCOUNTERS    = (MECHANICS_GENERATION >= 8)
-  # Whether the Black/White Flutes will raise/lower the levels of wild Pokémon
-  # respectively (true), or will lower/raise the wild encounter rate
-  # respectively (false).
-  FLUTES_CHANGE_WILD_ENCOUNTER_LEVELS      = (MECHANICS_GENERATION >= 6)
-  # Whether shiny wild Pokémon are more likely to appear if the player has
-  # previously defeated/caught lots of other Pokémon of the same species.
-  HIGHER_SHINY_CHANCES_WITH_NUMBER_BATTLED = (MECHANICS_GENERATION >= 8)
-  # Whether overworld weather can set the default terrain effect in battle.
-  # Storm weather sets Electric Terrain, and fog weather sets Misty Terrain.
-  OVERWORLD_WEATHER_SETS_BATTLE_TERRAIN    = (MECHANICS_GENERATION >= 8)
-  # The default setting for Phone.rematches_enabled, which determines whether
-  # trainers registered in the Phone can become ready for a rematch. If false,
-  # Phone.rematches_enabled = true will enable rematches at any point you want.
-  PHONE_REMATCHES_POSSIBLE_FROM_BEGINNING  = false
-  # Whether the messages in a phone call with a trainer are colored blue or red
-  # depending on that trainer's gender. Note that this doesn't apply to contacts
-  # that are not trainers; they will need to be colored manually in their Common
-  # Events.
-  COLOR_PHONE_CALL_MESSAGES_BY_CONTACT_GENDER = true
-
-  #=============================================================================
-
   # A set of arrays each containing a trainer type followed by a Game Variable
   # number. If the Variable isn't set to 0, then all trainers with the
   # associated trainer type will be named as whatever is in that Variable.
@@ -159,8 +64,46 @@ module Settings
     [:CHAMPION, 12]
   ]
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Overworld
+  #-----------------------------------------------------------------------------
 
+  # Whether outdoor maps should be shaded according to the time of day.
+  TIME_SHADING               = true
+  # Whether the reflections of the player/events will ripple horizontally.
+  ANIMATE_REFLECTIONS        = true
+  # Whether planted berries grow according to Gen 4 mechanics (true) or Gen 3
+  # mechanics (false).
+  NEW_BERRY_PLANTS           = (MECHANICS_GENERATION >= 4)
+  # Whether fishing automatically hooks the Pokémon (true), or whether there is
+  # a reaction test first (false).
+  FISHING_AUTO_HOOK          = false
+  # The ID of the common event that runs when the player starts fishing (runs
+  # instead of showing the casting animation).
+  FISHING_BEGIN_COMMON_EVENT = -1
+  # The ID of the common event that runs when the player stops fishing (runs
+  # instead of showing the reeling in animation).
+  FISHING_END_COMMON_EVENT   = -1
+  # The number of steps allowed before a Safari Zone game is over (0=infinite).
+  SAFARI_STEPS               = 600
+  # The number of seconds a Bug-Catching Contest lasts for (0=infinite).
+  BUG_CONTEST_TIME           = 20 * 60   # 20 minutes
+  # Pairs of map IDs, where the location signpost isn't shown when moving from
+  # one of the maps in a pair to the other (and vice versa). Useful for single
+  # long routes/towns that are spread over multiple maps.
+  #   e.g. [4,5,16,17,42,43] will be map pairs 4,5 and 16,17 and 42,43.
+  # Moving between two maps that have the exact same name won't show the
+  # location signpost anyway, so you don't need to list those maps here.
+  NO_SIGNPOSTS               = []
+  # Whether poisoned Pokémon will lose HP while walking around in the field.
+  POISON_IN_FIELD            = (MECHANICS_GENERATION <= 4)
+  # Whether poisoned Pokémon will faint while walking around in the field
+  # (true), or survive the poisoning with 1 HP (false).
+  POISON_FAINT_IN_FIELD      = (MECHANICS_GENERATION <= 3)
+
+  #-----------------------------------------------------------------------------
+  # Using moves in the overworld
+  #-----------------------------------------------------------------------------
   # Whether you need at least a certain number of badges to use some hidden
   # moves in the field (true), or whether you need one specific badge to use
   # them (false). The amounts/specific badges are defined below.
@@ -180,100 +123,54 @@ module Settings
   BADGE_FOR_DIVE      = 7
   BADGE_FOR_WATERFALL = 8
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Pokémon
+  #-----------------------------------------------------------------------------
 
-  # The names of each pocket of the Bag.
-  def self.bag_pocket_names
-    return [
-      _INTL("Items"),
-      _INTL("Medicine"),
-      _INTL("Poké Balls"),
-      _INTL("TMs & HMs"),
-      _INTL("Berries"),
-      _INTL("Mail"),
-      _INTL("Battle Items"),
-      _INTL("Key Items")
-    ]
-  end
-  # The maximum number of slots per pocket (-1 means infinite number).
-  BAG_MAX_POCKET_SIZE  = [-1, -1, -1, -1, -1, -1, -1, -1]
-  # Whether each pocket in turn auto-sorts itself by item ID number.
-  BAG_POCKET_AUTO_SORT = [false, false, false, true, true, false, false, false]
-  # The maximum number of items each slot in the Bag can hold.
-  BAG_MAX_PER_SLOT     = 999
+  # The maximum level Pokémon can reach.
+  MAXIMUM_LEVEL                       = 100
+  # The level of newly hatched Pokémon.
+  EGG_LEVEL                           = 1
+  # The odds of a newly generated Pokémon being shiny (out of 65536).
+  SHINY_POKEMON_CHANCE                = (MECHANICS_GENERATION >= 6) ? 16 : 8
+  # Whether super shininess is enabled (uses a different shiny animation).
+  SUPER_SHINY                         = (MECHANICS_GENERATION >= 8)
+  # Whether Pokémon with the "Legendary", "Mythical" or "Ultra Beast" flags will
+  # have at least 3 perfect IVs.
+  LEGENDARIES_HAVE_SOME_PERFECT_IVS   = (MECHANICS_GENERATION >= 6)
+  # The odds of a wild Pokémon/bred egg having Pokérus (out of 65536).
+  POKERUS_CHANCE                      = 3
+  # Whether IVs and EVs are treated as 0 when calculating a Pokémon's stats.
+  # IVs and EVs still exist, and are used by Hidden Power and some cosmetic
+  # things as normal.
+  DISABLE_IVS_AND_EVS                 = false
+  # Whether the Move Relearner can also teach egg moves that the Pokémon knew
+  # when it hatched and moves that the Pokémon was once taught by a TR. Moves
+  # from the Pokémon's level-up moveset of the same or a lower level than the
+  # Pokémon can always be relearned.
+  MOVE_RELEARNER_CAN_TEACH_MORE_MOVES = (MECHANICS_GENERATION >= 6)
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Breeding Pokémon and Day Care
+  #-----------------------------------------------------------------------------
 
-  # The number of boxes in Pokémon storage.
-  NUM_STORAGE_BOXES   = 40
-  # Whether putting a Pokémon into Pokémon storage will heal it. IF false, they
-  # are healed by the Recover All: Entire Party event command (at Poké Centers).
-  HEAL_STORED_POKEMON = (MECHANICS_GENERATION <= 7)
+  # Whether Pokémon in the Day Care gain Exp for each step the player takes.
+  # This should be true for the Day Care and false for the Pokémon Nursery, both
+  # of which use the same code in Essentials.
+  DAY_CARE_POKEMON_GAIN_EXP_FROM_WALKING     = (MECHANICS_GENERATION <= 6)
+  # Whether two Pokémon in the Day Care can learn egg moves from each other if
+  # they are the same species.
+  DAY_CARE_POKEMON_CAN_SHARE_EGG_MOVES       = (MECHANICS_GENERATION >= 8)
+  # Whether a bred baby Pokémon can inherit any TM/TR/HM moves from its father.
+  # It can never inherit TM/TR/HM moves from its mother.
+  BREEDING_CAN_INHERIT_MACHINE_MOVES         = (MECHANICS_GENERATION <= 5)
+  # Whether a bred baby Pokémon can inherit egg moves from its mother. It can
+  # always inherit egg moves from its father.
+  BREEDING_CAN_INHERIT_EGG_MOVES_FROM_MOTHER = (MECHANICS_GENERATION >= 6)
 
-  #=============================================================================
-
-  # Whether the Pokédex list shown is the one for the player's current region
-  # (true), or whether a menu pops up for the player to manually choose which
-  # Dex list to view if more than one is available (false).
-  USE_CURRENT_REGION_DEX = false
-  # The names of the Pokédex lists, in the order they are defined in the PBS
-  # file "regional_dexes.txt". The last name is for the National Dex and is
-  # added onto the end of this array (remember that you don't need to use it).
-  # This array's order is also the order of $player.pokedex.unlocked_dexes,
-  # which records which Dexes have been unlocked (the first is unlocked by
-  # default). If an entry is just a name, then the region map shown in the Area
-  # page while viewing that Dex list will be the region map of the region the
-  # player is currently in. The National Dex entry should always behave like
-  # this. If an entry is of the form [name, number], then the number is a region
-  # number, and that region's map will appear in the Area page while viewing
-  # that Dex list, no matter which region the player is currently in.
-  def self.pokedex_names
-    return [
-      [_INTL("Kanto Pokédex"), 0],
-      [_INTL("Johto Pokédex"), 1],
-      _INTL("National Pokédex")
-    ]
-  end
-  # Whether all forms of a given species will be immediately available to view
-  # in the Pokédex so long as that species has been seen at all (true), or
-  # whether each form needs to be seen specifically before that form appears in
-  # the Pokédex (false).
-  DEX_SHOWS_ALL_FORMS = false
-  # An array of numbers, where each number is that of a Dex list (in the same
-  # order as above, except the National Dex is -1). All Dex lists included here
-  # will begin their numbering at 0 rather than 1 (e.g. Victini in Unova's Dex).
-  DEXES_WITH_OFFSETS  = []
-
-  #=============================================================================
-
-  # A set of arrays, each containing details of a graphic to be shown on the
-  # region map if appropriate. The values for each array are as follows:
-  #   * Region number.
-  #   * Game Switch; the graphic is shown if this is ON (non-wall maps only).
-  #   * X coordinate of the graphic on the map, in squares.
-  #   * Y coordinate of the graphic on the map, in squares.
-  #   * Name of the graphic, found in the Graphics/UI/Town Map folder.
-  #   * The graphic will always (true) or never (false) be shown on a wall map.
-  REGION_MAP_EXTRAS = [
-    [0, 51, 16, 15, "hidden_Berth", false],
-    [0, 52, 20, 14, "hidden_Faraday", false]
-  ]
-
-  # Whether the player can use Fly while looking at the Town Map. This is only
-  # allowed if the player can use Fly normally.
-  CAN_FLY_FROM_TOWN_MAP = true
-
-  #=============================================================================
-
-  # Pairs of map IDs, where the location signpost isn't shown when moving from
-  # one of the maps in a pair to the other (and vice versa). Useful for single
-  # long routes/towns that are spread over multiple maps.
-  #   e.g. [4,5,16,17,42,43] will be map pairs 4,5 and 16,17 and 42,43.
-  # Moving between two maps that have the exact same name won't show the
-  # location signpost anyway, so you don't need to list those maps here.
-  NO_SIGNPOSTS = []
-
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Roaming Pokémon
+  #-----------------------------------------------------------------------------
 
   # A list of maps used by roaming Pokémon. Each map has an array of other maps
   # it can lead to.
@@ -294,10 +191,15 @@ module Settings
   #   * Species.
   #   * Level.
   #   * Game Switch; the Pokémon roams while this is ON.
-  #   * Encounter type (0=any, 1=grass/walking in cave, 2=surfing, 3=fishing,
-  #     4=surfing/fishing). See the bottom of PField_RoamingPokemon for lists.
+  #   * Encounter type (see def pbRoamingMethodAllowed for their use):
+  #       0 = grass, walking in cave, surfing
+  #       1 = grass, walking in cave
+  #       2 = surfing
+  #       3 = fishing
+  #       4 = surfing, fishing
   #   * Name of BGM to play for that encounter (optional).
-  #   * Roaming areas specifically for this Pokémon (optional).
+  #   * Roaming areas specifically for this Pokémon (optional; used instead of
+  #     ROAMING_AREAS).
   ROAMING_SPECIES = [
     [:LATIAS, 30, 53, 0, "Battle roaming"],
     [:LATIOS, 30, 53, 0, "Battle roaming"],
@@ -310,7 +212,166 @@ module Settings
     [:ENTEI, 40, 55, 1]
   ]
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Party and Pokémon storage
+  #-----------------------------------------------------------------------------
+
+  # The maximum number of Pokémon that can be in the party.
+  MAX_PARTY_SIZE      = 6
+  # The number of boxes in Pokémon storage.
+  NUM_STORAGE_BOXES   = 40
+  # Whether putting a Pokémon into Pokémon storage will heal it. If false, they
+  # are healed by the Recover All: Entire Party event command (at Poké Centers).
+  HEAL_STORED_POKEMON = (MECHANICS_GENERATION <= 7)
+
+  #-----------------------------------------------------------------------------
+  # Items
+  #-----------------------------------------------------------------------------
+
+  # Whether various HP-healing items heal the amounts they do in Gen 7+ (true)
+  # or in earlier Generations (false).
+  REBALANCED_HEALING_ITEM_AMOUNTS      = (MECHANICS_GENERATION >= 7)
+  # Whether vitamins can add EVs no matter how many that stat already has in it
+  # (true), or whether they can't make that stat's EVs greater than 100 (false).
+  NO_VITAMIN_EV_CAP                    = (MECHANICS_GENERATION >= 8)
+  # Whether Rage Candy Bar acts as a Full Heal (true) or a Potion (false).
+  RAGE_CANDY_BAR_CURES_STATUS_PROBLEMS = (MECHANICS_GENERATION >= 7)
+  # Whether the Black/White Flutes will raise/lower the levels of wild Pokémon
+  # respectively (true), or will lower/raise the wild encounter rate
+  # respectively (false).
+  FLUTES_CHANGE_WILD_ENCOUNTER_LEVELS  = (MECHANICS_GENERATION >= 6)
+  # Whether Rare Candy can be used on a Pokémon that is already at its maximum
+  # level if it is able to evolve by level-up (if so, triggers that evolution).
+  RARE_CANDY_USABLE_AT_MAX_LEVEL       = (MECHANICS_GENERATION >= 8)
+  # Whether the player can choose how many of an item to use at once on a
+  # Pokémon. This applies to Exp-changing items (Rare Candy, Exp Candies) and
+  # EV-changing items (vitamins, feathers, EV-lowering berries).
+  USE_MULTIPLE_STAT_ITEMS_AT_ONCE      = (MECHANICS_GENERATION >= 8)
+  # If a move taught by a TM/HM/TR replaces another move, this setting is
+  # whether the machine's move retains the replaced move's PP (true), or whether
+  # the machine's move has full PP (false).
+  TAUGHT_MACHINES_KEEP_OLD_PP          = (MECHANICS_GENERATION == 5)
+  # Whether you get 1 Premier Ball for every 10 of any kind of Poké Ball bought
+  # from a Mart at once (true), or 1 Premier Ball for buying 10+ regular Poké
+  # Balls (false).
+  MORE_BONUS_PREMIER_BALLS             = (MECHANICS_GENERATION >= 8)
+
+  #-----------------------------------------------------------------------------
+  # Bag
+  #-----------------------------------------------------------------------------
+
+  # The names of each pocket of the Bag.
+  def self.bag_pocket_names
+    return [
+      _INTL("Items"),
+      _INTL("Medicine"),
+      _INTL("Poké Balls"),
+      _INTL("TMs & HMs"),
+      _INTL("Berries"),
+      _INTL("Mail"),
+      _INTL("Battle Items"),
+      _INTL("Key Items")
+    ]
+  end
+  # The maximum number of slots per pocket (-1 means infinite number).
+  BAG_MAX_POCKET_SIZE  = [-1, -1, -1, -1, -1, -1, -1, -1]
+  # Whether each pocket in turn auto-sorts itself by the order items are defined
+  # in the PBS file items.txt.
+  BAG_POCKET_AUTO_SORT = [false, false, false, true, true, false, false, false]
+  # The maximum number of items each slot in the Bag can hold.
+  BAG_MAX_PER_SLOT     = 999
+
+  #-----------------------------------------------------------------------------
+  # Pokédex
+  #-----------------------------------------------------------------------------
+
+  # The names of the Pokédex lists, in the order they are defined in the PBS
+  # file "regional_dexes.txt". The last name is for the National Dex and is
+  # added onto the end of this array.
+  # Each entry is either just a name, or is an array containing a name and a
+  # number. If there is a number, it is a region number as defined in
+  # town_map.txt. If there is no number, the number of the region the player is
+  # currently in will be used. The region number determines which Town Map is
+  # shown in the Area page when viewing that Pokédex list.
+  def self.pokedex_names
+    return [
+      [_INTL("Kanto Pokédex"), 0],
+      [_INTL("Johto Pokédex"), 1],
+      _INTL("National Pokédex")
+    ]
+  end
+  # Whether the Pokédex list shown is the one for the player's current region
+  # (true), or whether a menu pops up for the player to manually choose which
+  # Dex list to view if more than one is available (false).
+  USE_CURRENT_REGION_DEX                    = false
+  # Whether all forms of a given species will be immediately available to view
+  # in the Pokédex so long as that species has been seen at all (true), or
+  # whether each form needs to be seen specifically before that form appears in
+  # the Pokédex (false).
+  DEX_SHOWS_ALL_FORMS                       = false
+  # An array of numbers, where each number is that of a Dex list (in the same
+  # order as above, except the National Dex is -1). All Dex lists included here
+  # will begin their numbering at 0 rather than 1 (e.g. Victini in Unova's Dex).
+  DEXES_WITH_OFFSETS                        = []
+  # Whether the Pokédex entry of a newly owned species will be shown after it
+  # hatches from an egg, after it evolves and after obtaining it from a trade,
+  # in addition to after catching it in battle.
+  SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN = (MECHANICS_GENERATION >= 7)
+
+  #-----------------------------------------------------------------------------
+  # Town Map
+  #-----------------------------------------------------------------------------
+
+  # A set of arrays, each containing details of a graphic to be shown on the
+  # region map if appropriate. The values for each array are as follows:
+  #   * Region number.
+  #   * Game Switch; the graphic is shown if this is ON (non-wall maps only).
+  #   * X coordinate of the graphic on the map, in squares.
+  #   * Y coordinate of the graphic on the map, in squares.
+  #   * Name of the graphic, found in the Graphics/UI/Town Map folder.
+  #   * The graphic will always (true) or never (false) be shown on a wall map.
+  REGION_MAP_EXTRAS = [
+    [0, 51, 16, 15, "hidden_Berth", false],
+    [0, 52, 20, 14, "hidden_Faraday", false]
+  ]
+  # Whether the player can use Fly while looking at the Town Map. This is only
+  # allowed if the player can use Fly normally.
+  CAN_FLY_FROM_TOWN_MAP = true
+
+  #-----------------------------------------------------------------------------
+  # Phone
+  #-----------------------------------------------------------------------------
+
+  # The default setting for Phone.rematches_enabled, which determines whether
+  # trainers registered in the Phone can become ready for a rematch. If false,
+  # Phone.rematches_enabled = true will enable rematches at any point you want.
+  PHONE_REMATCHES_POSSIBLE_FROM_BEGINNING     = false
+  # Whether the messages in a phone call with a trainer are colored blue or red
+  # depending on that trainer's gender. Note that this doesn't apply to contacts
+  # whose phone calls are in a Common Event; they will need to be colored
+  # manually in their Common Events.
+  COLOR_PHONE_CALL_MESSAGES_BY_CONTACT_GENDER = true
+
+  #-----------------------------------------------------------------------------
+  # Battle starting
+  #-----------------------------------------------------------------------------
+
+  # Whether Repel uses the level of the first Pokémon in the party regardless of
+  # its HP (true), or it uses the level of the first unfainted Pokémon (false).
+  REPEL_COUNTS_FAINTED_POKEMON             = (MECHANICS_GENERATION >= 6)
+  # Whether more abilities affect whether wild Pokémon appear, which Pokémon
+  # they are, etc.
+  MORE_ABILITIES_AFFECT_WILD_ENCOUNTERS    = (MECHANICS_GENERATION >= 8)
+  # Whether shiny wild Pokémon are more likely to appear if the player has
+  # previously defeated/caught lots of other Pokémon of the same species.
+  HIGHER_SHINY_CHANCES_WITH_NUMBER_BATTLED = (MECHANICS_GENERATION >= 8)
+  # Whether overworld weather can set the default terrain effect in battle.
+  # Storm weather sets Electric Terrain, and fog weather sets Misty Terrain.
+  OVERWORLD_WEATHER_SETS_BATTLE_TERRAIN    = (MECHANICS_GENERATION >= 8)
+
+  #-----------------------------------------------------------------------------
+  # Game Switches
+  #-----------------------------------------------------------------------------
 
   # The Game Switch that is set to ON when the player blacks out.
   STARTING_OVER_SWITCH      = 1
@@ -327,7 +388,9 @@ module Settings
   # with it.
   DISABLE_BOX_LINK_SWITCH   = 35
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Overworld animation IDs
+  #-----------------------------------------------------------------------------
 
   # ID of the animation played when the player steps on grass (grass rustling).
   GRASS_ANIMATION_ID           = 1
@@ -350,16 +413,9 @@ module Settings
   # is on the map (for new plant growth mechanics only).
   PLANT_SPARKLE_ANIMATION_ID   = 7
 
-  #=============================================================================
-
-  # The default screen width (at a scale of 1.0).
-  SCREEN_WIDTH  = 512
-  # The default screen height (at a scale of 1.0).
-  SCREEN_HEIGHT = 384
-  # The default screen scale factor. Possible values are 0.5, 1.0, 1.5 and 2.0.
-  SCREEN_SCALE  = 1.0
-
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Languages
+  #-----------------------------------------------------------------------------
 
   # An array of available languages in the game. Each one is an array containing
   # the display name of the language in-game, and that language's filename
@@ -371,7 +427,22 @@ module Settings
 #    ["Deutsch", "deutsch"]
   ]
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Screen size and zoom
+  #-----------------------------------------------------------------------------
+
+  # The default screen width (at a scale of 1.0). You should also edit the
+  # property "defScreenW" in mkxp.json to match.
+  SCREEN_WIDTH  = 512
+  # The default screen height (at a scale of 1.0). You should also edit the
+  # property "defScreenH" in mkxp.json to match.
+  SCREEN_HEIGHT = 384
+  # The default screen scale factor. Possible values are 0.5, 1.0, 1.5 and 2.0.
+  SCREEN_SCALE  = 1.0
+
+  #-----------------------------------------------------------------------------
+  # Messages
+  #-----------------------------------------------------------------------------
 
   # Available speech frames. These are graphic files in "Graphics/Windowskins/".
   SPEECH_WINDOWSKINS = [
@@ -397,7 +468,6 @@ module Settings
     "speech hgss 20",
     "speech pl 18"
   ]
-
   # Available menu frames. These are graphic files in "Graphics/Windowskins/".
   MENU_WINDOWSKINS = [
     "choice 1",
@@ -430,31 +500,23 @@ module Settings
     "choice 28"
   ]
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Debug helpers
+  #-----------------------------------------------------------------------------
 
-  # Your game's credits, in an array. You can allow certain lines to be
-  # translated by wrapping them in _INTL() as shown. Blank lines are just "".
-  # To split a line into two columns, put "<s>" in it. Plugin credits and
-  # Essentials engine credits are added to the end of these credits
-  # automatically.
-  def self.game_credits
-    return [
-      _INTL("My Game by:"),
-      "Maruno",
-      "",
-      _INTL("Also involved were:"),
-      "A. Lee Uss<s>Anne O'Nymus",
-      "Ecksam Pell<s>Jane Doe",
-      "Joe Dan<s>Nick Nayme",
-      "Sue Donnim<s>",
-      "",
-      _INTL("Special thanks to:"),
-      "Pizza"
-    ]
-  end
+  # Whether the game will ask you if you want to fully compile every time you
+  # start the game (in Debug mode). You will not need to hold Ctrl/Shift to
+  # compile anything.
+  PROMPT_TO_COMPILE    = false
+  # Whether the game will skip the Continue/New Game screen and go straight into
+  # a saved game (if there is one) or start a new game (if there isn't). Only
+  # applies to playing in Debug mode.
+  SKIP_CONTINUE_SCREEN = false
 end
 
+#===============================================================================
 # DO NOT EDIT THESE!
+#===============================================================================
 module Essentials
   VERSION = "21.1"
   ERROR_TEXT = ""
diff --git a/Data/Scripts/001_Technical/001_Debugging/003_Errors.rb b/Data/Scripts/001_Technical/001_Debugging/003_Errors.rb
index f1ffb4a32..9618d220b 100644
--- a/Data/Scripts/001_Technical/001_Debugging/003_Errors.rb
+++ b/Data/Scripts/001_Technical/001_Debugging/003_Errors.rb
@@ -51,7 +51,6 @@ def pbPrintException(e)
   end
   # output to log
   errorlog = "errorlog.txt"
-  errorlog = RTP.getSaveFileName("errorlog.txt") if (Object.const_defined?(:RTP) rescue false)
   File.open(errorlog, "ab") do |f|
     f.write("\r\n=================\r\n\r\n[#{Time.now}]\r\n")
     f.write(message)
diff --git a/Data/Scripts/001_Technical/002_Files/001_FileTests.rb b/Data/Scripts/001_Technical/002_Files/001_FileTests.rb
index 68977e097..d753bdae8 100644
--- a/Data/Scripts/001_Technical/002_Files/001_FileTests.rb
+++ b/Data/Scripts/001_Technical/002_Files/001_FileTests.rb
@@ -108,8 +108,8 @@ end
 
 def pbResolveAudioSE(file)
   return nil if !file
-  if RTP.exists?("Audio/SE/" + file, ["", ".wav", ".ogg"])   # ".mp3"
-    return RTP.getPath("Audio/SE/" + file, ["", ".wav", ".ogg"])   # ".mp3"
+  if RTP.exists?("Audio/SE/" + file, ["", ".wav", ".ogg", ".mp3", ".wma"])
+    return RTP.getPath("Audio/SE/" + file, ["", ".wav", ".ogg", ".mp3", ".wma"])
   end
   return nil
 end
@@ -197,7 +197,7 @@ module RTP
   end
 
   def self.getAudioPath(filename)
-    return self.getPath(filename, ["", ".wav", ".wma", ".mid", ".ogg", ".midi"])   # ".mp3"
+    return self.getPath(filename, ["", ".wav", ".ogg", ".mp3", ".midi", ".mid", ".wma"])
   end
 
   def self.getPath(filename, extensions = [])
@@ -261,7 +261,7 @@ end
 #===============================================================================
 module FileTest
   IMAGE_EXTENSIONS = [".png", ".gif"]   # ".jpg", ".jpeg", ".bmp",
-  AUDIO_EXTENSIONS = [".mid", ".midi", ".ogg", ".wav", ".wma"]   # ".mp3"
+  AUDIO_EXTENSIONS = [".wav", ".ogg", ".mp3", ".midi", ".mid", ".wma"]
 
   def self.audio_exist?(filename)
     return RTP.exists?(filename, AUDIO_EXTENSIONS)
diff --git a/Data/Scripts/001_Technical/003_Intl_Messages.rb b/Data/Scripts/001_Technical/003_Intl_Messages.rb
index 85b5b062c..f6c27e5d6 100644
--- a/Data/Scripts/001_Technical/003_Intl_Messages.rb
+++ b/Data/Scripts/001_Technical/003_Intl_Messages.rb
@@ -509,17 +509,19 @@ class Translation
   end
 
   def load_message_files(filename)
+    @core_messages = nil
+    @game_messages = nil
     begin
       core_filename = sprintf("Data/messages_%s_core.dat", filename)
       if FileTest.exist?(core_filename)
-        pbRgssOpen(core_filename, "rb") { |f| @core_messages = Marshal.load(f) }
+        @core_messages = load_data(core_filename)
+        @core_messages = nil if !@core_messages.is_a?(Array)
       end
-      @core_messages = nil if !@core_messages.is_a?(Array)
       game_filename = sprintf("Data/messages_%s_game.dat", filename)
       if FileTest.exist?(game_filename)
-        pbRgssOpen(game_filename, "rb") { |f| @game_messages = Marshal.load(f) }
+        @game_messages = load_data(game_filename)
+        @game_messages = nil if !@game_messages.is_a?(Array)
       end
-      @game_messages = nil if !@game_messages.is_a?(Array)
     rescue
       @core_messages = nil
       @game_messages = nil
diff --git a/Data/Scripts/001_Technical/005_PluginManager.rb b/Data/Scripts/001_Technical/005_PluginManager.rb
index b84f390ab..2bd2aa5c5 100644
--- a/Data/Scripts/001_Technical/005_PluginManager.rb
+++ b/Data/Scripts/001_Technical/005_PluginManager.rb
@@ -380,7 +380,6 @@ module PluginManager
     e.backtrace[0, 10].each { |i| message += "#{i}\r\n" }
     # output to log
     errorlog = "errorlog.txt"
-    errorlog = RTP.getSaveFileName("errorlog.txt") if (Object.const_defined?(:RTP) rescue false)
     File.open(errorlog, "ab") do |f|
       f.write("\r\n=================\r\n\r\n[#{Time.now}]\r\n")
       f.write(message)
@@ -411,7 +410,7 @@ module PluginManager
     Compiler.pbCompilerEachPreppedLine(filename) do |line, line_no|
       # split line up into property name and values
       if !line[/^\s*(\w+)\s*=\s*(.*)$/]
-        raise _INTL("Bad line syntax (expected syntax like XXX=YYY)\n{1}", FileLineData.linereport)
+        raise _INTL("Bad line syntax (expected syntax like XXX=YYY).") + "\n" + FileLineData.linereport
       end
       property = $~[1].upcase
       data = $~[2].split(",")
@@ -555,6 +554,7 @@ module PluginManager
   def self.needCompiling?(order, plugins)
     # fixed actions
     return false if !$DEBUG || FileTest.exist?("Game.rgssad")
+    return true if $full_compile
     return true if !FileTest.exist?("Data/PluginScripts.rxdata")
     Input.update
     return true if Input.press?(Input::SHIFT) || Input.press?(Input::CTRL)
diff --git a/Data/Scripts/001_Technical/006_RPG_Sprite.rb b/Data/Scripts/001_Technical/006_RPG_Sprite.rb
index 047b93453..7a960d094 100644
--- a/Data/Scripts/001_Technical/006_RPG_Sprite.rb
+++ b/Data/Scripts/001_Technical/006_RPG_Sprite.rb
@@ -1,262 +1,6 @@
 #===============================================================================
-#
-#===============================================================================
-class SpriteAnimation
-  @@_animations      = []
-  @@_reference_count = {}
-
-  def initialize(sprite)
-    @sprite = sprite
-  end
-
-  def x(*arg);        @sprite.x(*arg);        end
-  def y(*arg);        @sprite.y(*arg);        end
-  def ox(*arg);       @sprite.ox(*arg);       end
-  def oy(*arg);       @sprite.oy(*arg);       end
-  def viewport(*arg); @sprite.viewport(*arg); end
-  def flash(*arg);    @sprite.flash(*arg);    end
-  def src_rect(*arg); @sprite.src_rect(*arg); end
-  def opacity(*arg);  @sprite.opacity(*arg);  end
-  def tone(*arg);     @sprite.tone(*arg);     end
-
-  def self.clear
-    @@_animations.clear
-  end
-
-  def dispose
-    dispose_animation
-    dispose_loop_animation
-  end
-
-  def animation(animation, hit, height = 3)
-    dispose_animation
-    @_animation = animation
-    return if @_animation.nil?
-    @_animation_hit      = hit
-    @_animation_height   = height
-    @_animation_duration = @_animation.frame_max
-    @_animation_index    = -1
-    fr = 20
-    if @_animation.name[/\[\s*(\d+?)\s*\]\s*$/]
-      fr = $~[1].to_i
-    end
-    @_animation_time_per_frame = 1.0 / fr
-    @_animation_timer_start = System.uptime
-    animation_name = @_animation.animation_name
-    animation_hue  = @_animation.animation_hue
-    bitmap = pbGetAnimation(animation_name, animation_hue)
-    if @@_reference_count.include?(bitmap)
-      @@_reference_count[bitmap] += 1
-    else
-      @@_reference_count[bitmap] = 1
-    end
-    @_animation_sprites = []
-    if @_animation.position != 3 || !@@_animations.include?(animation)
-      16.times do
-        sprite = ::Sprite.new(self.viewport)
-        sprite.bitmap = bitmap
-        sprite.visible = false
-        @_animation_sprites.push(sprite)
-      end
-      @@_animations.push(animation) unless @@_animations.include?(animation)
-    end
-    update_animation
-  end
-
-  def loop_animation(animation)
-    return if animation == @_loop_animation
-    dispose_loop_animation
-    @_loop_animation = animation
-    return if @_loop_animation.nil?
-    @_loop_animation_duration = @_animation.frame_max
-    @_loop_animation_index = -1
-    fr = 20
-    if @_animation.name[/\[\s*(\d+?)\s*\]\s*$/]
-      fr = $~[1].to_i
-    end
-    @_loop_animation_time_per_frame = 1.0 / fr
-    @_loop_animation_timer_start = System.uptime
-    animation_name = @_loop_animation.animation_name
-    animation_hue  = @_loop_animation.animation_hue
-    bitmap = pbGetAnimation(animation_name, animation_hue)
-    if @@_reference_count.include?(bitmap)
-      @@_reference_count[bitmap] += 1
-    else
-      @@_reference_count[bitmap] = 1
-    end
-    @_loop_animation_sprites = []
-    16.times do
-      sprite = ::Sprite.new(self.viewport)
-      sprite.bitmap = bitmap
-      sprite.visible = false
-      @_loop_animation_sprites.push(sprite)
-    end
-    update_loop_animation
-  end
-
-  def dispose_animation
-    return if @_animation_sprites.nil?
-    sprite = @_animation_sprites[0]
-    if sprite
-      @@_reference_count[sprite.bitmap] -= 1
-      sprite.bitmap.dispose if @@_reference_count[sprite.bitmap] == 0
-    end
-    @_animation_sprites.each { |s| s.dispose }
-    @_animation_sprites = nil
-    @_animation = nil
-    @_animation_duration = 0
-  end
-
-  def dispose_loop_animation
-    return if @_loop_animation_sprites.nil?
-    sprite = @_loop_animation_sprites[0]
-    if sprite
-      @@_reference_count[sprite.bitmap] -= 1
-      sprite.bitmap.dispose if @@_reference_count[sprite.bitmap] == 0
-    end
-    @_loop_animation_sprites.each { |s| s.dispose }
-    @_loop_animation_sprites = nil
-    @_loop_animation = nil
-  end
-
-  def active?
-    return @_loop_animation_sprites || @_animation_sprites
-  end
-
-  def effect?
-    return @_animation_duration > 0
-  end
-
-  def update
-    update_animation if @_animation
-    update_loop_animation if @_loop_animation
-  end
-
-  def update_animation
-    new_index = ((System.uptime - @_animation_timer_start) / @_animation_time_per_frame).to_i
-    if new_index >= @_animation_duration
-      dispose_animation
-      return
-    end
-    quick_update = (@_animation_index == new_index)
-    @_animation_index = new_index
-    frame_index = @_animation_index
-    cell_data   = @_animation.frames[frame_index].cell_data
-    position    = @_animation.position
-    animation_set_sprites(@_animation_sprites, cell_data, position, quick_update)
-    return if quick_update
-    @_animation.timings.each do |timing|
-      next if timing.frame != frame_index
-      animation_process_timing(timing, @_animation_hit)
-    end
-  end
-
-  def update_loop_animation
-    new_index = ((System.uptime - @_loop_animation_timer_start) / @_loop_animation_time_per_frame).to_i
-    new_index %= @_loop_animation_duration
-    quick_update = (@_loop_animation_index == new_index)
-    @_loop_animation_index = new_index
-    frame_index = @_loop_animation_index
-    cell_data   = @_loop_animation.frames[frame_index].cell_data
-    position    = @_loop_animation.position
-    animation_set_sprites(@_loop_animation_sprites, cell_data, position, quick_update)
-    return if quick_update
-    @_loop_animation.timings.each do |timing|
-      next if timing.frame != frame_index
-      animation_process_timing(timing, true)
-    end
-  end
-
-  def animation_set_sprites(sprites, cell_data, position, quick_update = false)
-    sprite_x = 320
-    sprite_y = 240
-    if position == 3   # Screen
-      if self.viewport
-        sprite_x = self.viewport.rect.width / 2
-        sprite_y = self.viewport.rect.height - 160
-      end
-    else
-      sprite_x = self.x - self.ox + (self.src_rect.width / 2)
-      sprite_y = self.y - self.oy
-      if self.src_rect.height > 1
-        sprite_y += self.src_rect.height / 2 if position == 1   # Middle
-        sprite_y += self.src_rect.height if position == 2   # Bottom
-      end
-    end
-    16.times do |i|
-      sprite = sprites[i]
-      pattern = cell_data[i, 0]
-      if sprite.nil? || pattern.nil? || pattern == -1
-        sprite.visible = false if sprite
-        next
-      end
-      sprite.x = sprite_x + cell_data[i, 1]
-      sprite.y = sprite_y + cell_data[i, 2]
-      next if quick_update
-      sprite.visible = true
-      sprite.src_rect.set((pattern % 5) * 192, (pattern / 5) * 192, 192, 192)
-      case @_animation_height
-      when 0 then sprite.z = 1
-      when 1 then sprite.z = sprite.y + (Game_Map::TILE_HEIGHT * 3 / 2) + 1
-      when 2 then sprite.z = sprite.y + (Game_Map::TILE_HEIGHT * 3) + 1
-      else        sprite.z = 2000
-      end
-      sprite.ox         = 96
-      sprite.oy         = 96
-      sprite.zoom_x     = cell_data[i, 3] / 100.0
-      sprite.zoom_y     = cell_data[i, 3] / 100.0
-      sprite.angle      = cell_data[i, 4]
-      sprite.mirror     = (cell_data[i, 5] == 1)
-      sprite.tone       = self.tone
-      sprite.opacity    = cell_data[i, 6] * self.opacity / 255.0
-      sprite.blend_type = cell_data[i, 7]
-    end
-  end
-
-  def animation_process_timing(timing, hit)
-    if timing.condition == 0 ||
-       (timing.condition == 1 && hit == true) ||
-       (timing.condition == 2 && hit == false)
-      if timing.se.name != ""
-        se = timing.se
-        pbSEPlay(se)
-      end
-      case timing.flash_scope
-      when 1
-        self.flash(timing.flash_color, timing.flash_duration * 2)
-      when 2
-        self.viewport.flash(timing.flash_color, timing.flash_duration * 2) if self.viewport
-      when 3
-        self.flash(nil, timing.flash_duration * 2)
-      end
-    end
-  end
-
-  def x=(x)
-    sx = x - self.x
-    return if sx == 0
-    if @_animation_sprites
-      16.times { |i| @_animation_sprites[i].x += sx }
-    end
-    if @_loop_animation_sprites
-      16.times { |i| @_loop_animation_sprites[i].x += sx }
-    end
-  end
-
-  def y=(y)
-    sy = y - self.y
-    return if sy == 0
-    if @_animation_sprites
-      16.times { |i| @_animation_sprites[i].y += sy }
-    end
-    if @_loop_animation_sprites
-      16.times { |i| @_loop_animation_sprites[i].y += sy }
-    end
-  end
-end
-
-#===============================================================================
-#
+# Additions to class Sprite that allows class AnimationContainerSprite to attach
+# overworld animations to itself.
 #===============================================================================
 module RPG
   class Sprite < ::Sprite
diff --git a/Data/Scripts/002_BattleSettings.rb b/Data/Scripts/002_BattleSettings.rb
index e78560afa..ba84e8f3b 100644
--- a/Data/Scripts/002_BattleSettings.rb
+++ b/Data/Scripts/002_BattleSettings.rb
@@ -1,4 +1,11 @@
+#===============================================================================
+#
+#===============================================================================
 module Settings
+  #-----------------------------------------------------------------------------
+  # Turn order and disobedience
+  #-----------------------------------------------------------------------------
+
   # Whether turn order is recalculated after a Pokémon Mega Evolves.
   RECALCULATE_TURN_ORDER_AFTER_MEGA_EVOLUTION = (MECHANICS_GENERATION >= 7)
   # Whether turn order is recalculated after a Pokémon's Speed stat changes.
@@ -10,22 +17,44 @@ module Settings
   # Whether foreign Pokémon can disobey the player's commands if the Pokémon is
   # too high a level compared to the number of Gym Badges the player has.
   FOREIGN_HIGH_LEVEL_POKEMON_CAN_DISOBEY      = true
+
+  #-----------------------------------------------------------------------------
+  # Mega Evolution
+  #-----------------------------------------------------------------------------
+
+  # The Game Switch which, while ON, prevents all Pokémon in battle from Mega
+  # Evolving even if they otherwise could.
+  NO_MEGA_EVOLUTION = 34
+
+  #-----------------------------------------------------------------------------
+  # Move usage calculations
+  #-----------------------------------------------------------------------------
+
   # Whether a move's physical/special category depends on the move itself as in
   # newer Gens (true), or on its type as in older Gens (false).
-  MOVE_CATEGORY_PER_MOVE                      = (MECHANICS_GENERATION >= 4)
+  MOVE_CATEGORY_PER_MOVE          = (MECHANICS_GENERATION >= 4)
   # Whether critical hits do 1.5x damage and have 4 stages (true), or they do 2x
   # damage and have 5 stages as in Gen 5 (false). Also determines whether
   # critical hit rate can be copied by Transform/Psych Up.
-  NEW_CRITICAL_HIT_RATE_MECHANICS             = (MECHANICS_GENERATION >= 6)
-
-  #=============================================================================
-
+  NEW_CRITICAL_HIT_RATE_MECHANICS = (MECHANICS_GENERATION >= 6)
   # Whether several effects apply relating to a Pokémon's type:
   #   * Electric-type immunity to paralysis
   #   * Ghost-type immunity to being trapped
   #   * Grass-type immunity to powder moves and Effect Spore
   #   * Poison-type Pokémon can't miss when using Toxic
-  MORE_TYPE_EFFECTS                   = (MECHANICS_GENERATION >= 6)
+  MORE_TYPE_EFFECTS               = (MECHANICS_GENERATION >= 6)
+  # The minimum number of Gym Badges required to boost each stat of a player's
+  # Pokémon by 1.1x, in battle only.
+  NUM_BADGES_BOOST_ATTACK  = (MECHANICS_GENERATION >= 4) ? 999 : 1
+  NUM_BADGES_BOOST_DEFENSE = (MECHANICS_GENERATION >= 4) ? 999 : 5
+  NUM_BADGES_BOOST_SPATK   = (MECHANICS_GENERATION >= 4) ? 999 : 7
+  NUM_BADGES_BOOST_SPDEF   = (MECHANICS_GENERATION >= 4) ? 999 : 7
+  NUM_BADGES_BOOST_SPEED   = (MECHANICS_GENERATION >= 4) ? 999 : 3
+
+  #-----------------------------------------------------------------------------
+  # Ability and item effects
+  #-----------------------------------------------------------------------------
+
   # Whether weather caused by an ability lasts 5 rounds (true) or forever (false).
   FIXED_DURATION_WEATHER_FROM_ABILITY = (MECHANICS_GENERATION >= 6)
   # Whether X items (X Attack, etc.) raise their stat by 2 stages (true) or 1
@@ -38,7 +67,9 @@ module Settings
   # raises the holder's Special Attack and Special Defense by 50% (false).
   SOUL_DEW_POWERS_UP_TYPES            = (MECHANICS_GENERATION >= 7)
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Affection
+  #-----------------------------------------------------------------------------
 
   # Whether Pokémon with high happiness will gain more Exp from battles, have a
   # chance of avoiding/curing negative effects by themselves, resisting
@@ -50,51 +81,44 @@ module Settings
   # 179. Also lowers the happiness evolution threshold to 160.
   APPLY_HAPPINESS_SOFT_CAP = AFFECTION_EFFECTS
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Capturing Pokémon
+  #-----------------------------------------------------------------------------
 
-  # The minimum number of badges required to boost each stat of a player's
-  # Pokémon by 1.1x, in battle only.
-  NUM_BADGES_BOOST_ATTACK  = (MECHANICS_GENERATION >= 4) ? 999 : 1
-  NUM_BADGES_BOOST_DEFENSE = (MECHANICS_GENERATION >= 4) ? 999 : 5
-  NUM_BADGES_BOOST_SPATK   = (MECHANICS_GENERATION >= 4) ? 999 : 7
-  NUM_BADGES_BOOST_SPDEF   = (MECHANICS_GENERATION >= 4) ? 999 : 7
-  NUM_BADGES_BOOST_SPEED   = (MECHANICS_GENERATION >= 4) ? 999 : 3
-
-  #=============================================================================
-
-  # The Game Switch which, while ON, prevents all Pokémon in battle from Mega
-  # Evolving even if they otherwise could.
-  NO_MEGA_EVOLUTION = 34
-
-  #=============================================================================
-
-  # Whether the Exp gained from beating a Pokémon should be scaled depending on
-  # the gainer's level.
-  SCALED_EXP_FORMULA                   = (MECHANICS_GENERATION == 5 || MECHANICS_GENERATION >= 7)
-  # Whether the Exp gained from beating a Pokémon should be divided equally
-  # between each participant (true), or whether each participant should gain
-  # that much Exp (false). This also applies to Exp gained via the Exp Share
-  # (held item version) being distributed to all Exp Share holders.
-  SPLIT_EXP_BETWEEN_GAINERS            = (MECHANICS_GENERATION <= 5)
-  # Whether the Exp gained from beating a Pokémon is multiplied by 1.5 if that
-  # Pokémon is owned by another trainer.
-  MORE_EXP_FROM_TRAINER_POKEMON        = (MECHANICS_GENERATION <= 6)
-  # Whether a Pokémon holding a Power item gains 8 (true) or 4 (false) EVs in
-  # the relevant stat.
-  MORE_EVS_FROM_POWER_ITEMS            = (MECHANICS_GENERATION >= 7)
   # Whether the critical capture mechanic applies. Note that its calculation is
   # based on a total of 600+ species (i.e. that many species need to be caught
   # to provide the greatest critical capture chance of 2.5x), and there may be
   # fewer species in your game.
   ENABLE_CRITICAL_CAPTURES             = (MECHANICS_GENERATION >= 5)
-  # Whether Pokémon gain Exp for capturing a Pokémon.
-  GAIN_EXP_FOR_CAPTURE                 = (MECHANICS_GENERATION >= 6)
   # Whether the player is asked what to do with a newly caught Pokémon if their
   # party is full. If true, the player can toggle whether they are asked this in
   # the Options screen.
   NEW_CAPTURE_CAN_REPLACE_PARTY_MEMBER = (MECHANICS_GENERATION >= 7)
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # Exp and EV gain
+  #-----------------------------------------------------------------------------
+
+  # Whether the Exp gained from beating a Pokémon should be scaled depending on
+  # the gainer's level.
+  SCALED_EXP_FORMULA            = (MECHANICS_GENERATION == 5 || MECHANICS_GENERATION >= 7)
+  # Whether the Exp gained from beating a Pokémon should be divided equally
+  # between each participant (true), or whether each participant should gain
+  # that much Exp (false). This also applies to Exp gained via the Exp Share
+  # (held item version) being distributed to all Exp Share holders.
+  SPLIT_EXP_BETWEEN_GAINERS     = (MECHANICS_GENERATION <= 5)
+  # Whether the Exp gained from beating a Pokémon is multiplied by 1.5 if that
+  # Pokémon is owned by another trainer.
+  MORE_EXP_FROM_TRAINER_POKEMON = (MECHANICS_GENERATION <= 6)
+  # Whether a Pokémon holding a Power item gains 8 (true) or 4 (false) EVs in
+  # the relevant stat.
+  MORE_EVS_FROM_POWER_ITEMS     = (MECHANICS_GENERATION >= 7)
+  # Whether Pokémon gain Exp for capturing a Pokémon.
+  GAIN_EXP_FOR_CAPTURE          = (MECHANICS_GENERATION >= 6)
+
+  #-----------------------------------------------------------------------------
+  # End of battle
+  #-----------------------------------------------------------------------------
 
   # The Game Switch which, whie ON, prevents the player from losing money if
   # they lose a battle (they can still gain money from trainers for winning).
@@ -105,7 +129,9 @@ module Settings
   # Whether fainted Pokémon can try to evolve after a battle.
   CHECK_EVOLUTION_FOR_FAINTED_POKEMON = true
 
-  #=============================================================================
+  #-----------------------------------------------------------------------------
+  # AI
+  #-----------------------------------------------------------------------------
 
   # Whether wild Pokémon with the "Legendary", "Mythical" or "UltraBeast" flag
   # (as defined in pokemon.txt) have a smarter AI. Their skill level is set to
diff --git a/Data/Scripts/003_Game processing/003_Interpreter.rb b/Data/Scripts/003_Game processing/003_Interpreter.rb
index 36c3c971e..21666002e 100644
--- a/Data/Scripts/003_Game processing/003_Interpreter.rb	
+++ b/Data/Scripts/003_Game processing/003_Interpreter.rb	
@@ -113,6 +113,8 @@ class Interpreter
         end
         @move_route_waiting = false
       end
+      # Do nothing if the player is jumping out of surfing
+      return if $game_temp.ending_surf
       # Do nothing while waiting
       if @wait_count > 0
         return if System.uptime - @wait_start < @wait_count
@@ -162,7 +164,7 @@ class Interpreter
       # Assemble error message
       err = "Script error in Interpreter\r\n"
       if $game_map
-        map_name = ($game_map.name rescue nil) || "???"
+        map_name = (pbGetBasicMapNameFromId($game_map.map_id) rescue nil) || "???"
         if event
           err = "Script error in event #{event.id} (coords #{event.x},#{event.y}), map #{$game_map.map_id} (#{map_name})\r\n"
         else
diff --git a/Data/Scripts/003_Game processing/005_Event_Handlers.rb b/Data/Scripts/003_Game processing/005_Event_Handlers.rb
index 9986977bb..8e6f098cc 100644
--- a/Data/Scripts/003_Game processing/005_Event_Handlers.rb	
+++ b/Data/Scripts/003_Game processing/005_Event_Handlers.rb	
@@ -70,7 +70,7 @@ class NamedEvent
 
   # Adds an event handler procedure from the event.
   def add(key, proc)
-    @callbacks[key] = proc if !@callbacks.has_key?(key)
+    @callbacks[key] = proc
   end
 
   # Removes an event handler procedure from the event.
diff --git a/Data/Scripts/004_Game classes/006_Game_Character.rb b/Data/Scripts/004_Game classes/006_Game_Character.rb
index d7f33659c..9de49c288 100644
--- a/Data/Scripts/004_Game classes/006_Game_Character.rb	
+++ b/Data/Scripts/004_Game classes/006_Game_Character.rb	
@@ -817,7 +817,7 @@ class Game_Character
     oldDirection = @direction
     @direction = dir
     @stop_count = 0
-    pbCheckEventTriggerAfterTurning if dir != oldDirection
+    check_event_trigger_after_turning if dir != oldDirection
   end
 
   def turn_down;  turn_generic(2); end
diff --git a/Data/Scripts/004_Game classes/007_Game_Event.rb b/Data/Scripts/004_Game classes/007_Game_Event.rb
index 05bc7c8d6..aca6d0992 100644
--- a/Data/Scripts/004_Game classes/007_Game_Event.rb	
+++ b/Data/Scripts/004_Game classes/007_Game_Event.rb	
@@ -139,16 +139,6 @@ class Game_Event < Game_Character
     return false
   end
 
-  def pbCheckEventTriggerAfterTurning
-    return if $game_system.map_interpreter.running? || @starting
-    return if @trigger != 2   # Event touch
-    return if !@event.name[/(?:sight|trainer)\((\d+)\)/i]
-    distance = $~[1].to_i
-    return if !pbEventCanReachPlayer?(self, $game_player, distance)
-    return if jumping? || over_trigger?
-    start
-  end
-
   def check_event_trigger_touch(dir)
     return if $game_system.map_interpreter.running?
     return if @trigger != 2   # Event touch
@@ -167,6 +157,32 @@ class Game_Event < Game_Character
     start
   end
 
+  def check_event_trigger_after_turning
+    return if $game_system.map_interpreter.running? || @starting
+    return if @trigger != 2   # Not Event Touch
+    return if !self.name[/(?:sight|trainer)\((\d+)\)/i]
+    distance = $~[1].to_i
+    return if !pbEventCanReachPlayer?(self, $game_player, distance)
+    return if jumping? || over_trigger?
+    start
+  end
+
+  def check_event_trigger_after_moving
+    return if $game_system.map_interpreter.running? || @starting
+    return if @trigger != 2   # Not Event Touch
+    if self.name[/(?:sight|trainer)\((\d+)\)/i]
+      distance = $~[1].to_i
+      return if !pbEventCanReachPlayer?(self, $game_player, distance)
+    elsif self.name[/counter\((\d+)\)/i]
+      distance = $~[1].to_i
+      return if !pbEventFacesPlayer?(self, $game_player, distance)
+    else
+      return
+    end
+    return if jumping? || over_trigger?
+    start
+  end
+
   def check_event_trigger_auto
     case @trigger
     when 2   # Event touch
@@ -263,7 +279,7 @@ class Game_Event < Game_Character
     @moveto_happened = false
     last_moving = moving?
     super
-    $game_player.pbCheckEventTriggerFromDistance([2]) if !moving? && last_moving
+    check_event_trigger_after_moving if !moving? && last_moving
     if @need_refresh
       @need_refresh = false
       refresh
diff --git a/Data/Scripts/004_Game classes/008_Game_Player.rb b/Data/Scripts/004_Game classes/008_Game_Player.rb
index 6c03a8b19..8f49870b9 100644
--- a/Data/Scripts/004_Game classes/008_Game_Player.rb	
+++ b/Data/Scripts/004_Game classes/008_Game_Player.rb	
@@ -313,16 +313,18 @@ class Game_Player < Game_Character
     return result
   end
 
-  def pbCheckEventTriggerAfterTurning; end
+  def check_event_trigger_after_turning; end
 
   def pbCheckEventTriggerFromDistance(triggers)
-    ret = pbTriggeredTrainerEvents(triggers)
-    ret.concat(pbTriggeredCounterEvents(triggers))
-    return false if ret.length == 0
-    ret.each do |event|
+    events = pbTriggeredTrainerEvents(triggers)
+    events.concat(pbTriggeredCounterEvents(triggers))
+    return false if events.length == 0
+    ret = false
+    events.each do |event|
       event.start
+      ret = true if event.starting
     end
-    return true
+    return ret
   end
 
   # Trigger event(s) at the same coordinates as self with the appropriate
@@ -339,7 +341,7 @@ class Game_Player < Game_Character
       # If starting determinant is same position event (other than jumping)
       next if event.jumping? || !event.over_trigger?
       event.start
-      result = true
+      result = true if event.starting
     end
     return result
   end
@@ -361,7 +363,7 @@ class Game_Player < Game_Character
       # If starting determinant is front event (other than jumping)
       next if event.jumping? || event.over_trigger?
       event.start
-      result = true
+      result = true if event.starting
     end
     # If fitting event is not found
     if result == false && $game_map.counter?(new_x, new_y)
@@ -377,7 +379,7 @@ class Game_Player < Game_Character
         # If starting determinant is front event (other than jumping)
         next if event.jumping? || event.over_trigger?
         event.start
-        result = true
+        result = true if event.starting
       end
     end
     return result
@@ -404,7 +406,7 @@ class Game_Player < Game_Character
       # If starting determinant is front event (other than jumping)
       next if event.jumping? || event.over_trigger?
       event.start
-      result = true
+      result = true if event.starting
     end
     return result
   end
diff --git a/Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb b/Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb
index 0c63008a0..05eadab84 100644
--- a/Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb
+++ b/Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb
@@ -1,15 +1,270 @@
 #===============================================================================
-# A sprite whose sole purpose is to display an animation. This sprite can be
-# displayed anywhere on the map and is disposed automatically when its animation
-# is finished. Used for grass rustling and so forth.
+#
 #===============================================================================
-class AnimationSprite < RPG::Sprite
+class SpriteAnimation
+  @@_animations      = []
+  @@_reference_count = {}
+
+  def initialize(sprite)
+    @sprite = sprite
+  end
+
+  def x(*arg);        @sprite.x(*arg);        end
+  def y(*arg);        @sprite.y(*arg);        end
+  def ox(*arg);       @sprite.ox(*arg);       end
+  def oy(*arg);       @sprite.oy(*arg);       end
+  def viewport(*arg); @sprite.viewport(*arg); end
+  def flash(*arg);    @sprite.flash(*arg);    end
+  def src_rect(*arg); @sprite.src_rect(*arg); end
+  def opacity(*arg);  @sprite.opacity(*arg);  end
+  def tone(*arg);     @sprite.tone(*arg);     end
+
+  def self.clear
+    @@_animations.clear
+  end
+
+  def dispose
+    dispose_animation
+    dispose_loop_animation
+  end
+
+  def animation(animation, hit, height = 3)
+    dispose_animation
+    @_animation = animation
+    return if @_animation.nil?
+    @_animation_hit      = hit
+    @_animation_height   = height
+    @_animation_duration = @_animation.frame_max
+    @_animation_index    = -1
+    fr = 20
+    if @_animation.name[/\[\s*(\d+?)\s*\]\s*$/]
+      fr = $~[1].to_i
+    end
+    @_animation_time_per_frame = 1.0 / fr
+    @_animation_timer_start = System.uptime
+    animation_name = @_animation.animation_name
+    animation_hue  = @_animation.animation_hue
+    bitmap = pbGetAnimation(animation_name, animation_hue)
+    if @@_reference_count.include?(bitmap)
+      @@_reference_count[bitmap] += 1
+    else
+      @@_reference_count[bitmap] = 1
+    end
+    @_animation_sprites = []
+    if @_animation.position != 3 || !@@_animations.include?(animation)
+      16.times do
+        sprite = ::Sprite.new(self.viewport)
+        sprite.bitmap = bitmap
+        sprite.visible = false
+        @_animation_sprites.push(sprite)
+      end
+      @@_animations.push(animation) unless @@_animations.include?(animation)
+    end
+    update_animation
+  end
+
+  def loop_animation(animation)
+    return if animation == @_loop_animation
+    dispose_loop_animation
+    @_loop_animation = animation
+    return if @_loop_animation.nil?
+    @_loop_animation_duration = @_animation.frame_max
+    @_loop_animation_index = -1
+    fr = 20
+    if @_animation.name[/\[\s*(\d+?)\s*\]\s*$/]
+      fr = $~[1].to_i
+    end
+    @_loop_animation_time_per_frame = 1.0 / fr
+    @_loop_animation_timer_start = System.uptime
+    animation_name = @_loop_animation.animation_name
+    animation_hue  = @_loop_animation.animation_hue
+    bitmap = pbGetAnimation(animation_name, animation_hue)
+    if @@_reference_count.include?(bitmap)
+      @@_reference_count[bitmap] += 1
+    else
+      @@_reference_count[bitmap] = 1
+    end
+    @_loop_animation_sprites = []
+    16.times do
+      sprite = ::Sprite.new(self.viewport)
+      sprite.bitmap = bitmap
+      sprite.visible = false
+      @_loop_animation_sprites.push(sprite)
+    end
+    update_loop_animation
+  end
+
+  def dispose_animation
+    return if @_animation_sprites.nil?
+    sprite = @_animation_sprites[0]
+    if sprite
+      @@_reference_count[sprite.bitmap] -= 1
+      sprite.bitmap.dispose if @@_reference_count[sprite.bitmap] == 0
+    end
+    @_animation_sprites.each { |s| s.dispose }
+    @_animation_sprites = nil
+    @_animation = nil
+    @_animation_duration = 0
+  end
+
+  def dispose_loop_animation
+    return if @_loop_animation_sprites.nil?
+    sprite = @_loop_animation_sprites[0]
+    if sprite
+      @@_reference_count[sprite.bitmap] -= 1
+      sprite.bitmap.dispose if @@_reference_count[sprite.bitmap] == 0
+    end
+    @_loop_animation_sprites.each { |s| s.dispose }
+    @_loop_animation_sprites = nil
+    @_loop_animation = nil
+  end
+
+  def active?
+    return @_loop_animation_sprites || @_animation_sprites
+  end
+
+  def effect?
+    return @_animation_duration > 0
+  end
+
+  def update
+    update_animation if @_animation
+    update_loop_animation if @_loop_animation
+  end
+
+  def update_animation
+    new_index = ((System.uptime - @_animation_timer_start) / @_animation_time_per_frame).to_i
+    if new_index >= @_animation_duration
+      dispose_animation
+      return
+    end
+    quick_update = (@_animation_index == new_index)
+    @_animation_index = new_index
+    frame_index = @_animation_index
+    cell_data   = @_animation.frames[frame_index].cell_data
+    position    = @_animation.position
+    animation_set_sprites(@_animation_sprites, cell_data, position, quick_update)
+    return if quick_update
+    @_animation.timings.each do |timing|
+      next if timing.frame != frame_index
+      animation_process_timing(timing, @_animation_hit)
+    end
+  end
+
+  def update_loop_animation
+    new_index = ((System.uptime - @_loop_animation_timer_start) / @_loop_animation_time_per_frame).to_i
+    new_index %= @_loop_animation_duration
+    quick_update = (@_loop_animation_index == new_index)
+    @_loop_animation_index = new_index
+    frame_index = @_loop_animation_index
+    cell_data   = @_loop_animation.frames[frame_index].cell_data
+    position    = @_loop_animation.position
+    animation_set_sprites(@_loop_animation_sprites, cell_data, position, quick_update)
+    return if quick_update
+    @_loop_animation.timings.each do |timing|
+      next if timing.frame != frame_index
+      animation_process_timing(timing, true)
+    end
+  end
+
+  def animation_set_sprites(sprites, cell_data, position, quick_update = false)
+    sprite_x = 320
+    sprite_y = 240
+    if position == 3   # Screen
+      if self.viewport
+        sprite_x = self.viewport.rect.width / 2
+        sprite_y = self.viewport.rect.height - 160
+      end
+    else
+      sprite_x = self.x - self.ox + (self.src_rect.width / 2)
+      sprite_y = self.y - self.oy
+      if self.src_rect.height > 1
+        sprite_y += self.src_rect.height / 2 if position == 1   # Middle
+        sprite_y += self.src_rect.height if position == 2   # Bottom
+      end
+    end
+    16.times do |i|
+      sprite = sprites[i]
+      pattern = cell_data[i, 0]
+      if sprite.nil? || pattern.nil? || pattern == -1
+        sprite.visible = false if sprite
+        next
+      end
+      sprite.x = sprite_x + cell_data[i, 1]
+      sprite.y = sprite_y + cell_data[i, 2]
+      next if quick_update
+      sprite.visible = true
+      sprite.src_rect.set((pattern % 5) * 192, (pattern / 5) * 192, 192, 192)
+      case @_animation_height
+      when 0 then sprite.z = 1
+      when 1 then sprite.z = sprite.y + (Game_Map::TILE_HEIGHT * 3 / 2) + 1
+      when 2 then sprite.z = sprite.y + (Game_Map::TILE_HEIGHT * 3) + 1
+      else        sprite.z = 2000
+      end
+      sprite.ox         = 96
+      sprite.oy         = 96
+      sprite.zoom_x     = cell_data[i, 3] / 100.0
+      sprite.zoom_y     = cell_data[i, 3] / 100.0
+      sprite.angle      = cell_data[i, 4]
+      sprite.mirror     = (cell_data[i, 5] == 1)
+      sprite.tone       = self.tone
+      sprite.opacity    = cell_data[i, 6] * self.opacity / 255.0
+      sprite.blend_type = cell_data[i, 7]
+    end
+  end
+
+  def animation_process_timing(timing, hit)
+    if timing.condition == 0 ||
+       (timing.condition == 1 && hit == true) ||
+       (timing.condition == 2 && hit == false)
+      if timing.se.name != ""
+        se = timing.se
+        pbSEPlay(se)
+      end
+      case timing.flash_scope
+      when 1
+        self.flash(timing.flash_color, timing.flash_duration * 2)
+      when 2
+        self.viewport.flash(timing.flash_color, timing.flash_duration * 2) if self.viewport
+      when 3
+        self.flash(nil, timing.flash_duration * 2)
+      end
+    end
+  end
+
+  def x=(x)
+    sx = x - self.x
+    return if sx == 0
+    if @_animation_sprites
+      16.times { |i| @_animation_sprites[i].x += sx }
+    end
+    if @_loop_animation_sprites
+      16.times { |i| @_loop_animation_sprites[i].x += sx }
+    end
+  end
+
+  def y=(y)
+    sy = y - self.y
+    return if sy == 0
+    if @_animation_sprites
+      16.times { |i| @_animation_sprites[i].y += sy }
+    end
+    if @_loop_animation_sprites
+      16.times { |i| @_loop_animation_sprites[i].y += sy }
+    end
+  end
+end
+
+#===============================================================================
+# A sprite whose sole purpose is to display an animation (a SpriteAnimation).
+# This sprite can be displayed anywhere on the map and is disposed automatically
+# when its animation is finished. Used for grass rustling and so forth.
+#===============================================================================
+class AnimationContainerSprite < RPG::Sprite
   def initialize(animID, map, tileX, tileY, viewport = nil, tinting = false, height = 3)
     super(viewport)
     @tileX = tileX
     @tileY = tileY
-    self.bitmap = Bitmap.new(1, 1)
-    self.bitmap.clear
     @map = map
     setCoords
     pbDayNightTint(self) if tinting
@@ -23,17 +278,11 @@ class AnimationSprite < RPG::Sprite
     self.y += Game_Map::TILE_HEIGHT
   end
 
-  def dispose
-    self.bitmap.dispose
-    super
-  end
-
   def update
-    if !self.disposed?
-      setCoords
-      super
-      self.dispose if !self.effect?
-    end
+    return if disposed?
+    setCoords
+    super
+    dispose if !effect?
   end
 end
 
@@ -53,7 +302,7 @@ class Spriteset_Map
   end
 
   def addUserAnimation(animID, x, y, tinting = false, height = 3)
-    sprite = AnimationSprite.new(animID, self.map, x, y, @@viewport1, tinting, height)
+    sprite = AnimationContainerSprite.new(animID, self.map, x, y, @@viewport1, tinting, height)
     addUserSprite(sprite)
     return sprite
   end
@@ -77,5 +326,6 @@ class Spriteset_Map
     @@viewport3.tone.set(0, 0, 0, 0)
     _animationSprite_update
     @usersprites.each { |sprite| sprite.update if !sprite.disposed? }
+    @usersprites.delete_if { |sprite| sprite.disposed? }
   end
 end
diff --git a/Data/Scripts/006_Map renderer/002_TilesetWrapper.rb b/Data/Scripts/006_Map renderer/002_TilesetWrapper.rb
index 7790888ba..8873ccfbc 100644
--- a/Data/Scripts/006_Map renderer/002_TilesetWrapper.rb	
+++ b/Data/Scripts/006_Map renderer/002_TilesetWrapper.rb	
@@ -15,8 +15,6 @@
 # 4096px           -> 65536px   (enough to load pretty much any tileset)
 # 8192px           -> 262144px
 # 16384px          -> 1048576px (what most people have at this point)
-#
-#                             ~Roza/Zoroark
 #===============================================================================
 class TilemapRenderer
   module TilesetWrapper
diff --git a/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb b/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb
index ae8530dc4..e8be64d69 100644
--- a/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb	
+++ b/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb	
@@ -406,19 +406,15 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
     return if !busy?
     return if @textchars[@curchar] == "\n"
     resume
-    visiblelines = (self.height - self.borderY) / @lineHeight
-    loop do
-      curcharSkip(true)
-      break if @curchar >= @fmtchars.length    # End of message
-      if @textchars[@curchar] == "\1"          # Pause message
+    if curcharSkip(true)
+      visiblelines = (self.height - self.borderY) / @lineHeight
+      if @textchars[@curchar] == "\n" && @linesdrawn >= visiblelines - 1
+        @scroll_timer_start = System.uptime
+      elsif @textchars[@curchar] == "\1"
         @pausing = true if @curchar < @numtextchars - 1
         self.startPause
         refresh
-        break
       end
-      break if @textchars[@curchar] != "\n"    # Skip past newlines only
-      break if @linesdrawn >= visiblelines - 1   # No more empty lines to continue to
-      @linesdrawn += 1
     end
   end
 
@@ -533,6 +529,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
     delta_t = time_now - @display_last_updated
     @display_last_updated = time_now
     visiblelines = (self.height - self.borderY) / @lineHeight
+    @lastchar = -1 if !@lastchar
     show_more_characters = false
     # Pauses and new lines
     if @textchars[@curchar] == "\1"   # Waiting
@@ -554,7 +551,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
           show_more_characters = true
         end
       else   # New line but the next line can be shown without scrolling to it
-        @linesdrawn += 1
+        @linesdrawn += 1 if @lastchar < @curchar
         show_more_characters = true
       end
     elsif @curchar <= @numtextchars   # Displaying more text
@@ -566,6 +563,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
       @scroll_timer_start = nil
       @linesdrawn = 0
     end
+    @lastchar = @curchar
     # Keep displaying more text
     if show_more_characters
       @display_timer += delta_t
diff --git a/Data/Scripts/007_Objects and windows/007_BitmapSprite.rb b/Data/Scripts/007_Objects and windows/007_BitmapSprite.rb
index 6ce248380..c19283a81 100644
--- a/Data/Scripts/007_Objects and windows/007_BitmapSprite.rb	
+++ b/Data/Scripts/007_Objects and windows/007_BitmapSprite.rb	
@@ -59,7 +59,7 @@ class AnimatedSprite < Sprite
     self.frame = 0
   end
 
-  # Shorter version of AnimationSprite. All frames are placed on a single row
+  # Shorter version of AnimatedSprite. All frames are placed on a single row
   # of the bitmap, so that the width and height need not be defined beforehand.
   # frameskip is in 1/20ths of a second, and is the time between frame changes.
   def initializeShort(animname, framecount, frameskip)
diff --git a/Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb b/Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb
index dbb3761f0..9cdf1b363 100644
--- a/Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb	
+++ b/Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb	
@@ -48,14 +48,14 @@ class PngAnimatedBitmap
     if filename[/^\[(\d+)(?:,(\d+))?\]/]   # Starts with 1 or 2 numbers in brackets
       # File has a frame count
       numFrames = $1.to_i
-      duration  = $2.to_i
+      duration  = $2.to_i   # In 1/20ths of a second
       duration  = 5 if duration == 0
       raise "Invalid frame count in #{filename}" if numFrames <= 0
       raise "Invalid frame duration in #{filename}" if duration <= 0
       if panorama.width % numFrames != 0
         raise "Bitmap's width (#{panorama.width}) is not divisible by frame count: #{filename}"
       end
-      @frame_duration = duration
+      @frame_duration = duration / 20.0
       subWidth = panorama.width / numFrames
       numFrames.times do |i|
         subBitmap = Bitmap.new(subWidth, panorama.height)
@@ -99,7 +99,7 @@ class PngAnimatedBitmap
 
   # Actually returns the total number of 1/20ths of a second this animation lasts.
   def totalFrames
-    return @frame_duration * @frames.length
+    return (@frame_duration * @frames.length * 20).to_i
   end
 
   def each
diff --git a/Data/Scripts/009_Scenes/002_EventScene.rb b/Data/Scripts/009_Scenes/002_EventScene.rb
index 07f1c5948..aacd96941 100644
--- a/Data/Scripts/009_Scenes/002_EventScene.rb
+++ b/Data/Scripts/009_Scenes/002_EventScene.rb
@@ -162,6 +162,7 @@ class EventScene
       next if !sprite || sprite.disposed? || !sprite.is_a?(Sprite)
       sprite.update
     end
+    @usersprites.delete_if { |sprite| sprite.disposed? }
     @onUpdate.trigger(self)
     if Input.trigger?(Input::BACK)
       @onBTrigger.trigger(self)
diff --git a/Data/Scripts/010_Data/001_GameData.rb b/Data/Scripts/010_Data/001_GameData.rb
index f413c04e9..ccfd971a2 100644
--- a/Data/Scripts/010_Data/001_GameData.rb
+++ b/Data/Scripts/010_Data/001_GameData.rb
@@ -190,7 +190,7 @@ module GameData
       return self::DATA.keys
     end
 
-    # Yields all data in numberical order.
+    # Yields all data in numerical order.
     def each
       keys = self::DATA.keys.sort
       keys.each { |key| yield self::DATA[key] }
diff --git a/Data/Scripts/010_Data/002_PBS data/008_Species.rb b/Data/Scripts/010_Data/002_PBS data/008_Species.rb
index 37a982773..1ce450615 100644
--- a/Data/Scripts/010_Data/002_PBS data/008_Species.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/008_Species.rb	
@@ -101,9 +101,11 @@ module GameData
       ret["WildItemUncommon"] = [:wild_item_uncommon, "*e", :Item]
       ret["WildItemRare"]     = [:wild_item_rare,     "*e", :Item]
       if compiling_forms
-        ret["Evolutions"]     = [:evolutions,         "*ees", :Species, :Evolution, nil]
+        ret["Evolutions"]     = [:evolutions,         "*ees", :Species, :Evolution]
+        ret["Evolution"]      = [:evolutions,         "^eeS", :Species, :Evolution]
       else
-        ret["Evolutions"]     = [:evolutions,         "*ses", nil, :Evolution, nil]
+        ret["Evolutions"]     = [:evolutions,         "*ses", nil, :Evolution]
+        ret["Evolution"]      = [:evolutions,         "^seS", nil, :Evolution]
       end
       return ret
     end
@@ -420,6 +422,8 @@ module GameData
       when "Habitat"
         ret = nil if ret == :None
       when "Evolutions"
+        ret = nil   # Want to use "Evolution" instead
+      when "Evolution"
         if ret
           ret = ret.reject { |evo| evo[3] }   # Remove prevolutions
           ret.each do |evo|
diff --git a/Data/Scripts/010_Data/002_PBS data/015_Trainer.rb b/Data/Scripts/010_Data/002_PBS data/015_Trainer.rb
index 7c50a1f35..d6a875e6f 100644
--- a/Data/Scripts/010_Data/002_PBS data/015_Trainer.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/015_Trainer.rb	
@@ -131,10 +131,7 @@ module GameData
         pkmn = Pokemon.new(species, pkmn_data[:level], trainer, false)
         trainer.party.push(pkmn)
         # Set Pokémon's properties if defined
-        if pkmn_data[:form]
-          pkmn.forced_form = pkmn_data[:form] if MultipleForms.hasFunction?(species, "getForm")
-          pkmn.form_simple = pkmn_data[:form]
-        end
+        pkmn.form_simple = pkmn_data[:form] if pkmn_data[:form]
         pkmn.item = pkmn_data[:item]
         if pkmn_data[:moves] && pkmn_data[:moves].length > 0
           pkmn_data[:moves].each { |move| pkmn.learn_move(move) }
diff --git a/Data/Scripts/011_Battle/001_Battle/006_Battle_ActionUseItem.rb b/Data/Scripts/011_Battle/001_Battle/006_Battle_ActionUseItem.rb
index 71bf57184..9fafeea89 100644
--- a/Data/Scripts/011_Battle/001_Battle/006_Battle_ActionUseItem.rb
+++ b/Data/Scripts/011_Battle/001_Battle/006_Battle_ActionUseItem.rb
@@ -55,7 +55,7 @@ class Battle
       end
     else
       items = pbGetOwnerItems(idxBattler)
-      items.delete_at(items.index(item))
+      items.delete_at(items.index(item)) if items
     end
   end
 
diff --git a/Data/Scripts/011_Battle/001_Battle/008_Battle_ActionOther.rb b/Data/Scripts/011_Battle/001_Battle/008_Battle_ActionOther.rb
index f6fe0b961..f1bb5c0fd 100644
--- a/Data/Scripts/011_Battle/001_Battle/008_Battle_ActionOther.rb
+++ b/Data/Scripts/011_Battle/001_Battle/008_Battle_ActionOther.rb
@@ -81,7 +81,9 @@ class Battle
         @mega_rings.each { |item| return GameData::Item.get(item).name if $bag.has?(item) }
       else
         trainer_items = pbGetOwnerItems(idxBattler)
-        @mega_rings.each { |item| return GameData::Item.get(item).name if trainer_items&.include?(item) }
+        if trainer_items
+          @mega_rings.each { |item| return GameData::Item.get(item).name if trainer_items.include?(item) }
+        end
       end
     end
     return _INTL("Mega Ring")
diff --git a/Data/Scripts/011_Battle/002_Battler/006_Battler_AbilityAndItem.rb b/Data/Scripts/011_Battle/002_Battler/006_Battler_AbilityAndItem.rb
index 50f1d83ea..3e5005b54 100644
--- a/Data/Scripts/011_Battle/002_Battler/006_Battler_AbilityAndItem.rb
+++ b/Data/Scripts/011_Battle/002_Battler/006_Battler_AbilityAndItem.rb
@@ -8,12 +8,21 @@ class Battle::Battler
     end
     # Reset form
     @battle.peer.pbOnLeavingBattle(@battle, @pokemon, @battle.usedInBattle[idxOwnSide][@index / 2])
+    # Check for end of Neutralizing Gas/Unnerve
+    if hasActiveAbility?(:NEUTRALIZINGGAS)
+      # Treat self as fainted
+      @hp = 0
+      @fainted = true
+      pbAbilitiesOnNeutralizingGasEnding
+    elsif hasActiveAbility?([:UNNERVE, :ASONECHILLINGNEIGH, :ASONEGRIMNEIGH])
+      # Treat self as fainted
+      @hp = 0
+      @fainted = true
+      pbItemsOnUnnerveEnding
+    end
     # Treat self as fainted
     @hp = 0
     @fainted = true
-    # Check for end of Neutralizing Gas/Unnerve
-    pbAbilitiesOnNeutralizingGasEnding if hasActiveAbility?(:NEUTRALIZINGGAS, true)
-    pbItemsOnUnnerveEnding if hasActiveAbility?([:UNNERVE, :ASONECHILLINGNEIGH, :ASONEGRIMNEIGH], true)
     # Check for end of primordial weather
     @battle.pbEndPrimordialWeather
   end
diff --git a/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb b/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb
index 450d61e98..f35de8ff5 100644
--- a/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb
+++ b/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb
@@ -18,6 +18,7 @@ class Battle::Battler
         #       target Cramorant attacking the user) and the ability splash
         #       shouldn't be shown.
         @battle.pbShowAbilitySplash(target)
+        target.pbChangeForm(0, nil)
         if user.takesIndirectDamage?(Battle::Scene::USE_ABILITY_SPLASH)
           @battle.scene.pbDamageAnimation(user)
           user.pbReduceHP(user.totalhp / 4, false)
diff --git a/Data/Scripts/011_Battle/004_Scene/001_Battle_Scene.rb b/Data/Scripts/011_Battle/004_Scene/001_Battle_Scene.rb
index 2c64ec037..1b9498144 100644
--- a/Data/Scripts/011_Battle/004_Scene/001_Battle_Scene.rb
+++ b/Data/Scripts/011_Battle/004_Scene/001_Battle_Scene.rb
@@ -188,7 +188,7 @@ class Battle::Scene
     cw.setText(msg)
     PBDebug.log_message(msg)
     yielded = false
-    timer_start = System.uptime
+    timer_start = nil
     loop do
       pbUpdate(cw)
       if !cw.busy?
@@ -202,6 +202,7 @@ class Battle::Scene
           @briefMessage = true
           break
         end
+        timer_start = System.uptime if !timer_start
         if System.uptime - timer_start >= MESSAGE_PAUSE_TIME   # Autoclose after 1 second
           cw.text = ""
           cw.visible = false
@@ -233,7 +234,7 @@ class Battle::Scene
     cw.text = msg + "\1"
     PBDebug.log_message(msg)
     yielded = false
-    timer_start = System.uptime
+    timer_start = nil
     loop do
       pbUpdate(cw)
       if !cw.busy?
@@ -242,6 +243,7 @@ class Battle::Scene
           yielded = true
         end
         if !@battleEnd
+          timer_start = System.uptime if !timer_start
           if System.uptime - timer_start >= MESSAGE_PAUSE_TIME * 3   # Autoclose after 3 seconds
             cw.text = ""
             cw.visible = false
diff --git a/Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb b/Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb
index f00ca35ad..7df74a9eb 100644
--- a/Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb
+++ b/Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb
@@ -408,8 +408,10 @@ Battle::AI::Handlers::ShouldSwitch.add(:asleep,
     end
     # Doesn't have sufficiently raised stats that would be lost by switching
     next false if battler.stages.any? { |key, val| val >= 2 }
-    # 50% chance to not bother
-    next false if ai.pbAIRandom(100) < 50
+    # A reserve Pokémon is awake and not frozen
+    next false if reserves.none? { |pkmn| ![:SLEEP, :FROZEN].include?(pkmn.status) }
+    # 60% chance to not bother
+    next false if ai.pbAIRandom(100) < 60
     PBDebug.log_ai("#{battler.name} wants to switch because it is asleep and can't do anything")
     next true
   }
@@ -631,6 +633,7 @@ Battle::AI::Handlers::ShouldNotSwitch.add(:lethal_entry_hazards,
 Battle::AI::Handlers::ShouldNotSwitch.add(:battler_has_super_effective_move,
   proc { |battler, reserves, ai, battle|
     next false if battler.effects[PBEffects::PerishSong] == 1
+    next false if battler.rough_end_of_round_damage >= battler.hp * 2 / 3
     next false if battle.rules["suddendeath"]
     has_super_effective_move = false
     battler.battler.eachMove do |move|
@@ -674,3 +677,29 @@ Battle::AI::Handlers::ShouldNotSwitch.add(:battler_has_very_raised_stats,
     next false
   }
 )
+
+#===============================================================================
+# Don't bother switching if the battler has Wonder Guard and is immune to the
+# foe's damaging attacks.
+#===============================================================================
+Battle::AI::Handlers::ShouldNotSwitch.add(:battler_is_immune_via_wonder_guard,
+  proc { |battler, reserves, ai, battle|
+    next false if battler.effects[PBEffects::PerishSong] == 1
+    next false if battler.rough_end_of_round_damage >= battler.hp / 2
+    next false if !battler.has_active_ability?(:WONDERGUARD)
+    super_effective_foe = false
+    ai.each_foe_battler(battler.side) do |b|
+      next if !b.check_for_move do |m|
+        next false if !m.damagingMove?
+        eff = battler.effectiveness_of_type_against_battler(m.pbCalcType(b.battler), b, m)
+        next Effectiveness.super_effective?(eff)
+      end
+      super_effective_foe = true
+      break
+    end
+    if !super_effective_foe
+      PBDebug.log_ai("#{battler.name} won't switch after all because it has Wonder Guard and can't be damaged by foes")
+    end
+    next !super_effective_foe
+  }
+)
diff --git a/Data/Scripts/011_Battle/005_AI/005_AI_ChooseMove.rb b/Data/Scripts/011_Battle/005_AI/005_AI_ChooseMove.rb
index 2fc420528..30f8e28cc 100644
--- a/Data/Scripts/011_Battle/005_AI/005_AI_ChooseMove.rb
+++ b/Data/Scripts/011_Battle/005_AI/005_AI_ChooseMove.rb
@@ -342,7 +342,8 @@ class Battle::AI
     if @trainer.high_skill? && @user.can_switch_lax?
       badMoves = false
       if max_score <= MOVE_USELESS_SCORE
-        badMoves = true
+        badMoves = user.can_attack?
+        badMoves = true if !badMoves && pbAIRandom(100) < 25
       elsif max_score < MOVE_BASE_SCORE * move_score_threshold && user_battler.turnCount > 2
         badMoves = true if pbAIRandom(100) < 80
       end
diff --git a/Data/Scripts/011_Battle/006_AI MoveEffects/004_AI_MoveEffects_MoveAttributes.rb b/Data/Scripts/011_Battle/006_AI MoveEffects/004_AI_MoveEffects_MoveAttributes.rb
index 3a03769a0..91e0363a5 100644
--- a/Data/Scripts/011_Battle/006_AI MoveEffects/004_AI_MoveEffects_MoveAttributes.rb	
+++ b/Data/Scripts/011_Battle/006_AI MoveEffects/004_AI_MoveEffects_MoveAttributes.rb	
@@ -115,7 +115,7 @@ Battle::AI::Handlers::MoveEffectAgainstTargetScore.copy("OHKO",
 Battle::AI::Handlers::MoveEffectAgainstTargetScore.add("DamageTargetAlly",
   proc { |score, move, user, target, ai, battle|
     target.battler.allAllies.each do |b|
-      next if !b.near?(target.battler) || !b.battler.takesIndirectDamage?
+      next if !b.near?(target.battler) || !b.takesIndirectDamage?
       score += 10
       if ai.trainer.has_skill_flag?("HPAware")
         score += 10 if b.hp <= b.totalhp / 16
diff --git a/Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb b/Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb
index dae58025d..5d9c5f596 100644
--- a/Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb	
+++ b/Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb	
@@ -32,8 +32,13 @@ module Battle::CatchAndStoreMixin
           end
           next if party_index < 0   # Cancelled
           party_size = pbPlayer.party.length
-          # Send chosen Pokémon to storage
+          # Get chosen Pokémon and clear battle-related conditions
           send_pkmn = pbPlayer.party[party_index]
+          @peer.pbOnLeavingBattle(self, send_pkmn, @usedInBattle[0][party_index], true)
+          send_pkmn.statusCount = 0 if send_pkmn.status == :POISON   # Bad poison becomes regular
+          send_pkmn.makeUnmega
+          send_pkmn.makeUnprimal
+          # Send chosen Pokémon to storage
           stored_box = @peer.pbStorePokemon(pbPlayer, send_pkmn)
           pbPlayer.party.delete_at(party_index)
           box_name = @peer.pbBoxName(stored_box)
diff --git a/Data/Scripts/012_Overworld/001_Overworld visuals/002_Overworld_Overlays.rb b/Data/Scripts/012_Overworld/001_Overworld visuals/002_Overworld_Overlays.rb
index bdad86c90..6d93c37eb 100644
--- a/Data/Scripts/012_Overworld/001_Overworld visuals/002_Overworld_Overlays.rb	
+++ b/Data/Scripts/012_Overworld/001_Overworld visuals/002_Overworld_Overlays.rb	
@@ -14,6 +14,7 @@ class LocationWindow
     @window.viewport.z = 99999
     @currentmap = $game_map.map_id
     @timer_start = System.uptime
+    @delayed = !$game_temp.fly_destination.nil?
   end
 
   def disposed?
@@ -25,7 +26,11 @@ class LocationWindow
   end
 
   def update
-    return if @window.disposed?
+    return if @window.disposed? || $game_temp.fly_destination
+    if @delayed
+      @timer_start = System.uptime
+      @delayed = false
+    end
     @window.update
     if $game_temp.message_window_showing || @currentmap != $game_map.map_id
       @window.dispose
diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
index 185c26b08..a0cb644f4 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb	
@@ -189,7 +189,8 @@ module BattleCreationHelperMethods
       ally = NPCTrainer.new($PokemonGlobal.partner[1], $PokemonGlobal.partner[0])
       ally.id    = $PokemonGlobal.partner[2]
       ally.party = $PokemonGlobal.partner[3]
-      ally_items[1] = ally.items.clone
+      data = GameData::Trainer.try_get($PokemonGlobal.partner[0], $PokemonGlobal.partner[1], $PokemonGlobal.partner[2])
+      ally_items[1] = data&.items.clone || []
       trainer_array.push(ally)
       pokemon_array = []
       $player.party.each { |pkmn| pokemon_array.push(pkmn) }
diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb b/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb
index 828327ce4..7eec7d96a 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/003_Overworld_WildEncounters.rb	
@@ -443,6 +443,7 @@ def pbGenerateWildPokemon(species, level, isRoamer = false)
     end
   end
   # Trigger events that may alter the generated Pokémon further
+  genwildpoke.form_simple = genwildpoke.form if MultipleForms.hasFunction?(genwildpoke.species, "getForm")
   EventHandlers.trigger(:on_wild_pokemon_created, genwildpoke)
   return genwildpoke
 end
diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb b/Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb
index c0b6d74b3..8221684cb 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb	
@@ -12,6 +12,38 @@ EventHandlers.add(:on_wild_pokemon_created, :make_shiny_switch,
   }
 )
 
+# In the Safari Zone and Bug-Catching Contests, wild Pokémon reroll their IVs up
+# to 4 times if they don't have a perfect IV.
+EventHandlers.add(:on_wild_pokemon_created, :reroll_ivs_in_safari_and_bug_contest,
+  proc { |pkmn|
+    next if !pbInSafari? && !pbInBugContest?
+    rerolled = false
+    4.times do
+      break if pkmn.iv.any? { |_stat, val| val == Pokemon::IV_STAT_LIMIT }
+      rerolled = true
+      GameData::Stat.each_main do |s|
+        pkmn.iv[s.id] = rand(Pokemon::IV_STAT_LIMIT + 1)
+      end
+    end
+    pkmn.calc_stats if rerolled
+  }
+)
+
+# In Gen 6 and later, Legendary/Mythical/Ultra Beast Pokémon are guaranteed to
+# have at least 3 perfect IVs.
+EventHandlers.add(:on_wild_pokemon_created, :some_perfect_ivs_for_legendaries,
+  proc { |pkmn|
+    next if !Settings::LEGENDARIES_HAVE_SOME_PERFECT_IVS
+    data = pkmn.species_data
+    next if !data.has_flag?("Legendary") && !data.has_flag?("Mythical") && !data.has_flag?("UltraBeast")
+    stats = []
+    GameData::Stat.each_main { |s| stats.push(s.id) }
+    perfect_stats = stats.sample(3)
+    perfect_stats.each { |s| pkmn.iv[s] = Pokemon::IV_STAT_LIMIT }
+    pkmn.calc_stats
+  }
+)
+
 # Used in the random dungeon map. Makes the levels of all wild Pokémon in that
 # map depend on the levels of Pokémon in the player's party.
 # This is a simple method, and can/should be modified to account for evolutions
diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
index f58687e9a..841e0c66c 100644
--- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
+++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
@@ -487,7 +487,6 @@ def pbFlyToNewLocation(pkmn = nil, move = :FLY)
     $game_temp.player_new_x         = $game_temp.fly_destination[1]
     $game_temp.player_new_y         = $game_temp.fly_destination[2]
     $game_temp.player_new_direction = 2
-    $game_temp.fly_destination = nil
     pbDismountBike
     $scene.transfer_player
     $game_map.autoplay
@@ -496,6 +495,7 @@ def pbFlyToNewLocation(pkmn = nil, move = :FLY)
     pbWait(0.25)
   end
   pbEraseEscapePoint
+  $game_temp.fly_destination = nil
   return true
 end
 
diff --git a/Data/Scripts/013_Items/004_Item_Phone.rb b/Data/Scripts/013_Items/004_Item_Phone.rb
index 374c1d87d..e4d4e9a7e 100644
--- a/Data/Scripts/013_Items/004_Item_Phone.rb
+++ b/Data/Scripts/013_Items/004_Item_Phone.rb
@@ -320,7 +320,7 @@ class Phone
     module_function
 
     def can_make?
-      return false if $game_map.metadata.has_flag?("NoPhoneSignal")
+      return false if $game_map.metadata&.has_flag?("NoPhoneSignal")
       return true
     end
 
diff --git a/Data/Scripts/013_Items/008_PokemonBag.rb b/Data/Scripts/013_Items/008_PokemonBag.rb
index f850103a4..bb50759bc 100644
--- a/Data/Scripts/013_Items/008_PokemonBag.rb
+++ b/Data/Scripts/013_Items/008_PokemonBag.rb
@@ -2,6 +2,7 @@
 # The Bag object, which actually contains all the items.
 #===============================================================================
 class PokemonBag
+  attr_reader   :pockets
   attr_accessor :last_viewed_pocket
   attr_accessor :last_pocket_selections
   attr_reader   :registered_items
@@ -34,11 +35,6 @@ class PokemonBag
     (PokemonBag.pocket_count + 1).times { |i| @last_pocket_selections[i] = 0 }
   end
 
-  def pockets
-    rearrange
-    return @pockets
-  end
-
   #-----------------------------------------------------------------------------
 
   # Gets the index of the current selected item in the pocket
@@ -46,7 +42,6 @@ class PokemonBag
     if pocket <= 0 || pocket > PokemonBag.pocket_count
       raise ArgumentError.new(_INTL("Invalid pocket: {1}", pocket.inspect))
     end
-    rearrange
     return [@last_pocket_selections[pocket], @pockets[pocket].length].min || 0
   end
 
@@ -55,7 +50,6 @@ class PokemonBag
     if pocket <= 0 || pocket > PokemonBag.pocket_count
       raise ArgumentError.new(_INTL("Invalid pocket: {1}", pocket.inspect))
     end
-    rearrange
     @last_pocket_selections[pocket] = value if value <= @pockets[pocket].length
   end
 
@@ -168,29 +162,6 @@ class PokemonBag
   def max_pocket_size(pocket)
     return Settings::BAG_MAX_POCKET_SIZE[pocket - 1] || -1
   end
-
-  def rearrange
-    return if @pockets.length == PokemonBag.pocket_count + 1
-    @last_viewed_pocket = 1
-    new_pockets = []
-    @last_pocket_selections = []
-    (PokemonBag.pocket_count + 1).times do |i|
-      new_pockets[i] = []
-      @last_pocket_selections[i] = 0
-    end
-    @pockets.each do |pocket|
-      next if !pocket
-      pocket.each do |item|
-        item_pocket = GameData::Item.get(item[0]).pocket
-        new_pockets[item_pocket].push(item)
-      end
-    end
-    new_pockets.each_with_index do |pocket, i|
-      next if i == 0 || !Settings::BAG_POCKET_AUTO_SORT[i - 1]
-      pocket.sort! { |a, b| GameData::Item.keys.index(a[0]) <=> GameData::Item.keys.index(b[0]) }
-    end
-    @pockets = new_pockets
-  end
 end
 
 #===============================================================================
diff --git a/Data/Scripts/015_Trainers and player/001_Trainer.rb b/Data/Scripts/015_Trainers and player/001_Trainer.rb
index 8a33185b8..a78515d0c 100644
--- a/Data/Scripts/015_Trainers and player/001_Trainer.rb	
+++ b/Data/Scripts/015_Trainers and player/001_Trainer.rb	
@@ -16,7 +16,8 @@ class Trainer
   end
 
   def full_name
-    return _INTL("{1} {2}", trainer_type_name, @name)
+    return @name if has_flag?("NoName")
+    return "#{trainer_type_name} #{@name}"
   end
 
   #=============================================================================
diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb
index 693ba9389..e8e934d41 100644
--- a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb	
+++ b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb	
@@ -88,7 +88,7 @@ class Scene_Credits
     ret.push("")
     ret.push(_INTL("\"mkxp-z\" by:"))
     add_names_to_credits(ret, [
-      "Roza",
+      "Anon",
       _INTL("Based on \"mkxp\" by Ancurio et al.")
     ])
     ret.push(_INTL("\"RPG Maker XP\" by:"))
diff --git a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
index 25be87921..c2b43b0ed 100644
--- a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
+++ b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
@@ -154,7 +154,7 @@ class PokemonPokedexInfo_Scene
   def pbGetAvailableForms
     ret = []
     multiple_forms = false
-    gender_differences = (GameData::Species.front_sprite_filename(@species, 0) == GameData::Species.front_sprite_filename(@species, 0, 1))
+    gender_differences = (GameData::Species.front_sprite_filename(@species, 0) != GameData::Species.front_sprite_filename(@species, 0, 1))
     # Find all genders/forms of @species that have been seen
     GameData::Species.each do |sp|
       next if sp.species != @species
@@ -328,7 +328,7 @@ class PokemonPokedexInfo_Scene
       map_metadata = GameData::MapMetadata.try_get(enc_data.map)
       next if !map_metadata || map_metadata.has_flag?("HideEncountersInPokedex")
       mappos = map_metadata.town_map_position
-      next if mappos[0] != @region   # Map isn't in the region being shown
+      next if !mappos || mappos[0] != @region   # Map isn't in the region being shown
       # Get the size and shape of the map in the Town Map
       map_size = map_metadata.town_map_size
       map_width = 1
diff --git a/Data/Scripts/016_UI/009_UI_RegionMap.rb b/Data/Scripts/016_UI/009_UI_RegionMap.rb
index 4124fa833..3749127d0 100644
--- a/Data/Scripts/016_UI/009_UI_RegionMap.rb
+++ b/Data/Scripts/016_UI/009_UI_RegionMap.rb
@@ -308,7 +308,8 @@ class PokemonRegionMap_Scene
         end
       elsif Input.trigger?(Input::USE) && @editor   # Intentionally after other USE input check
         pbChangeMapLocation(@map_x, @map_y)
-      elsif Input.trigger?(Input::ACTION) && !@wallmap && !@fly_map && pbCanFly?
+      elsif Input.trigger?(Input::ACTION) && Settings::CAN_FLY_FROM_TOWN_MAP &&
+            !@wallmap && !@fly_map && pbCanFly?
         pbPlayDecisionSE
         @mode = (@mode == 1) ? 0 : 1
         refresh_fly_screen
diff --git a/Data/Scripts/016_UI/013_UI_Load.rb b/Data/Scripts/016_UI/013_UI_Load.rb
index 9be8cda4f..225cad94a 100644
--- a/Data/Scripts/016_UI/013_UI_Load.rb
+++ b/Data/Scripts/016_UI/013_UI_Load.rb
@@ -279,6 +279,14 @@ class PokemonLoadScreen
   end
 
   def pbStartLoadScreen
+    if $DEBUG && !FileTest.exist?("Game.rgssad") && Settings::SKIP_CONTINUE_SCREEN
+      if @save_data.empty?
+        Game.start_new
+      else
+        Game.load(@save_data)
+      end
+      return
+    end
     commands = []
     cmd_continue     = -1
     cmd_new_game     = -1
diff --git a/Data/Scripts/017_Minigames/001_Minigame_Duel.rb b/Data/Scripts/017_Minigames/001_Minigame_Duel.rb
index 84720d60a..bebbd5264 100644
--- a/Data/Scripts/017_Minigames/001_Minigame_Duel.rb
+++ b/Data/Scripts/017_Minigames/001_Minigame_Duel.rb
@@ -60,7 +60,7 @@ class PokemonDuel
     @viewport.z = 99999
     @sprites = {}
     @sprites["player"] = IconSprite.new(-160, 96, @viewport)
-    @sprites["player"].setBitmap(GameData::TrainerType.front_sprite_filename($player.trainer_type))
+    @sprites["player"].setBitmap(GameData::TrainerType.player_front_sprite_filename($player.trainer_type))
     @sprites["opponent"] = IconSprite.new(Graphics.width + 32, 96, @viewport)
     @sprites["opponent"].setBitmap(GameData::TrainerType.front_sprite_filename(opponent.trainer_type))
     @sprites["playerwindow"] = DuelWindow.new($player.name, false)
diff --git a/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb b/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb
index 5166777e9..a4bd988bd 100644
--- a/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb
+++ b/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb
@@ -5,15 +5,113 @@
 # Run with:      pbVoltorbFlip
 #===============================================================================
 class VoltorbFlip
-  # Ranges of total coins available in each level.
-  LEVEL_RANGES = [[20, 50],
-                  [50, 100],
-                  [100, 200],
-                  [200, 350],
-                  [350, 600],
-                  [600, 1000],
-                  [1000, 2000],
-                  [2000, 3500]]
+  GRAPHICS_DIRECTORY = "Graphics/UI/Voltorb Flip/"
+  NUM_ROWS           = 5
+  NUM_COLUMNS        = 5
+  NUM_TILES          = NUM_ROWS * NUM_COLUMNS
+  TILE_DISTRIBUTIONS = [   # Voltorbs, Twos, Threes, MaxFreePerRowOrCol, MaxFreeTotal
+    # NOTE: The MaxFree values are not inclusive. The board will only be valid
+    #       if the corresponding counts are strictly less than these values.
+    # Level 1
+    [
+      [6, 3, 1, 3, 3],
+      [6, 0, 3, 2, 2],
+      [6, 5, 0, 3, 4],
+      [6, 2, 2, 3, 3],
+      [6, 4, 1, 3, 4]
+    ],
+    # Level 2
+    [
+      [7, 1, 3, 2, 3],
+      [7, 6, 0, 3, 4],
+      [7, 3, 2, 2, 3],
+      [7, 0, 4, 2, 3],
+      [7, 5, 1, 3, 4],
+      [7, 1, 3, 2, 2],
+      [7, 6, 0, 3, 3],
+      [7, 3, 2, 2, 2],
+      [7, 0, 4, 2, 2],
+      [7, 5, 1, 3, 3]
+    ],
+    # Level 3
+    [
+      [8, 2, 3, 2, 3],
+      [8, 7, 0, 3, 4],
+      [8, 4, 2, 3, 4],
+      [8, 1, 4, 2, 3],
+      [8, 6, 1, 4, 3],
+      [8, 2, 3, 2, 2],
+      [8, 7, 0, 3, 3],
+      [8, 4, 2, 3, 3],
+      [8, 1, 4, 2, 2],
+      [8, 6, 1, 3, 3]
+    ],
+    # Level 4
+    [
+      [8, 3, 3, 4, 3],
+      [8, 0, 5, 2, 3],
+      [10, 8, 0, 4, 5],
+      [10, 5, 2, 3, 4],
+      [10, 2, 4, 3, 4],
+      [8, 3, 3, 3, 3],
+      [8, 0, 5, 2, 2],
+      [10, 8, 0, 4, 4],
+      [10, 5, 2, 3, 3],
+      [10, 2, 4, 3, 3]
+    ],
+    # Level 5
+    [
+      [10, 7, 1, 4, 5],
+      [10, 4, 3, 3, 4],
+      [10, 1, 5, 3, 4],
+      [10, 9, 0, 4, 5],
+      [10, 6, 2, 4, 5],
+      [10, 7, 1, 4, 4],
+      [10, 4, 3, 3, 3],
+      [10, 1, 5, 3, 3],
+      [10, 9, 0, 4, 4],
+      [10, 6, 2, 4, 4]
+    ],
+    # Level 6
+    [
+      [10, 3, 4, 3, 4],
+      [10, 0, 6, 3, 4],
+      [10, 8, 1, 4, 5],
+      [10, 5, 3, 4, 5],
+      [10, 2, 5, 3, 4],
+      [10, 3, 4, 3, 3],
+      [10, 0, 6, 3, 3],
+      [10, 8, 1, 4, 4],
+      [10, 5, 3, 4, 4],
+      [10, 2, 5, 3, 3]
+    ],
+    # Level 7
+    [
+      [10, 7, 2, 4, 5],
+      [10, 4, 4, 4, 5],
+      [13, 1, 6, 3, 4],
+      [13, 9, 1, 5, 6],
+      [10, 6, 3, 4, 5],
+      [10, 7, 2, 4, 4],
+      [10, 4, 4, 4, 4],
+      [13, 1, 6, 3, 3],
+      [13, 9, 1, 5, 5],
+      [10, 6, 3, 4, 4]
+    ],
+    # Level 8
+    [
+      [10, 0, 7, 3, 4],
+      [10, 8, 2, 5, 6],
+      [10, 5, 4, 4, 5],
+      [10, 2, 6, 4, 5],
+      [10, 7, 3, 5, 6],
+      [10, 0, 7, 3, 3],
+      [10, 8, 2, 5, 5],
+      [10, 5, 4, 4, 4],
+      [10, 2, 6, 4, 4],
+      [10, 7, 3, 5, 5]
+    ]
+  ]
 
   def update
     pbUpdateSpriteHash(@sprites)
@@ -25,6 +123,50 @@ class VoltorbFlip
     pbNewGame
   end
 
+  def generate_board
+    ret = []
+    1000.times do |attempt|
+      board_distro = TILE_DISTRIBUTIONS[@level - 1].sample
+      # Randomly distribute tiles
+      ret = [1] * NUM_TILES
+      index = 0
+      [0, 2, 3].each do |value|
+        qty = board_distro[[value - 1, 0].max]
+        qty.times do |i|
+          ret[index] = value
+          index += 1
+        end
+      end
+      ret.shuffle!
+      # Find how many Voltorbs are in each row/column
+      row_voltorbs = [0] * NUM_ROWS
+      col_voltorbs = [0] * NUM_COLUMNS
+      ret.each_with_index do |val, i|
+        next if val != 0
+        row_voltorbs[i / NUM_COLUMNS] += 1
+        col_voltorbs[i % NUM_COLUMNS] += 1
+      end
+      # Count the number of x2 and x3 tiles are free (i.e. no Voltorbs in its row/column)
+      free_multipliers = 0
+      free_row = [0] * NUM_ROWS
+      free_col = [0] * NUM_COLUMNS
+      ret.each_with_index do |val, i|
+        next if val <= 1
+        next if row_voltorbs[i / NUM_COLUMNS] > 0 && col_voltorbs[i % NUM_COLUMNS] > 0
+        free_multipliers += 1
+        free_row[i / NUM_COLUMNS] += 1
+        free_col[i % NUM_COLUMNS] += 1
+      end
+      # Regnerate board if there are too many free multiplier tiles
+      next if free_multipliers >= board_distro[4]
+      next if free_row.any? { |i| i >= board_distro[3] }
+      next if free_col.any? { |i| i >= board_distro[3] }
+      # Board is valid; use it
+      break
+    end
+    return ret
+  end
+
   def pbNewGame
     # Initialize variables
     @sprites = {}
@@ -35,54 +177,17 @@ class VoltorbFlip
     @voltorbNumbers = []
     @points = 0
     @index = [0, 0]
-    # [x,y,points,selected]
-    @squares = [0, 0, 0, false]
-    @directory = "Graphics/UI/Voltorb Flip/"
-    squareValues = []
-    total = 1
-    voltorbs = 0
-    25.times do |i|
-      # Sets the value to 1 by default
-      squareValues[i] = 1
-      # Sets the value to 0 (a voltorb) if # for that level hasn't been reached
-      if voltorbs < 5 + @level
-        squareValues[i] = 0
-        voltorbs += 1
-      # Sets the value randomly to a 2 or 3 if the total is less than the max
-      elsif total < LEVEL_RANGES[@level - 1][1]
-        squareValues[i] = rand(2..3)
-        total *= squareValues[i]
-      end
-      next if total <= LEVEL_RANGES[@level - 1][1]
-      # Lowers value of square to 1 if over max
-      total /= squareValues[i]
-      squareValues[i] = 1
-    end
-    # Randomize the values a little
-    25.times do |i|
-      temp = squareValues[i]
-      if squareValues[i] > 1 && rand(10) == 0
-        total /= squareValues[i]
-        squareValues[i] -= 1
-        total *= squareValues[i]
-      end
-      next if total >= LEVEL_RANGES[@level - 1][0] || squareValues[i] <= 0
-      total /= squareValues[i]
-      squareValues[i] = temp
-      total *= squareValues[i]
-    end
-    # Populate @squares array
-    25.times do |i|
-      r = rand(squareValues.length)
-      @squares[i] = [((i % 5) * 64) + 128, (i / 5).abs * 64, squareValues[r], false]
-      squareValues.delete_at(r)
+    @squares = []   # Each square is [x, y, points, revealed]
+    # Generate a board
+    squareValues = generate_board
+    # Apply the generated board
+    squareValues.each_with_index do |val, i|
+      @squares[i] = [((i % NUM_COLUMNS) * 64) + 128, (i / NUM_COLUMNS).abs * 64, val, false]
     end
     pbCreateSprites
     # Display numbers (all zeroes, as no values have been calculated yet)
-    5.times do |i|
-      pbUpdateRowNumbers(0, 0, i)
-      pbUpdateColumnNumbers(0, 0, i)
-    end
+    NUM_ROWS.times { |i| pbUpdateRowNumbers(0, 0, i) }
+    NUM_COLUMNS.times { |i| pbUpdateColumnNumbers(0, 0, i) }
     pbDrawShadowText(@sprites["text"].bitmap, 8, 22, 118, 26,
                      _INTL("Your coins"), Color.new(60, 60, 60), Color.new(150, 190, 170), 1)
     pbDrawShadowText(@sprites["text"].bitmap, 8, 88, 118, 26,
@@ -122,27 +227,27 @@ class VoltorbFlip
       @voltorbNumbers = []
       @numbers = []
       # Draw numbers for each row (precautionary)
-      @squares.length.times do |i|
-        next if (i % 5) != 0
+      NUM_ROWS.times do |j|
         num = 0
         voltorbs = 0
-        j = i + 5
-        (i...j).each do |k|
-          num += @squares[k][2]
-          voltorbs += 1 if @squares[k][2] == 0
+        NUM_COLUMNS.times do |i|
+          val = @squares[i + (j * NUM_COLUMNS)][2]
+          num += val
+          voltorbs += 1 if val == 0
         end
-        pbUpdateRowNumbers(num, voltorbs, i / 5)
+        pbUpdateRowNumbers(num, voltorbs, j)
       end
       # Reset arrays to empty
       @voltorbNumbers = []
       @numbers = []
       # Draw numbers for each column
-      5.times do |i|
+      NUM_COLUMNS.times do |i|
         num = 0
         voltorbs = 0
-        5.times do |j|
-          num += @squares[i + (j * 5)][2]
-          voltorbs += 1 if @squares[i + (j * 5)][2] == 0
+        NUM_ROWS.times do |j|
+          val = @squares[i + (j * NUM_COLUMNS)][2]
+          num += val
+          voltorbs += 1 if val == 0
         end
         pbUpdateColumnNumbers(num, voltorbs, i)
       end
@@ -153,7 +258,7 @@ class VoltorbFlip
     @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
     @viewport.z = 99999
     @sprites["bg"] = Sprite.new(@viewport)
-    @sprites["bg"].bitmap = RPG::Cache.load_bitmap(@directory, _INTL("Voltorb Flip bg"))
+    @sprites["bg"].bitmap = RPG::Cache.load_bitmap(GRAPHICS_DIRECTORY, _INTL("Voltorb Flip bg"))
     @sprites["text"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
     pbSetSystemFont(@sprites["text"].bitmap)
     @sprites["level"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
@@ -177,7 +282,7 @@ class VoltorbFlip
     @sprites["icon"].z = 99997
     @sprites["mark"] = BitmapSprite.new(Graphics.width, Graphics.height, @viewport)
     @sprites["memo"] = Sprite.new(@viewport)
-    @sprites["memo"].bitmap = RPG::Cache.load_bitmap(@directory, _INTL("memo"))
+    @sprites["memo"].bitmap = RPG::Cache.load_bitmap(GRAPHICS_DIRECTORY, _INTL("memo"))
     @sprites["memo"].x = 10
     @sprites["memo"].y = 244
     @sprites["memo"].visible = false
@@ -195,20 +300,20 @@ class VoltorbFlip
     icons = []
     points = 0
     3.times do |i|
-      25.times do |j|
+      NUM_TILES.times do |j|
         points = @squares[j][2] if i == 2
-        icons[j] = [@directory + "tiles", @squares[j][0], @squares[j][1], 320 + (i * 64) + (points * 64), 0, 64, 64]
+        icons[j] = [GRAPHICS_DIRECTORY + "tiles", @squares[j][0], @squares[j][1], 320 + (i * 64) + (points * 64), 0, 64, 64]
       end
       icons.compact!
       pbDrawImagePositions(@sprites[i].bitmap, icons)
     end
     icons = []
-    25.times do |i|
-      icons[i] = [@directory + "tiles", @squares[i][0], @squares[i][1], @squares[i][2] * 64, 0, 64, 64]
+    NUM_TILES.times do |i|
+      icons[i] = [GRAPHICS_DIRECTORY + "tiles", @squares[i][0], @squares[i][1], @squares[i][2] * 64, 0, 64, 64]
     end
     pbDrawImagePositions(@sprites[5].bitmap, icons)
     # Default cursor image
-    @cursor[0] = [@directory + "cursor", 0 + 128, 0, 0, 0, 64, 64]
+    @cursor[0] = [GRAPHICS_DIRECTORY + "cursor", 0 + 128, 0, 0, 0, 64, 64]
   end
 
   def getInput
@@ -257,7 +362,7 @@ class VoltorbFlip
         end
         (@marks.length + 1).times do |i|
           if @marks[i].nil?
-            @marks[i] = [@directory + "tiles", (@index[0] * 64) + 128, @index[1] * 64, 256, 0, 64, 64]
+            @marks[i] = [GRAPHICS_DIRECTORY + "tiles", (@index[0] * 64) + 128, @index[1] * 64, 256, 0, 64, 64]
           elsif @marks[i][1] == (@index[0] * 64) + 128 && @marks[i][2] == @index[1] * 64
             @marks.delete_at(i)
             @marks.compact!
@@ -281,7 +386,7 @@ class VoltorbFlip
               # Part1
               animation = []
               3.times do |j|
-                animation[0] = icons[0] = [@directory + "tiles", (@index[0] * 64) + 128, @index[1] * 64,
+                animation[0] = icons[0] = [GRAPHICS_DIRECTORY + "tiles", (@index[0] * 64) + 128, @index[1] * 64,
                                            704 + (64 * j), 0, 64, 64]
                 pbDrawImagePositions(@sprites["animation"].bitmap, animation)
                 pbWait(0.05)
@@ -290,7 +395,7 @@ class VoltorbFlip
               # Part2
               animation = []
               6.times do |j|
-                animation[0] = [@directory + "explosion", (@index[0] * 64) - 32 + 128, (@index[1] * 64) - 32,
+                animation[0] = [GRAPHICS_DIRECTORY + "explosion", (@index[0] * 64) - 32 + 128, (@index[1] * 64) - 32,
                                 j * 128, 0, 128, 128]
                 pbDrawImagePositions(@sprites["animation"].bitmap, animation)
                 pbWait(0.1)
@@ -302,14 +407,10 @@ class VoltorbFlip
               @sprites["mark"].bitmap.clear
               if @level > 1
                 # Determine how many levels to reduce by
-                newLevel = 0
-                @squares.length.times do |j|
-                  newLevel += 1 if @squares[j][3] == true && @squares[j][2] > 1
-                end
-                newLevel = @level if newLevel > @level
-                if @level > newLevel
+                newLevel = @squares.count { |tile| tile[3] && tile[2] > 0 }
+                newLevel = newLevel.clamp(@level, 1)
+                if newLevel < @level
                   @level = newLevel
-                  @level = 1 if @level < 1
                   pbMessage("\\se[Voltorb Flip level down]" + _INTL("Dropped to Game Lv. {1}!", @level.to_s))
                 end
               end
@@ -321,10 +422,8 @@ class VoltorbFlip
               pbUpdateCoins
               # Revert numbers to 0s
               @sprites["numbers"].bitmap.clear
-              5.times do |j|
-                pbUpdateRowNumbers(0, 0, j)
-                pbUpdateColumnNumbers(0, 0, j)
-              end
+              NUM_ROWS.times { |j| pbUpdateRowNumbers(0, 0, j) }
+              NUM_COLUMNS.times { |j| pbUpdateColumnNumbers(0, 0, j) }
               pbDisposeSpriteHash(@sprites)
               @firstRound = false
               pbNewGame
@@ -332,7 +431,7 @@ class VoltorbFlip
               # Play tile animation
               animation = []
               4.times do |j|
-                animation[0] = [@directory + "flipAnimation", (@index[0] * 64) - 14 + 128, (@index[1] * 64) - 16,
+                animation[0] = [GRAPHICS_DIRECTORY + "flipAnimation", (@index[0] * 64) - 14 + 128, (@index[1] * 64) - 16,
                                 j * 92, 0, 92, 96]
                 pbDrawImagePositions(@sprites["animation"].bitmap, animation)
                 pbWait(0.05)
@@ -375,10 +474,8 @@ class VoltorbFlip
         pbShowAndDispose
         # Revert numbers to 0s
         @sprites["numbers"].bitmap.clear
-        5.times do |i|
-          pbUpdateRowNumbers(0, 0, i)
-          pbUpdateColumnNumbers(0, 0, i)
-        end
+        NUM_ROWS.times { |i| pbUpdateRowNumbers(0, 0, i) }
+        NUM_COLUMNS.times { |i| pbUpdateColumnNumbers(0, 0, i) }
         @sprites["curtain"].opacity = 100
         if @level < 8
           @level += 1
@@ -395,11 +492,11 @@ class VoltorbFlip
     elsif Input.trigger?(Input::ACTION)
       pbPlayDecisionSE
       @sprites["cursor"].bitmap.clear
-      if @cursor[0][3] == 0 # If in normal mode
-        @cursor[0] = [@directory + "cursor", 128, 0, 64, 0, 64, 64]
+      if @cursor[0][3] == 0   # If in normal mode
+        @cursor[0] = [GRAPHICS_DIRECTORY + "cursor", 128, 0, 64, 0, 64, 64]
         @sprites["memo"].visible = true
-      else # Mark mode
-        @cursor[0] = [@directory + "cursor", 128, 0, 0, 0, 64, 64]
+      else   # Mark mode
+        @cursor[0] = [GRAPHICS_DIRECTORY + "cursor", 128, 0, 0, 0, 64, 64]
         @sprites["memo"].visible = false
       end
     elsif Input.trigger?(Input::BACK)
@@ -431,9 +528,9 @@ class VoltorbFlip
   def pbUpdateRowNumbers(num, voltorbs, i)
     numText = sprintf("%02d", num)
     numText.chars.each_with_index do |digit, j|
-      @numbers[j] = [@directory + "numbersSmall", 472 + (j * 16), 8 + (i * 64), digit.to_i * 16, 0, 16, 16]
+      @numbers[j] = [GRAPHICS_DIRECTORY + "numbersSmall", 472 + (j * 16), 8 + (i * 64), digit.to_i * 16, 0, 16, 16]
     end
-    @voltorbNumbers[i] = [@directory + "numbersSmall", 488, 34 + (i * 64), voltorbs * 16, 0, 16, 16]
+    @voltorbNumbers[i] = [GRAPHICS_DIRECTORY + "numbersSmall", 488, 34 + (i * 64), voltorbs * 16, 0, 16, 16]
     # Display the numbers
     pbDrawImagePositions(@sprites["numbers"].bitmap, @numbers)
     pbDrawImagePositions(@sprites["numbers"].bitmap, @voltorbNumbers)
@@ -442,9 +539,9 @@ class VoltorbFlip
   def pbUpdateColumnNumbers(num, voltorbs, i)
     numText = sprintf("%02d", num)
     numText.chars.each_with_index do |digit, j|
-      @numbers[j] = [@directory + "numbersSmall", 152 + (i * 64) + (j * 16), 328, digit.to_i * 16, 0, 16, 16]
+      @numbers[j] = [GRAPHICS_DIRECTORY + "numbersSmall", 152 + (i * 64) + (j * 16), 328, digit.to_i * 16, 0, 16, 16]
     end
-    @voltorbNumbers[i] = [@directory + "numbersSmall", 168 + (i * 64), 354, voltorbs * 16, 0, 16, 16]
+    @voltorbNumbers[i] = [GRAPHICS_DIRECTORY + "numbersSmall", 168 + (i * 64), 354, voltorbs * 16, 0, 16, 16]
     # Display the numbers
     pbDrawImagePositions(@sprites["numbers"].bitmap, @numbers)
     pbDrawImagePositions(@sprites["numbers"].bitmap, @voltorbNumbers)
@@ -453,7 +550,7 @@ class VoltorbFlip
   def pbCreateCoins(source, y)
     coinText = sprintf("%05d", source)
     coinText.chars.each_with_index do |digit, i|
-      @coins[i] = [@directory + "numbersScore", 6 + (i * 24), y, digit.to_i * 24, 0, 24, 38]
+      @coins[i] = [GRAPHICS_DIRECTORY + "numbersScore", 6 + (i * 24), y, digit.to_i * 24, 0, 24, 38]
     end
   end
 
@@ -473,11 +570,11 @@ class VoltorbFlip
     points = 0
     3.times do |i|
       points = tile if i == 2
-      icons[i] = [@directory + "tiles", x, y, 320 + (i * 64) + (points * 64), 0, 64, 64]
+      icons[i] = [GRAPHICS_DIRECTORY + "tiles", x, y, 320 + (i * 64) + (points * 64), 0, 64, 64]
       pbDrawImagePositions(@sprites["icon"].bitmap, icons)
       pbWait(0.05)
     end
-    icons[3] = [@directory + "tiles", x, y, tile * 64, 0, 64, 64]
+    icons[3] = [GRAPHICS_DIRECTORY + "tiles", x, y, tile * 64, 0, 64, 64]
     pbDrawImagePositions(@sprites["icon"].bitmap, icons)
     pbSEPlay("Voltorb Flip tile")
   end
@@ -504,27 +601,30 @@ class VoltorbFlip
       end
     end
     # "Dispose" of tiles by column
-    5.times do |i|
+    NUM_COLUMNS.times do |i|
       icons = []
       pbSEPlay("Voltorb Flip tile")
-      5.times do |j|
-        icons[j] = [@directory + "tiles", @squares[i + (j * 5)][0], @squares[i + (j * 5)][1],
-                    448 + (@squares[i + (j * 5)][2] * 64), 0, 64, 64]
+      NUM_ROWS.times do |j|
+        icons[j] = [GRAPHICS_DIRECTORY + "tiles", @squares[i + (j * NUM_COLUMNS)][0], @squares[i + (j * NUM_COLUMNS)][1],
+                    448 + (@squares[i + (j * NUM_COLUMNS)][2] * 64), 0, 64, 64]
       end
       pbDrawImagePositions(@sprites[i].bitmap, icons)
       pbWait(0.05)
-      5.times do |j|
-        icons[j] = [@directory + "tiles", @squares[i + (j * 5)][0], @squares[i + (j * 5)][1], 384, 0, 64, 64]
+      NUM_ROWS.times do |j|
+        icons[j] = [GRAPHICS_DIRECTORY + "tiles", @squares[i + (j * NUM_COLUMNS)][0], @squares[i + (j * NUM_COLUMNS)][1],
+                    384, 0, 64, 64]
       end
       pbDrawImagePositions(@sprites[i].bitmap, icons)
       pbWait(0.05)
-      5.times do |j|
-        icons[j] = [@directory + "tiles", @squares[i + (j * 5)][0], @squares[i + (j * 5)][1], 320, 0, 64, 64]
+      NUM_ROWS.times do |j|
+        icons[j] = [GRAPHICS_DIRECTORY + "tiles", @squares[i + (j * NUM_COLUMNS)][0], @squares[i + (j * NUM_COLUMNS)][1],
+                    320, 0, 64, 64]
       end
       pbDrawImagePositions(@sprites[i].bitmap, icons)
       pbWait(0.05)
-      5.times do |j|
-        icons[j] = [@directory + "tiles", @squares[i + (j * 5)][0], @squares[i + (j * 5)][1], 896, 0, 64, 64]
+      NUM_ROWS.times do |j|
+        icons[j] = [GRAPHICS_DIRECTORY + "tiles", @squares[i + (j * NUM_COLUMNS)][0], @squares[i + (j * NUM_COLUMNS)][1],
+                    896, 0, 64, 64]
       end
       pbDrawImagePositions(@sprites[i].bitmap, icons)
       pbWait(0.05)
diff --git a/Data/Scripts/019_Utilities/001_Utilities.rb b/Data/Scripts/019_Utilities/001_Utilities.rb
index 8d94094f3..39df7ce43 100644
--- a/Data/Scripts/019_Utilities/001_Utilities.rb
+++ b/Data/Scripts/019_Utilities/001_Utilities.rb
@@ -611,7 +611,14 @@ end
 def pbScreenCapture
   t = Time.now
   filestart = t.strftime("[%Y-%m-%d] %H_%M_%S.%L")
-  capturefile = RTP.getSaveFileName(sprintf("%s.png", filestart))
-  Graphics.screenshot(capturefile)
+  begin
+    folder_name = "Screenshots"
+    Dir.create(folder_name) if !Dir.safe?(folder_name)
+    capturefile = folder_name + "/" + sprintf("%s.png", filestart)
+    Graphics.screenshot(capturefile)
+  rescue
+    capturefile = RTP.getSaveFileName(sprintf("%s.png", filestart))
+    Graphics.screenshot(capturefile)
+  end
   pbSEPlay("Pkmn exp full") if FileTest.audio_exist?("Audio/SE/Pkmn exp full")
 end
diff --git a/Data/Scripts/019_Utilities/003_Utilities_BattleAudio.rb b/Data/Scripts/019_Utilities/003_Utilities_BattleAudio.rb
index 8d8c58bc5..70525cc12 100644
--- a/Data/Scripts/019_Utilities/003_Utilities_BattleAudio.rb
+++ b/Data/Scripts/019_Utilities/003_Utilities_BattleAudio.rb
@@ -65,8 +65,14 @@ def pbPlayTrainerIntroBGM(trainer_type)
   return if nil_or_empty?(trainer_type_data.intro_BGM)
   bgm = pbStringToAudioFile(trainer_type_data.intro_BGM)
   if !$game_temp.memorized_bgm
-    $game_temp.memorized_bgm = $game_system.getPlayingBGM
-    $game_temp.memorized_bgm_position = (Audio.bgm_pos rescue 0)
+    if $game_temp.cue_bgm_delay
+      $game_temp.cue_bgm_delay = nil
+      $game_temp.memorized_bgm = $game_temp.cue_bgm
+      $game_temp.memorized_bgm_position = 0
+    else
+      $game_temp.memorized_bgm = $game_system.getPlayingBGM
+      $game_temp.memorized_bgm_position = (Audio.bgm_pos rescue 0)
+    end
   end
   pbBGMPlay(bgm)
 end
diff --git a/Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb b/Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb
index af18c46fc..97c7f3924 100644
--- a/Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb	
+++ b/Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb	
@@ -348,7 +348,7 @@ def pbTrainerTypeEditor
     if tr_type
       case button
       when Input::ACTION
-        if tr_type.is_a?(Symbol) && pbConfirmMessageSerious("Delete this trainer type?")
+        if tr_type.is_a?(Symbol) && pbConfirmMessageSerious(_INTL("Delete this trainer type?"))
           GameData::TrainerType::DATA.delete(tr_type)
           GameData::TrainerType.save
           pbConvertTrainerData
@@ -481,7 +481,7 @@ def pbTrainerBattleEditor
     if trainer_id
       case button
       when Input::ACTION
-        if trainer_id.is_a?(Array) && pbConfirmMessageSerious("Delete this trainer battle?")
+        if trainer_id.is_a?(Array) && pbConfirmMessageSerious(_INTL("Delete this trainer battle?"))
           tr_data = GameData::Trainer::DATA[trainer_id]
           GameData::Trainer::DATA.delete(trainer_id)
           modified = true
@@ -825,7 +825,7 @@ def pbItemEditor
     if item
       case button
       when Input::ACTION
-        if item.is_a?(Symbol) && pbConfirmMessageSerious("Delete this item?")
+        if item.is_a?(Symbol) && pbConfirmMessageSerious(_INTL("Delete this item?"))
           GameData::Item::DATA.delete(item)
           GameData::Item.save
           Compiler.write_items
@@ -929,7 +929,7 @@ def pbPokemonEditor
     if species
       case button
       when Input::ACTION
-        if species.is_a?(Symbol) && pbConfirmMessageSerious("Delete this species?")
+        if species.is_a?(Symbol) && pbConfirmMessageSerious(_INTL("Delete this species?"))
           GameData::Species::DATA.delete(species)
           GameData::Species.save
           Compiler.write_pokemon
diff --git a/Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb b/Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb
index 42d794da0..560bd0b97 100644
--- a/Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb	
+++ b/Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb	
@@ -508,8 +508,8 @@ module BattleAnimationEditor
     ret = false
     pbRgssChdir(File.join("Audio", "SE", "Anim")) do
       animfiles.concat(Dir.glob("*.wav"))
-  #    animfiles.concat(Dir.glob("*.mp3"))
       animfiles.concat(Dir.glob("*.ogg"))
+      animfiles.concat(Dir.glob("*.mp3"))
       animfiles.concat(Dir.glob("*.wma"))
     end
     animfiles.uniq!
diff --git a/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb b/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb
index 99c875507..6dd0c35a3 100644
--- a/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb	
+++ b/Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb	
@@ -126,7 +126,7 @@ MenuHandlers.add(:debug_menu, :safari_zone_and_bug_contest, {
               break
             end
           end
-        when 1   # Safari Balls
+        when 1   # Sport Balls
           params = ChooseNumberParams.new
           params.setRange(0, 99999)
           params.setDefaultValue(contest.ballcount)
@@ -162,7 +162,7 @@ MenuHandlers.add(:debug_menu, :edit_field_effects, {
         params = ChooseNumberParams.new
         params.setRange(0, 99999)
         params.setDefaultValue($PokemonGlobal.repel)
-        $PokemonGlobal.repel = pbMessageChooseNumber(_INTL("Set the Pokémon's level."), params)
+        $PokemonGlobal.repel = pbMessageChooseNumber(_INTL("Set the number of steps remaining."), params)
       when 1   # Strength used
         $PokemonMap.strengthUsed = !$PokemonMap.strengthUsed
       when 2   # Flash used
diff --git a/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb b/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb
index 12d2feb2c..6fd27602f 100644
--- a/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb	
+++ b/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb	
@@ -613,7 +613,7 @@ def pbImportAllAnimations
       Graphics.update
       audios = []
       files = Dir.glob(folder + "/*.*")
-      ["wav", "ogg", "mid", "wma"].each do |ext|   # mp3
+      ["wav", "ogg", "mp3", "midi", "mid", "wma"].each do |ext|
         upext = ext.upcase
         audios.concat(files.find_all { |f| f[f.length - 3, 3] == ext })
         audios.concat(files.find_all { |f| f[f.length - 3, 3] == upext })
diff --git a/Data/Scripts/020_Debug/003_Editor_Listers.rb b/Data/Scripts/020_Debug/003_Editor_Listers.rb
index 802d0c620..b34487c49 100644
--- a/Data/Scripts/020_Debug/003_Editor_Listers.rb
+++ b/Data/Scripts/020_Debug/003_Editor_Listers.rb
@@ -213,11 +213,12 @@ class MusicFileLister
     folder = (@bgm) ? "Audio/BGM/" : "Audio/ME/"
     @commands.clear
     Dir.chdir(folder) do
-#      Dir.glob("*.mp3") { |f| @commands.push(f) }
-      Dir.glob("*.ogg") { |f| @commands.push(f) }
       Dir.glob("*.wav") { |f| @commands.push(f) }
-      Dir.glob("*.mid") { |f| @commands.push(f) }
+      Dir.glob("*.ogg") { |f| @commands.push(f) }
+      Dir.glob("*.mp3") { |f| @commands.push(f) }
       Dir.glob("*.midi") { |f| @commands.push(f) }
+      Dir.glob("*.mid") { |f| @commands.push(f) }
+      Dir.glob("*.wma") { |f| @commands.push(f) }
     end
     @commands.uniq!
     @commands.sort! { |a, b| a.downcase <=> b.downcase }
diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/021_Compiler/001_Compiler.rb
index 0eb7a5de2..7f77ea716 100644
--- a/Data/Scripts/021_Compiler/001_Compiler.rb
+++ b/Data/Scripts/021_Compiler/001_Compiler.rb
@@ -112,11 +112,11 @@ module Compiler
         else
           if sectionname.nil?
             FileLineData.setLine(line, lineno)
-            raise _INTL("Expected a section at the beginning of the file. This error may also occur if the file was not saved in UTF-8.\n{1}", FileLineData.linereport)
+            raise _INTL("Expected a section at the beginning of the file.\nThis error may also occur if the file was not saved in UTF-8.") + "\n" + FileLineData.linereport
           end
           if !line[/^\s*(\w+)\s*=\s*(.*)$/]
             FileLineData.setSection(sectionname, nil, line)
-            raise _INTL("Bad line syntax (expected syntax like XXX=YYY)\n{1}", FileLineData.linereport)
+            raise _INTL("Bad line syntax (expected syntax like XXX=YYY).") + "\n" + FileLineData.linereport
           end
           r1 = $~[1]
           r2 = $~[2]
@@ -316,7 +316,7 @@ module Compiler
       end
       str[0, fieldbytes] = ""
       if !str[/^\s*,/] && !str[/^\s*$/]
-        raise _INTL("Invalid quoted field (in: {1})\n{2}", str, FileLineData.linereport)
+        raise _INTL("Invalid quoted field (in: {1}).", str) + "\n" + FileLineData.linereport
       end
       str[0, str.length] = $~.post_match
     else
@@ -337,14 +337,14 @@ module Compiler
     field = csvfield!(str)
     return true if field[/^(?:1|TRUE|YES|Y)$/i]
     return false if field[/^(?:0|FALSE|NO|N)$/i]
-    raise _INTL("Field {1} is not a Boolean value (true, false, 1, 0)\n{2}", field, FileLineData.linereport)
+    raise _INTL("Field '{1}' is not a Boolean value (true, false, 1, 0).", field) + "\n" + FileLineData.linereport
   end
 
   # Unused
   def csvInt!(str, _line = -1)
     ret = csvfield!(str)
     if !ret[/^\-?\d+$/]
-      raise _INTL("Field {1} is not an integer\n{2}", ret, FileLineData.linereport)
+      raise _INTL("Field '{1}' is not an integer.", ret) + "\n" + FileLineData.linereport
     end
     return ret.to_i
   end
@@ -353,7 +353,7 @@ module Compiler
   def csvPosInt!(str, _line = -1)
     ret = csvfield!(str)
     if !ret[/^\d+$/]
-      raise _INTL("Field {1} is not a positive integer\n{2}", ret, FileLineData.linereport)
+      raise _INTL("Field '{1}' is not a positive integer.", ret) + "\n" + FileLineData.linereport
     end
     return ret.to_i
   end
@@ -361,7 +361,7 @@ module Compiler
   # Unused
   def csvFloat!(str, _line = -1)
     ret = csvfield!(str)
-    return Float(ret) rescue raise _INTL("Field {1} is not a number\n{2}", ret, FileLineData.linereport)
+    return Float(ret) rescue raise _INTL("Field '{1}' is not a number.", ret) + "\n" + FileLineData.linereport
   end
 
   # Unused
@@ -384,52 +384,52 @@ module Compiler
   def cast_csv_value(value, schema, enumer = nil)
     case schema.downcase
     when "i"   # Integer
-      if !value[/^\-?\d+$/]
-        raise _INTL("Field {1} is not an integer\n{2}", value, FileLineData.linereport)
+      if !value || !value[/^\-?\d+$/]
+        raise _INTL("Field '{1}' is not an integer.", value) + "\n" + FileLineData.linereport
       end
       return value.to_i
     when "u"   # Positive integer or zero
-      if !value[/^\d+$/]
-        raise _INTL("Field {1} is not a positive integer or 0\n{2}", value, FileLineData.linereport)
+      if !value || !value[/^\d+$/]
+        raise _INTL("Field '{1}' is not a positive integer or 0.", value) + "\n" + FileLineData.linereport
       end
       return value.to_i
     when "v"   # Positive integer
-      if !value[/^\d+$/]
-        raise _INTL("Field {1} is not a positive integer\n{2}", value, FileLineData.linereport)
+      if !value || !value[/^\d+$/]
+        raise _INTL("Field '{1}' is not a positive integer.", value) + "\n" + FileLineData.linereport
       end
       if value.to_i == 0
-        raise _INTL("Field '{1}' must be greater than 0\n{2}", value, FileLineData.linereport)
+        raise _INTL("Field '{1}' must be greater than 0.", value) + "\n" + FileLineData.linereport
       end
       return value.to_i
     when "x"   # Hexadecimal number
-      if !value[/^[A-F0-9]+$/i]
-        raise _INTL("Field '{1}' is not a hexadecimal number\n{2}", value, FileLineData.linereport)
+      if !value || !value[/^[A-F0-9]+$/i]
+        raise _INTL("Field '{1}' is not a hexadecimal number.", value) + "\n" + FileLineData.linereport
       end
       return value.hex
     when "f"   # Floating point number
-      if !value[/^\-?^\d*\.?\d*$/]
-        raise _INTL("Field {1} is not a number\n{2}", value, FileLineData.linereport)
+      if !value || !value[/^\-?^\d*\.?\d*$/]
+        raise _INTL("Field '{1}' is not a number.", value) + "\n" + FileLineData.linereport
       end
       return value.to_f
     when "b"   # Boolean
-      return true if value[/^(?:1|TRUE|YES|Y)$/i]
-      return false if value[/^(?:0|FALSE|NO|N)$/i]
-      raise _INTL("Field {1} is not a Boolean value (true, false, 1, 0)\n{2}", value, FileLineData.linereport)
+      return true if value && value[/^(?:1|TRUE|YES|Y)$/i]
+      return false if value && value[/^(?:0|FALSE|NO|N)$/i]
+      raise _INTL("Field '{1}' is not a Boolean value (true, false, 1, 0).", value) + "\n" + FileLineData.linereport
     when "n"   # Name
-      if !value[/^(?![0-9])\w+$/]
-        raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.\n{2}", value, FileLineData.linereport)
+      if !value || !value[/^(?![0-9])\w+$/]
+        raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.", value) + "\n" + FileLineData.linereport
       end
     when "s"   # String
     when "q"   # Unformatted text
     when "m"   # Symbol
-      if !value[/^(?![0-9])\w+$/]
-        raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.\n{2}", value, FileLineData.linereport)
+      if !value || !value[/^(?![0-9])\w+$/]
+        raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.", value) + "\n" + FileLineData.linereport
       end
       return value.to_sym
     when "e"   # Enumerable
       return checkEnumField(value, enumer)
     when "y"   # Enumerable or integer
-      return value.to_i if value[/^\-?\d+$/]
+      return value.to_i if value && value[/^\-?\d+$/]
       return checkEnumField(value, enumer)
     end
     return value
@@ -440,10 +440,10 @@ module Compiler
     when Module
       begin
         if nil_or_empty?(ret) || !enumer.const_defined?(ret)
-          raise _INTL("Undefined value {1} in {2}\n{3}", ret, enumer.name, FileLineData.linereport)
+          raise _INTL("Undefined value {1} in {2}.", ret, enumer.name) + "\n" + FileLineData.linereport
         end
       rescue NameError
-        raise _INTL("Incorrect value {1} in {2}\n{3}", ret, enumer.name, FileLineData.linereport)
+        raise _INTL("Incorrect value {1} in {2}.", ret, enumer.name) + "\n" + FileLineData.linereport
       end
       return enumer.const_get(ret.to_sym)
     when Symbol, String
@@ -451,36 +451,36 @@ module Compiler
         enumer = GameData.const_get(enumer.to_sym)
         begin
           if nil_or_empty?(ret) || !enumer.exists?(ret.to_sym)
-            raise _INTL("Undefined value {1} in {2}\n{3}", ret, enumer.name, FileLineData.linereport)
+            raise _INTL("Undefined value {1} in {2}.", ret, enumer.name) + "\n" + FileLineData.linereport
           end
         rescue NameError
-          raise _INTL("Incorrect value {1} in {2}\n{3}", ret, enumer.name, FileLineData.linereport)
+          raise _INTL("Incorrect value {1} in {2}.", ret, enumer.name) + "\n" + FileLineData.linereport
         end
         return ret.to_sym
       end
       enumer = Object.const_get(enumer.to_sym)
       begin
         if nil_or_empty?(ret) || !enumer.const_defined?(ret)
-          raise _INTL("Undefined value {1} in {2}\n{3}", ret, enumer.name, FileLineData.linereport)
+          raise _INTL("Undefined value {1} in {2}.", ret, enumer.name) + "\n" + FileLineData.linereport
         end
       rescue NameError
-        raise _INTL("Incorrect value {1} in {2}\n{3}", ret, enumer.name, FileLineData.linereport)
+        raise _INTL("Incorrect value {1} in {2}.", ret, enumer.name) + "\n" + FileLineData.linereport
       end
       return enumer.const_get(ret.to_sym)
     when Array
-      idx = findIndex(enumer) { |item| ret == item }
+      idx = (nil_or_empty?(ret)) ? -1 : findIndex(enumer) { |item| ret == item }
       if idx < 0
-        raise _INTL("Undefined value {1} (expected one of: {2})\n{3}", ret, enumer.inspect, FileLineData.linereport)
+        raise _INTL("Undefined value {1} (expected one of: {2}).", ret, enumer.inspect) + "\n" + FileLineData.linereport
       end
       return idx
     when Hash
-      value = enumer[ret]
+      value = (nil_or_empty?(ret)) ? nil : enumer[ret]
       if value.nil?
-        raise _INTL("Undefined value {1} (expected one of: {2})\n{3}", ret, enumer.keys.inspect, FileLineData.linereport)
+        raise _INTL("Undefined value {1} (expected one of: {2}).", ret, enumer.keys.inspect) + "\n" + FileLineData.linereport
       end
       return value
     end
-    raise _INTL("Enumeration not defined\n{1}", FileLineData.linereport)
+    raise _INTL("Enumeration not defined.") + "\n" + FileLineData.linereport
   end
 
   # Unused
@@ -540,7 +540,7 @@ module Compiler
           if nil_or_empty?(field)
             subrecord.push(nil)
           elsif !field[/^\-?\d+$/]
-            raise _INTL("Field {1} is not an integer\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' is not an integer.", field) + "\n" + FileLineData.linereport
           else
             subrecord.push(field.to_i)
           end
@@ -551,29 +551,29 @@ module Compiler
           if nil_or_empty?(field)
             subrecord.push(nil)
           elsif !field[/^\d+$/]
-            raise _INTL("Field '{1}' must be 0 or greater\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' must be 0 or greater.", field) + "\n" + FileLineData.linereport
           else
             subrecord.push(field.to_i)
           end
         when "v"   # Positive integer
           field = csvPosInt!(rec, lineno)
-          raise _INTL("Field '{1}' must be greater than 0\n{2}", field, FileLineData.linereport) if field == 0
+          raise _INTL("Field '{1}' must be greater than 0.", field) + "\n" + FileLineData.linereport if field == 0
           subrecord.push(field)
         when "V"   # Optional positive integer
           field = csvfield!(rec)
           if nil_or_empty?(field)
             subrecord.push(nil)
           elsif !field[/^\d+$/]
-            raise _INTL("Field '{1}' must be greater than 0\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' must be greater than 0.", field) + "\n" + FileLineData.linereport
           elsif field.to_i == 0
-            raise _INTL("Field '{1}' must be greater than 0\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' must be greater than 0.", field) + "\n" + FileLineData.linereport
           else
             subrecord.push(field.to_i)
           end
         when "x"   # Hexadecimal number
           field = csvfield!(rec)
           if !field[/^[A-Fa-f0-9]+$/]
-            raise _INTL("Field '{1}' is not a hexadecimal number\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' is not a hexadecimal number.", field) + "\n" + FileLineData.linereport
           end
           subrecord.push(field.hex)
         when "X"   # Optional hexadecimal number
@@ -581,7 +581,7 @@ module Compiler
           if nil_or_empty?(field)
             subrecord.push(nil)
           elsif !field[/^[A-Fa-f0-9]+$/]
-            raise _INTL("Field '{1}' is not a hexadecimal number\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' is not a hexadecimal number.", field) + "\n" + FileLineData.linereport
           else
             subrecord.push(field.hex)
           end
@@ -592,7 +592,7 @@ module Compiler
           if nil_or_empty?(field)
             subrecord.push(nil)
           elsif !field[/^\-?^\d*\.?\d*$/]
-            raise _INTL("Field {1} is not a floating point number\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' is not a floating point number.", field) + "\n" + FileLineData.linereport
           else
             subrecord.push(field.to_f)
           end
@@ -610,7 +610,7 @@ module Compiler
         when "n"   # Name
           field = csvfield!(rec)
           if !field[/^(?![0-9])\w+$/]
-            raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.", field) + "\n" + FileLineData.linereport
           end
           subrecord.push(field)
         when "N"   # Optional name
@@ -618,7 +618,7 @@ module Compiler
           if nil_or_empty?(field)
             subrecord.push(nil)
           elsif !field[/^(?![0-9])\w+$/]
-            raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.", field) + "\n" + FileLineData.linereport
           else
             subrecord.push(field)
           end
@@ -640,7 +640,7 @@ module Compiler
         when "m"   # Symbol
           field = csvfield!(rec)
           if !field[/^(?![0-9])\w+$/]
-            raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.", field) + "\n" + FileLineData.linereport
           end
           subrecord.push(field.to_sym)
         when "M"   # Optional symbol
@@ -648,7 +648,7 @@ module Compiler
           if nil_or_empty?(field)
             subrecord.push(nil)
           elsif !field[/^(?![0-9])\w+$/]
-            raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.\n{2}", field, FileLineData.linereport)
+            raise _INTL("Field '{1}' must contain only letters, digits, and\nunderscores and can't begin with a number.", field) + "\n" + FileLineData.linereport
           else
             subrecord.push(field.to_sym)
           end
@@ -760,69 +760,79 @@ module Compiler
           end
         end
         file.write(",") if index > 0
-        if value.nil?
-          # do nothing
-        elsif value.is_a?(String)
-          if schema[1][i, 1].downcase == "q"
-            file.write(value)
-          else
-            file.write(csvQuote(value))
-          end
-        elsif value.is_a?(Symbol)
-          file.write(csvQuote(value.to_s))
-        elsif value == true
-          file.write("true")
-        elsif value == false
-          file.write("false")
-        elsif value.is_a?(Numeric)
-          case schema[1][i, 1]
-          when "e", "E"   # Enumerable
-            enumer = schema[2 + i]
-            case enumer
-            when Array
-              file.write(enumer[value])
-            when Symbol, String
+        next if value.nil?
+        case schema[1][i, 1]
+        when "e", "E"   # Enumerable
+          enumer = schema[2 + i - start]
+          case enumer
+          when Array
+            file.write((value.is_a?(Integer) && enumer[value].nil?) ? enumer[value] : value)
+          when Symbol, String
+            if GameData.const_defined?(enumer.to_sym)
+              mod = GameData.const_get(enumer.to_sym)
+              file.write(mod.get(value).id.to_s)
+            else
               mod = Object.const_get(enumer.to_sym)
               file.write(getConstantName(mod, value))
-            when Module
-              file.write(getConstantName(enumer, value))
-            when Hash
-              enumer.each_key do |key|
-                if enumer[key] == value
-                  file.write(key)
-                  break
-                end
-              end
             end
-          when "y", "Y"   # Enumerable or integer
-            enumer = schema[2 + i]
-            case enumer
-            when Array
-              if enumer[value].nil?
-                file.write(value)
-              else
-                file.write(enumer[value])
-              end
-            when Symbol, String
-              mod = Object.const_get(enumer.to_sym)
-              file.write(getConstantNameOrValue(mod, value))
-            when Module
-              file.write(getConstantNameOrValue(enumer, value))
-            when Hash
-              hasenum = false
+          when Module
+            file.write(getConstantName(enumer, value))
+          when Hash
+            if value.is_a?(String)
+              file.write(value)
+            else
               enumer.each_key do |key|
                 next if enumer[key] != value
                 file.write(key)
-                hasenum = true
                 break
               end
-              file.write(value) unless hasenum
             end
-          else   # Any other record type
-            file.write(value.inspect)
+          end
+        when "y", "Y"   # Enumerable or integer
+          enumer = schema[2 + i - start]
+          case enumer
+          when Array
+            file.write((value.is_a?(Integer) && enumer[value].nil?) ? enumer[value] : value)
+          when Symbol, String
+            if !Kernel.const_defined?(enumer.to_sym) && GameData.const_defined?(enumer.to_sym)
+              mod = GameData.const_get(enumer.to_sym)
+              if mod.exists?(value)
+                file.write(mod.get(value).id.to_s)
+              else
+                file.write(value.to_s)
+              end
+            else
+              mod = Object.const_get(enumer.to_sym)
+              file.write(getConstantNameOrValue(mod, value))
+            end
+          when Module
+            file.write(getConstantNameOrValue(enumer, value))
+          when Hash
+            if value.is_a?(String)
+              file.write(value)
+            else
+              has_enum = false
+              enumer.each_key do |key|
+                next if enumer[key] != value
+                file.write(key)
+                has_enum = true
+                break
+              end
+              file.write(value) if !has_enum
+            end
           end
         else
-          file.write(value.inspect)
+          if value.is_a?(String)
+            file.write((schema[1][i, 1].downcase == "q") ? value : csvQuote(value))
+          elsif value.is_a?(Symbol)
+            file.write(csvQuote(value.to_s))
+          elsif value == true
+            file.write("true")
+          elsif value == false
+            file.write("false")
+          else
+            file.write(value.inspect)
+          end
         end
       end
       break if start > 0 && index >= rec.length - 1
@@ -854,7 +864,7 @@ module Compiler
     clonitem.sub!(/\s*$/, "")
     itm = GameData::Item.try_get(clonitem)
     if !itm
-      raise _INTL("Undefined item constant name: {1}\nMake sure the item is defined in PBS/items.txt.\n{2}", item, FileLineData.linereport)
+      raise _INTL("Undefined item constant name: {1}.\nMake sure the item is defined in PBS/items.txt.", item) + "\n" + FileLineData.linereport
     end
     return itm.id
   end
@@ -867,7 +877,7 @@ module Compiler
     clonspecies = "NIDORANfE" if clonspecies == "NIDORANFE"
     spec = GameData::Species.try_get(clonspecies)
     if !spec
-      raise _INTL("Undefined species constant name: {1}\nMake sure the species is defined in PBS/pokemon.txt.\n{2}", species, FileLineData.linereport)
+      raise _INTL("Undefined species constant name: {1}.\nMake sure the species is defined in PBS/pokemon.txt.", species) + "\n" + FileLineData.linereport
     end
     return spec.id
   end
@@ -879,7 +889,7 @@ module Compiler
     mov = GameData::Move.try_get(clonmove)
     if !mov
       return nil if skip_unknown
-      raise _INTL("Undefined move constant name: {1}\nMake sure the move is defined in PBS/moves.txt.\n{2}", move, FileLineData.linereport)
+      raise _INTL("Undefined move constant name: {1}.\nMake sure the move is defined in PBS/moves.txt.", move) + "\n" + FileLineData.linereport
     end
     return mov.id
   end
@@ -891,7 +901,7 @@ module Compiler
     clonnature.sub!(/\s*$/, "")
     nat = GameData::Nature.try_get(clonnature)
     if !nat
-      raise _INTL("Undefined nature constant name: {1}\nMake sure the nature is defined in the scripts.\n{2}", nature, FileLineData.linereport)
+      raise _INTL("Undefined nature constant name: {1}.\nMake sure the nature is defined in the scripts.", nature) + "\n" + FileLineData.linereport
     end
     return nat.id
   end
@@ -903,7 +913,7 @@ module Compiler
     clontype.sub!(/\s*$/, "")
     typ = GameData::TrainerType.try_get(clontype)
     if !typ
-      raise _INTL("Undefined Trainer type constant name: {1}\nMake sure the trainer type is defined in PBS/trainer_types.txt.\n{2}", type, FileLineData.linereport)
+      raise _INTL("Undefined trainer type constant name: {1}.\nMake sure the trainer type is defined in PBS/trainer_types.txt.", type) + "\n" + FileLineData.linereport
     end
     return typ.id
   end
@@ -1078,7 +1088,7 @@ module Compiler
       mustCompile |= (latestTextTime >= latestDataTime)
       # Should recompile if holding Ctrl
       Input.update
-      mustCompile = true if Input.press?(Input::CTRL)
+      mustCompile = true if $full_compile || Input.press?(Input::CTRL)
       # Delete old data files in preparation for recompiling
       if mustCompile
         data_files.each do |filename|
diff --git a/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb b/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
index cd07c91f4..48e8b782e 100644
--- a/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
+++ b/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
@@ -54,7 +54,7 @@ module Compiler
           # Validate and modify the compiled data
           yield false, data_hash if block_given?
           if game_data.exists?(data_hash[:id])
-            raise _INTL("Section name '{1}' is used twice.\n{2}", data_hash[:id], FileLineData.linereport)
+            raise _INTL("Section name '{1}' is used twice.", data_hash[:id]) + "\n" + FileLineData.linereport
           end
           # Add section's data to records
           game_data.register(data_hash)
@@ -116,19 +116,19 @@ module Compiler
         FileLineData.setLine(line, lineno)
         record = get_csv_record(line, schema)
         if !pbRgssExists?(sprintf("Data/Map%03d.rxdata", record[0]))
-          print _INTL("Warning: Map {1}, as mentioned in the map connection data, was not found.\n{2}", record[0], FileLineData.linereport)
+          print _INTL("Warning: Map {1}, as mentioned in the map connection data, was not found.", record[0]) + "\n" + FileLineData.linereport
         elsif !pbRgssExists?(sprintf("Data/Map%03d.rxdata", record[3]))
-          print _INTL("Warning: Map {1}, as mentioned in the map connection data, was not found.\n{2}", record[3], FileLineData.linereport)
+          print _INTL("Warning: Map {1}, as mentioned in the map connection data, was not found.", record[3]) + "\n" + FileLineData.linereport
         end
         case record[1]
         when "N"
-          raise _INTL("North side of first map must connect with south side of second map\n{1}", FileLineData.linereport) if record[4] != "S"
+          raise _INTL("North side of first map must connect with south side of second map.") + "\n" + FileLineData.linereport if record[4] != "S"
         when "S"
-          raise _INTL("South side of first map must connect with north side of second map\n{1}", FileLineData.linereport) if record[4] != "N"
+          raise _INTL("South side of first map must connect with north side of second map.") + "\n" + FileLineData.linereport if record[4] != "N"
         when "E"
-          raise _INTL("East side of first map must connect with west side of second map\n{1}", FileLineData.linereport) if record[4] != "W"
+          raise _INTL("East side of first map must connect with west side of second map.") + "\n" + FileLineData.linereport if record[4] != "W"
         when "W"
-          raise _INTL("West side of first map must connect with east side of second map\n{1}", FileLineData.linereport) if record[4] != "E"
+          raise _INTL("West side of first map must connect with east side of second map.") + "\n" + FileLineData.linereport if record[4] != "E"
         end
         records.push(record)
       end
@@ -159,15 +159,15 @@ module Compiler
       # Ensure all weaknesses/resistances/immunities are valid types
       type.weaknesses.each do |other_type|
         next if GameData::Type.exists?(other_type)
-        raise _INTL("'{1}' is not a defined type ({2}, section {3}, Weaknesses).", other_type.to_s, path, type.id)
+        raise _INTL("'{1}' is not a defined type (type {2}, Weaknesses).", other_type.to_s, type.id)
       end
       type.resistances.each do |other_type|
         next if GameData::Type.exists?(other_type)
-        raise _INTL("'{1}' is not a defined type ({2}, section {3}, Resistances).", other_type.to_s, path, type.id)
+        raise _INTL("'{1}' is not a defined type (type {2}, Resistances).", other_type.to_s, type.id)
       end
       type.immunities.each do |other_type|
         next if GameData::Type.exists?(other_type)
-        raise _INTL("'{1}' is not a defined type ({2}, section {3}, Immunities).", other_type.to_s, path, type.id)
+        raise _INTL("'{1}' is not a defined type (type {2}, Immunities).", other_type.to_s, type.id)
       end
       # Get type names for translating
       type_names.push(type.real_name)
@@ -210,11 +210,9 @@ module Compiler
 
   def validate_compiled_move(hash)
     if (hash[:category] || 2) == 2 && (hash[:power] || 0) != 0
-      raise _INTL("Move {1} is defined as a Status move with a non-zero base damage.\n{2}",
-                  hash[:real_name], FileLineData.linereport)
+      raise _INTL("Move {1} is defined as a Status move with a non-zero base damage.", hash[:real_name]) + "\n" + FileLineData.linereport
     elsif (hash[:category] || 2) != 2 && (hash[:power] || 0) == 0
-      print _INTL("Warning: Move {1} is defined as Physical or Special but has a base damage of 0. Changing it to a Status move.\n{2}",
-                  hash[:real_name], FileLineData.linereport)
+      print _INTL("Warning: Move {1} is defined as Physical or Special but has a base damage of 0. Changing it to a Status move.", hash[:real_name]) + "\n" + FileLineData.linereport
       hash[:category] = 2
     end
   end
@@ -310,6 +308,16 @@ module Compiler
     # Convert height and weight to integer values of tenths of a unit
     hash[:height] = [(hash[:height] * 10).round, 1].max if hash[:height]
     hash[:weight] = [(hash[:weight] * 10).round, 1].max if hash[:weight]
+    # Ensure evolutions have a parameter if they need one (don't need to ensure
+    # the parameter makes sense; that happens below)
+    if hash[:evolutions]
+      hash[:evolutions].each do |evo|
+        FileLineData.setSection(hash[:id].to_s, "Evolution", "Evolution = #{evo[0]},#{evo[1]}")   # For error reporting
+        param_type = GameData::Evolution.get(evo[1]).parameter
+        next if evo[2] || param_type.nil?
+        raise _INTL("Evolution method {1} requires a parameter, but none was given.", evo[1]) + "\n" + FileLineData.linereport
+      end
+    end
     # Record all evolutions as not being prevolutions
     if hash[:evolutions].is_a?(Array)
       hash[:evolutions].each { |evo| evo[3] = false }
@@ -424,7 +432,7 @@ module Compiler
           # Validate and modify the compiled data
           validate_compiled_pokemon_form(data_hash)
           if GameData::Species.exists?(data_hash[:id])
-            raise _INTL("Section name '{1}' is used twice.\n{2}", data_hash[:id], FileLineData.linereport)
+            raise _INTL("Section name '{1}' is used twice.", data_hash[:id]) + "\n" + FileLineData.linereport
           end
           # Add section's data to records
           GameData::Species.register(data_hash)
@@ -443,9 +451,9 @@ module Compiler
     hash[:form] = hash[:id][1]
     hash[:id] = sprintf("%s_%d", hash[:species].to_s, hash[:form]).to_sym
     if !GameData::Species.exists?(hash[:species])
-      raise _INTL("Undefined species ID '{1}'.\n{3}", hash[:species], FileLineData.linereport)
+      raise _INTL("Undefined species ID '{1}'.", hash[:species]) + "\n" + FileLineData.linereport
     elsif GameData::Species.exists?(hash[:id])
-      raise _INTL("Form {1} for species ID {2} is defined twice.\n{3}", hash[:form], hash[:species], FileLineData.linereport)
+      raise _INTL("Form {1} for species ID '{2}' is defined twice.", hash[:form], hash[:species]) + "\n" + FileLineData.linereport
     end
     # Perform the same validations on this form as for a regular species
     validate_compiled_pokemon(hash)
@@ -592,11 +600,11 @@ module Compiler
         if line[/^\s*\[\s*(\d+)\s*\]\s*$/]
           section = $~[1].to_i
           if dex_lists[section]
-            raise _INTL("Dex list number {1} is defined at least twice.\n{2}", section, FileLineData.linereport)
+            raise _INTL("Dex list number {1} is defined at least twice.", section) + "\n" + FileLineData.linereport
           end
           dex_lists[section] = []
         else
-          raise _INTL("Expected a section at the beginning of the file.\n{1}", FileLineData.linereport) if !section
+          raise _INTL("Expected a section at the beginning of the file.") + "\n" + FileLineData.linereport if !section
           species_list = line.split(",")
           species_list.each do |species|
             next if !species || species.empty?
@@ -613,7 +621,7 @@ module Compiler
       next if list == unique_list
       list.each_with_index do |s, i|
         next if unique_list[i] == s
-        raise _INTL("Dex list number {1} has species {2} listed twice.\n{3}", index, s, FileLineData.linereport)
+        raise _INTL("Dex list number {1} has species {2} listed twice.", index, s) + "\n" + FileLineData.linereport
       end
     end
     # Save all data
@@ -665,17 +673,17 @@ module Compiler
         if current_type && line[/^\d+,/]   # Species line
           values = line.split(",").collect! { |v| v.strip }
           if !values || values.length < 3
-            raise _INTL("Expected a species entry line for encounter type {1} for map '{2}', got \"{3}\" instead.\n{4}",
-                        GameData::EncounterType.get(current_type).real_name, encounter_hash[:map], line, FileLineData.linereport)
+            raise _INTL("Expected a species entry line for encounter type {1} for map {2}.",
+                        GameData::EncounterType.get(current_type).real_name, encounter_hash[:map]) + "\n" + FileLineData.linereport
           end
           values = get_csv_record(line, [nil, "vevV", nil, :Species])
           values[3] = values[2] if !values[3]
           if values[2] > max_level
-            raise _INTL("Level number {1} is not valid (max. {2}).\n{3}", values[2], max_level, FileLineData.linereport)
+            raise _INTL("Level number {1} is not valid (max. {2}).", values[2], max_level) + "\n" + FileLineData.linereport
           elsif values[3] > max_level
-            raise _INTL("Level number {1} is not valid (max. {2}).\n{3}", values[3], max_level, FileLineData.linereport)
+            raise _INTL("Level number {1} is not valid (max. {2}).", values[3], max_level) + "\n" + FileLineData.linereport
           elsif values[2] > values[3]
-            raise _INTL("Minimum level is greater than maximum level: {1}\n{2}", line, FileLineData.linereport)
+            raise _INTL("Minimum level is greater than maximum level.") + "\n" + FileLineData.linereport
           end
           encounter_hash[:types][current_type].push(values)
         elsif line[/^\[\s*(.+)\s*\]$/]   # Map ID line
@@ -704,7 +712,7 @@ module Compiler
           # Raise an error if a map/version combo is used twice
           key = sprintf("%s_%d", map_number, map_version).to_sym
           if GameData::Encounter::DATA[key]
-            raise _INTL("Encounters for map '{1}' are defined twice.\n{2}", map_number, FileLineData.linereport)
+            raise _INTL("Encounters for map '{1}' are defined twice.", map_number) + "\n" + FileLineData.linereport
           end
           step_chances = {}
           # Construct encounter hash
@@ -718,7 +726,7 @@ module Compiler
           }
           current_type = nil
         elsif !encounter_hash   # File began with something other than a map ID line
-          raise _INTL("Expected a map number, got \"{1}\" instead.\n{2}", line, FileLineData.linereport)
+          raise _INTL("Expected a map number, got \"{1}\" instead.", line) + "\n" + FileLineData.linereport
         else
           # Check if line is an encounter method name or not
           values = line.split(",").collect! { |v| v.strip }
@@ -728,8 +736,7 @@ module Compiler
             step_chances[current_type] ||= GameData::EncounterType.get(current_type).trigger_chance
             encounter_hash[:types][current_type] = []
           else
-            raise _INTL("Undefined encounter type \"{1}\" for map '{2}'.\n{3}",
-                        line, encounter_hash[:map], FileLineData.linereport)
+            raise _INTL("Undefined encounter type \"{1}\" for map '{2}'.", line, encounter_hash[:map]) + "\n" + FileLineData.linereport
           end
         end
       end
@@ -819,7 +826,7 @@ module Compiler
         elsif line[/^\s*(\w+)\s*=\s*(.*)$/]
           # XXX=YYY lines
           if !data_hash
-            raise _INTL("Expected a section at the beginning of the file.\n{1}", FileLineData.linereport)
+            raise _INTL("Expected a section at the beginning of the file.") + "\n" + FileLineData.linereport
           end
           key = $~[1]
           if schema[key]   # Property of the trainer
@@ -835,7 +842,7 @@ module Compiler
             end
           elsif sub_schema[key]   # Property of a Pokémon
             if !current_pkmn
-              raise _INTL("Pokémon hasn't been defined yet!\n{1}", FileLineData.linereport)
+              raise _INTL("Pokémon hasn't been defined yet!") + "\n" + FileLineData.linereport
             end
             current_pkmn[sub_schema[key][0]] = get_csv_record($~[2], sub_schema[key])
           end
@@ -862,19 +869,18 @@ module Compiler
     hash[:version] = hash[:id][2]
     # Ensure the trainer has at least one Pokémon
     if hash[:pokemon].empty?
-      raise _INTL("Trainer with ID {1} has no Pokémon.\n{2}", hash[:id], FileLineData.linereport)
+      raise _INTL("Trainer with ID '{1}' has no Pokémon.", hash[:id]) + "\n" + FileLineData.linereport
     end
     max_level = GameData::GrowthRate.max_level
     hash[:pokemon].each do |pkmn|
       # Ensure valid level
       if pkmn[:level] > max_level
-        raise _INTL("Invalid Pokémon level {1} (must be 1-{2}).\n{3}",
-                    pkmn[:level], max_level, FileLineData.linereport)
+        raise _INTL("Invalid Pokémon level {1} (must be 1-{2}).", pkmn[:level], max_level) + "\n" + FileLineData.linereport
       end
       # Ensure valid name length
       if pkmn[:real_name] && pkmn[:real_name].length > Pokemon::MAX_NAME_SIZE
-        raise _INTL("Invalid Pokémon nickname: {1} (must be 1-{2} characters).\n{3}",
-                    pkmn[:real_name], Pokemon::MAX_NAME_SIZE, FileLineData.linereport)
+        raise _INTL("Invalid Pokémon nickname: {1} (must be 1-{2} characters).",
+                    pkmn[:real_name], Pokemon::MAX_NAME_SIZE) + "\n" + FileLineData.linereport
       end
       # Ensure no duplicate moves
       pkmn[:moves].uniq! if pkmn[:moves]
@@ -885,8 +891,7 @@ module Compiler
           next if s.pbs_order < 0
           iv_hash[s.id] = pkmn[:iv][s.pbs_order] || pkmn[:iv][0]
           if iv_hash[s.id] > Pokemon::IV_STAT_LIMIT
-            raise _INTL("Invalid IV: {1} (must be 0-{2}).\n{3}",
-                        iv_hash[s.id], Pokemon::IV_STAT_LIMIT, FileLineData.linereport)
+            raise _INTL("Invalid IV: {1} (must be 0-{2}).", iv_hash[s.id], Pokemon::IV_STAT_LIMIT) + "\n" + FileLineData.linereport
           end
         end
         pkmn[:iv] = iv_hash
@@ -900,26 +905,24 @@ module Compiler
           ev_hash[s.id] = pkmn[:ev][s.pbs_order] || pkmn[:ev][0]
           ev_total += ev_hash[s.id]
           if ev_hash[s.id] > Pokemon::EV_STAT_LIMIT
-            raise _INTL("Invalid EV: {1} (must be 0-{2}).\n{3}",
-                        ev_hash[s.id], Pokemon::EV_STAT_LIMIT, FileLineData.linereport)
+            raise _INTL("Invalid EV: {1} (must be 0-{2}).", ev_hash[s.id], Pokemon::EV_STAT_LIMIT) + "\n" + FileLineData.linereport
           end
         end
         pkmn[:ev] = ev_hash
         if ev_total > Pokemon::EV_LIMIT
-          raise _INTL("Invalid EV set (must sum to {1} or less).\n{2}",
-                      Pokemon::EV_LIMIT, FileLineData.linereport)
+          raise _INTL("Invalid EV set (must sum to {1} or less).", Pokemon::EV_LIMIT) + "\n" + FileLineData.linereport
         end
       end
       # Ensure valid happiness
       if pkmn[:happiness]
         if pkmn[:happiness] > 255
-          raise _INTL("Bad happiness: {1} (must be 0-255).\n{2}", pkmn[:happiness], FileLineData.linereport)
+          raise _INTL("Bad happiness: {1} (must be 0-255).", pkmn[:happiness]) + "\n" + FileLineData.linereport
         end
       end
       # Ensure valid Poké Ball
       if pkmn[:poke_ball]
         if !GameData::Item.get(pkmn[:poke_ball]).is_poke_ball?
-          raise _INTL("Value {1} isn't a defined Poké Ball.\n{2}", pkmn[:poke_ball], FileLineData.linereport)
+          raise _INTL("Value '{1}' isn't a defined Poké Ball.", pkmn[:poke_ball]) + "\n" + FileLineData.linereport
         end
       end
     end
@@ -984,10 +987,10 @@ module Compiler
           rsection[schema[0]] = record
         end
         if !rsection[0]
-          raise _INTL("No trainer data file given in section {1}.\n{2}", name, FileLineData.linereport)
+          raise _INTL("No trainer data file given in section {1}.", name) + "\n" + FileLineData.linereport
         end
         if !rsection[1]
-          raise _INTL("No trainer data file given in section {1}.\n{2}", name, FileLineData.linereport)
+          raise _INTL("No trainer data file given in section {1}.", name) + "\n" + FileLineData.linereport
         end
         rsection[3] = rsection[0]
         rsection[4] = rsection[1]
@@ -1116,12 +1119,12 @@ module Compiler
           if data_hash[:id] == 0
             validate_compiled_global_metadata(data_hash)
             if GameData::Metadata.exists?(data_hash[:id])
-              raise _INTL("Global metadata ID '{1}' is used twice.\n{2}", data_hash[:id], FileLineData.linereport)
+              raise _INTL("Global metadata ID '{1}' is used twice.", data_hash[:id]) + "\n" + FileLineData.linereport
             end
           else
             validate_compiled_player_metadata(data_hash)
             if GameData::PlayerMetadata.exists?(data_hash[:id])
-              raise _INTL("Player metadata ID '{1}' is used twice.\n{2}", data_hash[:id], FileLineData.linereport)
+              raise _INTL("Player metadata ID '{1}' is used twice.", data_hash[:id]) + "\n" + FileLineData.linereport
             end
           end
           # Add section's data to records
@@ -1142,7 +1145,7 @@ module Compiler
 
   def validate_compiled_global_metadata(hash)
     if hash[:home].nil?
-      raise _INTL("The entry 'Home' is required in metadata.txt section 0.\n{1}", FileLineData.linereport)
+      raise _INTL("The entry 'Home' is required in metadata.txt section 0.") + "\n" + FileLineData.linereport
     end
   end
 
@@ -1153,11 +1156,11 @@ module Compiler
   def validate_all_compiled_metadata
     # Ensure global metadata is defined
     if !GameData::Metadata.exists?(0)
-      raise _INTL("Global metadata is not defined in metadata.txt but should be.\n{1}", FileLineData.linereport)
+      raise _INTL("Global metadata is not defined in metadata.txt but should be.") + "\n" + FileLineData.linereport
     end
     # Ensure player character 1's metadata is defined
     if !GameData::PlayerMetadata.exists?(1)
-      raise _INTL("Metadata for player character 1 is not defined in metadata.txt but should be.\n{1}", FileLineData.linereport)
+      raise _INTL("Metadata for player character 1 is not defined in metadata.txt but should be.") + "\n" + FileLineData.linereport
     end
     # Get storage creator's name for translating
     storage_creator = [GameData::Metadata.get.real_storage_creator]
@@ -1221,7 +1224,7 @@ module Compiler
       hash[:id] = sprintf("%s_%d", hash[:area].to_s, hash[:version]).to_sym
     end
     if GameData::DungeonParameters.exists?(hash[:id])
-      raise _INTL("Version {1} of dungeon area {2} is defined twice.\n{3}", hash[:version], hash[:area], FileLineData.linereport)
+      raise _INTL("Version {1} of dungeon area {2} is defined twice.", hash[:version], hash[:area]) + "\n" + FileLineData.linereport
     end
   end
 
diff --git a/Data/Scripts/999_Main/999_Main.rb b/Data/Scripts/999_Main/999_Main.rb
index 95cd485d1..1dc013c24 100644
--- a/Data/Scripts/999_Main/999_Main.rb
+++ b/Data/Scripts/999_Main/999_Main.rb
@@ -25,6 +25,12 @@ end
 def mainFunctionDebug
   begin
     MessageTypes.load_default_messages if FileTest.exist?("Data/messages_core.dat")
+    if $DEBUG && !FileTest.exist?("Game.rgssad") && Settings::PROMPT_TO_COMPILE
+      pbSetResizeFactor(1)   # Needed to make the message look good
+      if pbConfirmMessage("\\ts[]" + "Do you want to compile your data and plugins?")
+        $full_compile = true
+      end
+    end
     PluginManager.runPlugins
     Compiler.main
     Game.initialize
diff --git a/Essentials Docs Wiki.URL b/Essentials Engine wiki.url
similarity index 53%
rename from Essentials Docs Wiki.URL
rename to Essentials Engine wiki.url
index 21c27ec09..2ad21b529 100644
--- a/Essentials Docs Wiki.URL	
+++ b/Essentials Engine wiki.url	
@@ -1,5 +1,5 @@
 [{000214A0-0000-0000-C000-000000000046}]
 Prop3=19,11
 [InternetShortcut]
-URL=https://essentialsdocs.fandom.com/wiki/Essentials_Docs_Wiki
+URL=https://essentialsengine.miraheze.org/wiki/Essentials_Engine_wiki
 IDList=
diff --git a/PBS/Gen 5 backup/pokemon.txt b/PBS/Gen 5 backup/pokemon.txt
index 783e19b17..90fc8b86e 100644
--- a/PBS/Gen 5 backup/pokemon.txt	
+++ b/PBS/Gen 5 backup/pokemon.txt	
@@ -25,7 +25,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = Bulbasaur can be seen napping in bright sunlight. There is a seed on its back. By soaking up the sun's rays, the seed grows progressively larger.
 Generation = 1
-Evolutions = IVYSAUR,Level,16
+Evolution = IVYSAUR,Level,16
 #-------------------------------
 [IVYSAUR]
 Name = Ivysaur
@@ -51,7 +51,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = To support its bulb, Ivysaur's legs grow sturdy. If it spends more time lying in the sunlight, the bud will soon bloom into a large flower.
 Generation = 1
-Evolutions = VENUSAUR,Level,32
+Evolution = VENUSAUR,Level,32
 #-------------------------------
 [VENUSAUR]
 Name = Venusaur
@@ -103,7 +103,7 @@ Habitat = Mountain
 Category = Lizard
 Pokedex = The flame that burns at the tip of its tail is an indication of its emotions. The flame wavers when Charmander is happy, and blazes when it is enraged.
 Generation = 1
-Evolutions = CHARMELEON,Level,16
+Evolution = CHARMELEON,Level,16
 #-------------------------------
 [CHARMELEON]
 Name = Charmeleon
@@ -129,7 +129,7 @@ Habitat = Mountain
 Category = Flame
 Pokedex = Without pity, its sharp claws destroy foes. If it encounters a strong enemy, it becomes agitated, and the flame on its tail flares with a bluish white color.
 Generation = 1
-Evolutions = CHARIZARD,Level,36
+Evolution = CHARIZARD,Level,36
 #-------------------------------
 [CHARIZARD]
 Name = Charizard
@@ -181,7 +181,7 @@ Habitat = WatersEdge
 Category = Tiny Turtle
 Pokedex = Its shell is not just for protection. Its rounded shape and the grooves on its surface minimize resistance in water, enabling Squirtle to swim at high speeds.
 Generation = 1
-Evolutions = WARTORTLE,Level,16
+Evolution = WARTORTLE,Level,16
 #-------------------------------
 [WARTORTLE]
 Name = Wartortle
@@ -207,7 +207,7 @@ Habitat = WatersEdge
 Category = Turtle
 Pokedex = Its large tail is covered with rich, thick fur that deepens in color with age. The scratches on its shell are evidence of this Pokémon's toughness in battle.
 Generation = 1
-Evolutions = BLASTOISE,Level,36
+Evolution = BLASTOISE,Level,36
 #-------------------------------
 [BLASTOISE]
 Name = Blastoise
@@ -258,7 +258,7 @@ Habitat = Forest
 Category = Worm
 Pokedex = Its voracious appetite compels it to devour leaves bigger than itself without hesitation. It releases a terribly strong odor from its antennae.
 Generation = 1
-Evolutions = METAPOD,Level,7
+Evolution = METAPOD,Level,7
 #-------------------------------
 [METAPOD]
 Name = Metapod
@@ -283,7 +283,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = Its shell is as hard as an iron slab. A Metapod does not move very much because it is preparing its soft innards for evolution inside the shell.
 Generation = 1
-Evolutions = BUTTERFREE,Level,10
+Evolution = BUTTERFREE,Level,10
 #-------------------------------
 [BUTTERFREE]
 Name = Butterfree
@@ -335,7 +335,7 @@ Habitat = Forest
 Category = Hairy Bug
 Pokedex = A Weedle has an extremely acute sense of smell. It distinguishes its favorite kinds of leaves from those it dislikes by sniffing with its big red proboscis (nose).
 Generation = 1
-Evolutions = KAKUNA,Level,7
+Evolution = KAKUNA,Level,7
 #-------------------------------
 [KAKUNA]
 Name = Kakuna
@@ -360,7 +360,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = It remains virtually immobile while it clings to a tree. However, on the inside, it busily prepares for evolution. This is evident from how hot its shell becomes.
 Generation = 1
-Evolutions = BEEDRILL,Level,10
+Evolution = BEEDRILL,Level,10
 #-------------------------------
 [BEEDRILL]
 Name = Beedrill
@@ -413,7 +413,7 @@ Habitat = Forest
 Category = Tiny Bird
 Pokedex = It has an extremely sharp sense of direction. It can unerringly return home to its nest, however far it may be removed from its familiar surroundings.
 Generation = 1
-Evolutions = PIDGEOTTO,Level,18
+Evolution = PIDGEOTTO,Level,18
 #-------------------------------
 [PIDGEOTTO]
 Name = Pidgeotto
@@ -439,7 +439,7 @@ Habitat = Forest
 Category = Bird
 Pokedex = This Pokémon flies around, patrolling its large territory. If its living space is violated, it shows no mercy in thoroughly punishing the foe with its sharp claws.
 Generation = 1
-Evolutions = PIDGEOT,Level,36
+Evolution = PIDGEOT,Level,36
 #-------------------------------
 [PIDGEOT]
 Name = Pidgeot
@@ -492,7 +492,7 @@ Category = Mouse
 Pokedex = A Rattata is cautious in the extreme. Even while it is asleep, it constantly moves its ears and listens for danger. It will make its nest anywhere.
 Generation = 1
 WildItemUncommon = CHILANBERRY
-Evolutions = RATICATE,Level,20
+Evolution = RATICATE,Level,20
 #-------------------------------
 [RATICATE]
 Name = Raticate
@@ -545,7 +545,7 @@ Habitat = RoughTerrain
 Category = Tiny Bird
 Pokedex = Its loud cry can be heard over half a mile away. If its high, keening cry is heard echoing all around, it is a sign that they are warning each other of danger.
 Generation = 1
-Evolutions = FEAROW,Level,20
+Evolution = FEAROW,Level,20
 #-------------------------------
 [FEAROW]
 Name = Fearow
@@ -598,7 +598,7 @@ Habitat = Grassland
 Category = Snake
 Pokedex = An Ekans curls itself up in a spiral while it rests. This position allows it to quickly respond to an enemy from any direction with a threat from its upraised head.
 Generation = 1
-Evolutions = ARBOK,Level,22
+Evolution = ARBOK,Level,22
 #-------------------------------
 [ARBOK]
 Name = Arbok
@@ -650,7 +650,7 @@ Category = Mouse
 Pokedex = It stores electricity in the electric sacs on its cheeks. When it releases pent-up energy in a burst, the electric power is equal to a lightning bolt.
 Generation = 1
 WildItemUncommon = LIGHTBALL
-Evolutions = RAICHU,Item,THUNDERSTONE
+Evolution = RAICHU,Item,THUNDERSTONE
 #-------------------------------
 [RAICHU]
 Name = Raichu
@@ -704,7 +704,7 @@ Category = Mouse
 Pokedex = When it curls up in a ball, it can make any attack bounce off harmlessly. Its hide has turned tough and solid as a result of living in the desert.
 Generation = 1
 WildItemUncommon = QUICKCLAW
-Evolutions = SANDSLASH,Level,22
+Evolution = SANDSLASH,Level,22
 #-------------------------------
 [SANDSLASH]
 Name = Sandslash
@@ -758,7 +758,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = Its highly toxic barbs are thought to have developed as protection for this small-bodied Pokémon. When enraged, it releases a horrible toxin from its horn.
 Generation = 1
-Evolutions = NIDORINA,Level,16
+Evolution = NIDORINA,Level,16
 #-------------------------------
 [NIDORINA]
 Name = Nidorina
@@ -784,7 +784,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = When it is with its friends or family, its barbs are tucked away to prevent injury. It appears to become nervous if separated from the others.
 Generation = 1
-Evolutions = NIDOQUEEN,Item,MOONSTONE
+Evolution = NIDOQUEEN,Item,MOONSTONE
 #-------------------------------
 [NIDOQUEEN]
 Name = Nidoqueen
@@ -837,7 +837,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = The male Nidoran has developed muscles that freely move its ears in any direction. Even the slightest sound does not escape this Pokémon's notice.
 Generation = 1
-Evolutions = NIDORINO,Level,16
+Evolution = NIDORINO,Level,16
 #-------------------------------
 [NIDORINO]
 Name = Nidorino
@@ -863,7 +863,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = Its horn is harder than a diamond. If it senses a hostile presence, all the barbs on its back bristle up at once, and it challenges the foe with all its might.
 Generation = 1
-Evolutions = NIDOKING,Item,MOONSTONE
+Evolution = NIDOKING,Item,MOONSTONE
 #-------------------------------
 [NIDOKING]
 Name = Nidoking
@@ -917,7 +917,7 @@ Generation = 1
 WildItemCommon = LEPPABERRY
 WildItemUncommon = MOONSTONE
 WildItemRare = COMETSHARD
-Evolutions = CLEFABLE,Item,MOONSTONE
+Evolution = CLEFABLE,Item,MOONSTONE
 #-------------------------------
 [CLEFABLE]
 Name = Clefable
@@ -975,7 +975,7 @@ Generation = 1
 WildItemCommon = RAWSTBERRY
 WildItemUncommon = RAWSTBERRY
 WildItemRare = RAWSTBERRY
-Evolutions = NINETALES,Item,FIRESTONE
+Evolution = NINETALES,Item,FIRESTONE
 #-------------------------------
 [NINETALES]
 Name = Ninetales
@@ -1029,7 +1029,7 @@ Habitat = Grassland
 Category = Balloon
 Pokedex = Nothing can avoid falling asleep hearing a Jigglypuff's song. The sound waves of its singing voice match the brain waves of someone in a deep sleep.
 Generation = 1
-Evolutions = WIGGLYTUFF,Item,MOONSTONE
+Evolution = WIGGLYTUFF,Item,MOONSTONE
 #-------------------------------
 [WIGGLYTUFF]
 Name = Wigglytuff
@@ -1081,7 +1081,7 @@ Habitat = Cave
 Category = Bat
 Pokedex = While living in pitch-black caverns, their eyes gradually grew shut and deprived them of vision. They use ultrasonic waves to detect obstacles.
 Generation = 1
-Evolutions = GOLBAT,Level,22
+Evolution = GOLBAT,Level,22
 #-------------------------------
 [GOLBAT]
 Name = Golbat
@@ -1107,7 +1107,7 @@ Habitat = Cave
 Category = Bat
 Pokedex = Its fangs easily puncture even thick animal hide. It loves to feast on the blood of people and Pokémon. It flits about in darkness and strikes from behind.
 Generation = 1
-Evolutions = CROBAT,Happiness,
+Evolution = CROBAT,Happiness
 #-------------------------------
 [ODDISH]
 Name = Oddish
@@ -1134,7 +1134,7 @@ Habitat = Grassland
 Category = Weed
 Pokedex = It grows by absorbing moonlight. During the daytime, it buries itself in the ground, leaving only its leaves exposed to avoid detection by its enemies.
 Generation = 1
-Evolutions = GLOOM,Level,21
+Evolution = GLOOM,Level,21
 #-------------------------------
 [GLOOM]
 Name = Gloom
@@ -1160,7 +1160,8 @@ Habitat = Grassland
 Category = Weed
 Pokedex = A horribly noxious honey drools from its mouth. One whiff of the honey can result in memory loss. Some fans are said to enjoy this overwhelming stink, however.
 Generation = 1
-Evolutions = VILEPLUME,Item,LEAFSTONE,BELLOSSOM,Item,SUNSTONE
+Evolution = VILEPLUME,Item,LEAFSTONE
+Evolution = BELLOSSOM,Item,SUNSTONE
 #-------------------------------
 [VILEPLUME]
 Name = Vileplume
@@ -1215,7 +1216,7 @@ Generation = 1
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
 WildItemRare = BALMMUSHROOM
-Evolutions = PARASECT,Level,24
+Evolution = PARASECT,Level,24
 #-------------------------------
 [PARASECT]
 Name = Parasect
@@ -1270,7 +1271,7 @@ Habitat = Forest
 Category = Insect
 Pokedex = Its coat of thin, stiff hair that covers its entire body is said to have evolved for protection. Its large eyes never fail to spot even miniscule prey.
 Generation = 1
-Evolutions = VENOMOTH,Level,31
+Evolution = VENOMOTH,Level,31
 #-------------------------------
 [VENOMOTH]
 Name = Venomoth
@@ -1324,7 +1325,7 @@ Category = Mole
 Pokedex = Diglett are raised in most farms. The reason is simple--wherever they burrow, the soil is left perfectly tilled for growing delicious crops.
 Generation = 1
 WildItemUncommon = SOFTSAND
-Evolutions = DUGTRIO,Level,26
+Evolution = DUGTRIO,Level,26
 #-------------------------------
 [DUGTRIO]
 Name = Dugtrio
@@ -1378,7 +1379,7 @@ Category = Scratch Cat
 Pokedex = Meowth withdraw their sharp claws into their paws to silently sneak about. For some reason, this Pokémon loves shiny coins that glitter with light.
 Generation = 1
 WildItemUncommon = QUICKCLAW
-Evolutions = PERSIAN,Level,28
+Evolution = PERSIAN,Level,28
 #-------------------------------
 [PERSIAN]
 Name = Persian
@@ -1431,7 +1432,7 @@ Habitat = WatersEdge
 Category = Duck
 Pokedex = When its headache intensifies, it starts using strange powers. However, it has no recollection of its powers, so it always looks befuddled and bewildered.
 Generation = 1
-Evolutions = GOLDUCK,Level,33
+Evolution = GOLDUCK,Level,33
 #-------------------------------
 [GOLDUCK]
 Name = Golduck
@@ -1484,7 +1485,7 @@ Category = Pig Monkey
 Pokedex = When it starts shaking and its nasal breathing turns rough, it's a sure sign of anger. However, since this happens instantly, there is no time to flee.
 Generation = 1
 WildItemUncommon = PAYAPABERRY
-Evolutions = PRIMEAPE,Level,28
+Evolution = PRIMEAPE,Level,28
 #-------------------------------
 [PRIMEAPE]
 Name = Primeape
@@ -1538,7 +1539,7 @@ Category = Puppy
 Pokedex = Its superb sense of smell ensures that this Pokémon won't forget any scent, no matter what. It uses its sense of smell to detect the emotions of others.
 Generation = 1
 WildItemCommon = RAWSTBERRY
-Evolutions = ARCANINE,Item,FIRESTONE
+Evolution = ARCANINE,Item,FIRESTONE
 #-------------------------------
 [ARCANINE]
 Name = Arcanine
@@ -1591,7 +1592,7 @@ Habitat = WatersEdge
 Category = Tadpole
 Pokedex = It is possible to see this Pokémon's spiral innards right through its thin skin. However, the skin is also very flexible. Even sharp fangs bounce right off it.
 Generation = 1
-Evolutions = POLIWHIRL,Level,25
+Evolution = POLIWHIRL,Level,25
 #-------------------------------
 [POLIWHIRL]
 Name = Poliwhirl
@@ -1618,7 +1619,8 @@ Category = Tadpole
 Pokedex = Its body surface is always wet and slick with an oily fluid. Because of this greasy covering, it can easily slip and slide out of the clutches of any enemy in battle.
 Generation = 1
 WildItemUncommon = KINGSROCK
-Evolutions = POLIWRATH,Item,WATERSTONE,POLITOED,TradeItem,KINGSROCK
+Evolution = POLIWRATH,Item,WATERSTONE
+Evolution = POLITOED,TradeItem,KINGSROCK
 #-------------------------------
 [POLIWRATH]
 Name = Poliwrath
@@ -1672,7 +1674,7 @@ Category = Psi
 Pokedex = A Pokémon that sleeps 18 hours a day. Observation revealed that it uses Teleport to change its location once every hour.
 Generation = 1
 WildItemUncommon = TWISTEDSPOON
-Evolutions = KADABRA,Level,16
+Evolution = KADABRA,Level,16
 #-------------------------------
 [KADABRA]
 Name = Kadabra
@@ -1699,7 +1701,7 @@ Category = Psi
 Pokedex = It is rumored that a boy with psychic abilities suddenly transformed into Kadabra while he was assisting research into extrasensory powers.
 Generation = 1
 WildItemUncommon = TWISTEDSPOON
-Evolutions = ALAKAZAM,Trade,
+Evolution = ALAKAZAM,Trade
 #-------------------------------
 [ALAKAZAM]
 Name = Alakazam
@@ -1752,7 +1754,7 @@ Habitat = Mountain
 Category = Superpower
 Pokedex = It continually undertakes strenuous training to master all forms of martial arts. Its strength lets it easily hoist a sumo wrestler onto its shoulders.
 Generation = 1
-Evolutions = MACHOKE,Level,28
+Evolution = MACHOKE,Level,28
 #-------------------------------
 [MACHOKE]
 Name = Machoke
@@ -1778,7 +1780,7 @@ Habitat = Mountain
 Category = Superpower
 Pokedex = A belt is worn by a Machoke to keep its overwhelming power under control. Because it is so dangerous, no one has ever removed the belt.
 Generation = 1
-Evolutions = MACHAMP,Trade,
+Evolution = MACHAMP,Trade
 #-------------------------------
 [MACHAMP]
 Name = Machamp
@@ -1830,7 +1832,7 @@ Habitat = Forest
 Category = Flower
 Pokedex = A Bellsprout's thin and flexible body lets it bend and sway to avoid any attack, however strong it may be. From its mouth, it leaks a fluid that melts even iron.
 Generation = 1
-Evolutions = WEEPINBELL,Level,21
+Evolution = WEEPINBELL,Level,21
 #-------------------------------
 [WEEPINBELL]
 Name = Weepinbell
@@ -1856,7 +1858,7 @@ Habitat = Forest
 Category = Flycatcher
 Pokedex = At night, a Weepinbell hangs on to a tree branch with its hooked rear and sleeps. If it moves around in its sleep, it may wake up to find itself on the ground.
 Generation = 1
-Evolutions = VICTREEBEL,Item,LEAFSTONE
+Evolution = VICTREEBEL,Item,LEAFSTONE
 #-------------------------------
 [VICTREEBEL]
 Name = Victreebel
@@ -1909,7 +1911,7 @@ Category = Jellyfish
 Pokedex = Its body is almost entirely composed of water. It ensnares its foe with its two long tentacles, then stabs with the poison stingers at their tips.
 Generation = 1
 WildItemUncommon = POISONBARB
-Evolutions = TENTACRUEL,Level,30
+Evolution = TENTACRUEL,Level,30
 #-------------------------------
 [TENTACRUEL]
 Name = Tentacruel
@@ -1963,7 +1965,7 @@ Category = Rock
 Pokedex = It climbs mountain paths using only the power of its arms. Because they look just like boulders lining paths, hikers may step on them without noticing.
 Generation = 1
 WildItemUncommon = EVERSTONE
-Evolutions = GRAVELER,Level,25
+Evolution = GRAVELER,Level,25
 #-------------------------------
 [GRAVELER]
 Name = Graveler
@@ -1990,7 +1992,7 @@ Category = Rock
 Pokedex = They descend from mountains by tumbling down steep slopes. They are so brutal, they smash aside obstructing trees and huge boulders with thunderous tackles.
 Generation = 1
 WildItemUncommon = EVERSTONE
-Evolutions = GOLEM,Trade,
+Evolution = GOLEM,Trade
 #-------------------------------
 [GOLEM]
 Name = Golem
@@ -2044,7 +2046,7 @@ Category = Fire Horse
 Pokedex = A Ponyta is very weak at birth. It can barely stand up. Its legs become stronger as it stumbles and falls while trying to keep up with its parent.
 Generation = 1
 WildItemUncommon = SHUCABERRY
-Evolutions = RAPIDASH,Level,40
+Evolution = RAPIDASH,Level,40
 #-------------------------------
 [RAPIDASH]
 Name = Rapidash
@@ -2098,7 +2100,8 @@ Category = Dopey
 Pokedex = It catches prey by dipping its tail in water at the side of a river. But it often forgets what it is doing and spends whole days just loafing at the water's edge.
 Generation = 1
 WildItemUncommon = LAGGINGTAIL
-Evolutions = SLOWBRO,Level,37,SLOWKING,TradeItem,KINGSROCK
+Evolution = SLOWBRO,Level,37
+Evolution = SLOWKING,TradeItem,KINGSROCK
 #-------------------------------
 [SLOWBRO]
 Name = Slowbro
@@ -2151,7 +2154,7 @@ Category = Magnet
 Pokedex = The units at its sides are extremely powerful magnets. They generate enough magnetism to draw in iron objects from over 300 feet away.
 Generation = 1
 WildItemUncommon = METALCOAT
-Evolutions = MAGNETON,Level,30
+Evolution = MAGNETON,Level,30
 #-------------------------------
 [MAGNETON]
 Name = Magneton
@@ -2178,7 +2181,7 @@ Category = Magnet
 Pokedex = It is actually three Magnemite linked by magnetism. It generates powerful radio waves that raise temperatures by 3.6 degrees F within a 3,300-foot radius.
 Generation = 1
 WildItemUncommon = METALCOAT
-Evolutions = MAGNEZONE,LocationFlag,Magnetic
+Evolution = MAGNEZONE,LocationFlag,Magnetic
 #-------------------------------
 [FARFETCHD]
 Name = Farfetch'd
@@ -2233,7 +2236,7 @@ Category = Twin Bird
 Pokedex = Even while eating or sleeping, one of the heads remains always vigilant for any sign of danger. When threatened, it flees at over 60 miles per hour.
 Generation = 1
 WildItemUncommon = SHARPBEAK
-Evolutions = DODRIO,Level,31
+Evolution = DODRIO,Level,31
 #-------------------------------
 [DODRIO]
 Name = Dodrio
@@ -2286,7 +2289,7 @@ Habitat = Sea
 Category = Sea Lion
 Pokedex = Seel hunt for prey in frigid, ice-covered seas. When it needs to breathe, it punches a hole through the ice with the sharply protruding section of its head.
 Generation = 1
-Evolutions = DEWGONG,Level,34
+Evolution = DEWGONG,Level,34
 #-------------------------------
 [DEWGONG]
 Name = Dewgong
@@ -2339,7 +2342,7 @@ Category = Sludge
 Pokedex = Born from polluted sludge in the sea, Grimer's favorite food is anything filthy. They feed on wastewater pumped out from factories.
 Generation = 1
 WildItemUncommon = BLACKSLUDGE
-Evolutions = MUK,Level,38
+Evolution = MUK,Level,38
 #-------------------------------
 [MUK]
 Name = Muk
@@ -2395,7 +2398,7 @@ Pokedex = At night, it burrows a hole in the seafloor with its broad tongue to m
 Generation = 1
 WildItemCommon = PEARL
 WildItemUncommon = BIGPEARL
-Evolutions = CLOYSTER,Item,WATERSTONE
+Evolution = CLOYSTER,Item,WATERSTONE
 #-------------------------------
 [CLOYSTER]
 Name = Cloyster
@@ -2448,7 +2451,7 @@ Habitat = Cave
 Category = Gas
 Pokedex = When exposed to a strong wind, a Gastly's gaseous body quickly dwindles away. They cluster under the eaves of houses to escape the ravages of wind.
 Generation = 1
-Evolutions = HAUNTER,Level,25
+Evolution = HAUNTER,Level,25
 #-------------------------------
 [HAUNTER]
 Name = Haunter
@@ -2473,7 +2476,7 @@ Habitat = Cave
 Category = Gas
 Pokedex = If a Haunter beckons you while it is floating in darkness, don't approach it. This Pokémon will try to lick you with its tongue and steal your life away.
 Generation = 1
-Evolutions = GENGAR,Trade,
+Evolution = GENGAR,Trade
 #-------------------------------
 [GENGAR]
 Name = Gengar
@@ -2524,7 +2527,7 @@ Habitat = Cave
 Category = Rock Snake
 Pokedex = There is a magnet in its brain that prevents an Onix from losing direction while tunneling. As it grows older, its body becomes steadily rounder and smoother.
 Generation = 1
-Evolutions = STEELIX,TradeItem,METALCOAT
+Evolution = STEELIX,TradeItem,METALCOAT
 #-------------------------------
 [DROWZEE]
 Name = Drowzee
@@ -2551,7 +2554,7 @@ Habitat = Grassland
 Category = Hypnosis
 Pokedex = If your nose becomes itchy while you are sleeping, it's a sure sign that a Drowzee is standing above your pillow and trying to eat your dream through your nostrils.
 Generation = 1
-Evolutions = HYPNO,Level,26
+Evolution = HYPNO,Level,26
 #-------------------------------
 [HYPNO]
 Name = Hypno
@@ -2603,7 +2606,7 @@ Habitat = WatersEdge
 Category = River Crab
 Pokedex = Krabby live in holes dug into beaches. On sandy shores with little in the way of food, they can be seen squabbling with each other over territory.
 Generation = 1
-Evolutions = KINGLER,Level,28
+Evolution = KINGLER,Level,28
 #-------------------------------
 [KINGLER]
 Name = Kingler
@@ -2654,7 +2657,7 @@ Habitat = Urban
 Category = Ball
 Pokedex = It bears an uncanny and unexplained resemblance to a Poké Ball. Because it explodes at the slightest shock, even veteran trainers treat it with caution.
 Generation = 1
-Evolutions = ELECTRODE,Level,30
+Evolution = ELECTRODE,Level,30
 #-------------------------------
 [ELECTRODE]
 Name = Electrode
@@ -2706,7 +2709,7 @@ Habitat = Forest
 Category = Egg
 Pokedex = It consists of six eggs that care for each other. The eggs attract each other and spin around. When cracks increasingly appear, it is close to evolution.
 Generation = 1
-Evolutions = EXEGGUTOR,Item,LEAFSTONE
+Evolution = EXEGGUTOR,Item,LEAFSTONE
 #-------------------------------
 [EXEGGUTOR]
 Name = Exeggutor
@@ -2759,7 +2762,7 @@ Category = Lonely
 Pokedex = It pines for the mother it will never see again. Seeing a likeness of its mother in the full moon, it cries. The stains on the skull it wears are from its tears.
 Generation = 1
 WildItemUncommon = THICKCLUB
-Evolutions = MAROWAK,Level,28
+Evolution = MAROWAK,Level,28
 #-------------------------------
 [MAROWAK]
 Name = Marowak
@@ -2863,7 +2866,7 @@ Category = Licking
 Pokedex = Whenever it sees something unfamiliar, it always licks the object because it memorizes things by texture and taste. It is somewhat put off by sour things.
 Generation = 1
 WildItemUncommon = LAGGINGTAIL
-Evolutions = LICKILICKY,HasMove,ROLLOUT
+Evolution = LICKILICKY,HasMove,ROLLOUT
 #-------------------------------
 [KOFFING]
 Name = Koffing
@@ -2890,7 +2893,7 @@ Category = Poison Gas
 Pokedex = Getting up close to a Koffing will give you a chance to observe, through its thin skin, the toxic gases swirling inside. It blows up at the slightest stimulation.
 Generation = 1
 WildItemUncommon = SMOKEBALL
-Evolutions = WEEZING,Level,35
+Evolution = WEEZING,Level,35
 #-------------------------------
 [WEEZING]
 Name = Weezing
@@ -2942,7 +2945,7 @@ Habitat = RoughTerrain
 Category = Spikes
 Pokedex = Once it starts running, it doesn't stop. Its tiny brain makes it so stupid that it can't remember why it started running in the first place.
 Generation = 1
-Evolutions = RHYDON,Level,42
+Evolution = RHYDON,Level,42
 #-------------------------------
 [RHYDON]
 Name = Rhydon
@@ -2968,7 +2971,7 @@ Habitat = RoughTerrain
 Category = Drill
 Pokedex = Its horn, which rotates like a drill, destroys tall buildings with one strike. It stands on its hind legs, and its brain is well developed.
 Generation = 1
-Evolutions = RHYPERIOR,TradeItem,PROTECTOR
+Evolution = RHYPERIOR,TradeItem,PROTECTOR
 #-------------------------------
 [CHANSEY]
 Name = Chansey
@@ -2997,7 +3000,7 @@ Pokedex = Chansey lay nutritionally excellent eggs every day. The eggs are so de
 Generation = 1
 WildItemCommon = LUCKYPUNCH
 WildItemUncommon = LUCKYEGG
-Evolutions = BLISSEY,Happiness,
+Evolution = BLISSEY,Happiness
 #-------------------------------
 [TANGELA]
 Name = Tangela
@@ -3024,7 +3027,7 @@ Habitat = Grassland
 Category = Vine
 Pokedex = Its vines snap off easily and painlessly if they are grabbed, allowing it to make a quick getaway. The lost vines are replaced by new growth the very next day.
 Generation = 1
-Evolutions = TANGROWTH,HasMove,ANCIENTPOWER
+Evolution = TANGROWTH,HasMove,ANCIENTPOWER
 #-------------------------------
 [KANGASKHAN]
 Name = Kangaskhan
@@ -3078,7 +3081,7 @@ Category = Dragon
 Pokedex = By cleverly flicking the fins on its back side to side, it moves in any direction while facing forward. It spits ink to escape if it senses danger.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = SEADRA,Level,32
+Evolution = SEADRA,Level,32
 #-------------------------------
 [SEADRA]
 Name = Seadra
@@ -3105,7 +3108,7 @@ Category = Dragon
 Pokedex = The poisonous barbs all over its body are highly valued as ingredients for making traditional herbal medicine. It shows no mercy to anything approaching its nest.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = KINGDRA,TradeItem,DRAGONSCALE
+Evolution = KINGDRA,TradeItem,DRAGONSCALE
 #-------------------------------
 [GOLDEEN]
 Name = Goldeen
@@ -3132,7 +3135,7 @@ Habitat = WatersEdge
 Category = Goldfish
 Pokedex = In the springtime, schools of Goldeen can be seen swimming up falls and rivers. It metes out staggering damage with its single horn.
 Generation = 1
-Evolutions = SEAKING,Level,33
+Evolution = SEAKING,Level,33
 #-------------------------------
 [SEAKING]
 Name = Seaking
@@ -3185,7 +3188,7 @@ Pokedex = It gathers with others in the night and makes its red core glow on and
 Generation = 1
 WildItemCommon = STARDUST
 WildItemUncommon = STARPIECE
-Evolutions = STARMIE,Item,WATERSTONE
+Evolution = STARMIE,Item,WATERSTONE
 #-------------------------------
 [STARMIE]
 Name = Starmie
@@ -3266,7 +3269,7 @@ Habitat = Grassland
 Category = Mantis
 Pokedex = Its blindingly fast speed adds to the sharpness of its twin forearm scythes. The scythes can slice through thick logs in one wicked stroke.
 Generation = 1
-Evolutions = SCIZOR,TradeItem,METALCOAT
+Evolution = SCIZOR,TradeItem,METALCOAT
 #-------------------------------
 [JYNX]
 Name = Jynx
@@ -3321,7 +3324,7 @@ Category = Electric
 Pokedex = When a storm approaches, it competes with others to scale heights that are likely to be stricken by lightning. Some towns use Electabuzz as lightning rods.
 Generation = 1
 WildItemUncommon = ELECTIRIZER
-Evolutions = ELECTIVIRE,TradeItem,ELECTIRIZER
+Evolution = ELECTIVIRE,TradeItem,ELECTIRIZER
 #-------------------------------
 [MAGMAR]
 Name = Magmar
@@ -3348,7 +3351,7 @@ Category = Spitfire
 Pokedex = In battle, it blows out intense flames from all over its body to intimidate its foe. These fiery bursts create heat waves that ignite grass and trees.
 Generation = 1
 WildItemUncommon = MAGMARIZER
-Evolutions = MAGMORTAR,TradeItem,MAGMARIZER
+Evolution = MAGMORTAR,TradeItem,MAGMARIZER
 #-------------------------------
 [PINSIR]
 Name = Pinsir
@@ -3425,7 +3428,7 @@ Habitat = WatersEdge
 Category = Fish
 Pokedex = Its swimming muscles are weak, so it is easily washed away by currents. In places where water pools, you can see many Magikarp deposited there by the flow.
 Generation = 1
-Evolutions = GYARADOS,Level,20
+Evolution = GYARADOS,Level,20
 #-------------------------------
 [GYARADOS]
 Name = Gyarados
@@ -3529,7 +3532,13 @@ Habitat = Urban
 Category = Evolution
 Pokedex = An Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokémon to evolve.
 Generation = 1
-Evolutions = VAPOREON,Item,WATERSTONE,JOLTEON,Item,THUNDERSTONE,FLAREON,Item,FIRESTONE,LEAFEON,LocationFlag,MossRock,GLACEON,LocationFlag,IceRock,ESPEON,HappinessDay,,UMBREON,HappinessNight,
+Evolution = VAPOREON,Item,WATERSTONE
+Evolution = JOLTEON,Item,THUNDERSTONE
+Evolution = FLAREON,Item,FIRESTONE
+Evolution = LEAFEON,LocationFlag,MossRock
+Evolution = GLACEON,LocationFlag,IceRock
+Evolution = ESPEON,HappinessDay
+Evolution = UMBREON,HappinessNight
 #-------------------------------
 [VAPOREON]
 Name = Vaporeon
@@ -3630,7 +3639,7 @@ Habitat = Urban
 Category = Virtual
 Pokedex = It is capable of reverting itself entirely back to program data in order to enter cyberspace. A Porygon is copy- protected so it cannot be duplicated.
 Generation = 1
-Evolutions = PORYGON2,TradeItem,UPGRADE
+Evolution = PORYGON2,TradeItem,UPGRADE
 #-------------------------------
 [OMANYTE]
 Name = Omanyte
@@ -3657,7 +3666,7 @@ Habitat = Sea
 Category = Spiral
 Pokedex = One of the ancient and long-since-extinct Pokémon that have been regenerated from fossils by humans. If attacked, it withdraws into its hard shell.
 Generation = 1
-Evolutions = OMASTAR,Level,40
+Evolution = OMASTAR,Level,40
 #-------------------------------
 [OMASTAR]
 Name = Omastar
@@ -3709,7 +3718,7 @@ Habitat = Sea
 Category = Shellfish
 Pokedex = This Pokémon has been regenerated from a fossil. However, in rare cases, living examples have been discovered. Kabuto have not changed for 300 million years.
 Generation = 1
-Evolutions = KABUTOPS,Level,40
+Evolution = KABUTOPS,Level,40
 #-------------------------------
 [KABUTOPS]
 Name = Kabutops
@@ -3895,7 +3904,7 @@ Category = Dragon
 Pokedex = A Dratini continually molts and sloughs off its old skin. It does so because the life energy within its body steadily builds to reach uncontrollable levels.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = DRAGONAIR,Level,30
+Evolution = DRAGONAIR,Level,30
 #-------------------------------
 [DRAGONAIR]
 Name = Dragonair
@@ -3922,7 +3931,7 @@ Category = Dragon
 Pokedex = A Dragonair stores an enormous amount of energy inside its body. It is said to alter the weather around it by loosing energy from the crystals on its neck and tail.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = DRAGONITE,Level,55
+Evolution = DRAGONITE,Level,55
 #-------------------------------
 [DRAGONITE]
 Name = Dragonite
@@ -4029,7 +4038,7 @@ Habitat = Grassland
 Category = Leaf
 Pokedex = It waves its leaf around to keep foes at bay. However, a sweet fragrance also wafts from the leaf, creating a friendly atmosphere that becalms the battlers.
 Generation = 2
-Evolutions = BAYLEEF,Level,16
+Evolution = BAYLEEF,Level,16
 #-------------------------------
 [BAYLEEF]
 Name = Bayleef
@@ -4055,7 +4064,7 @@ Habitat = Grassland
 Category = Leaf
 Pokedex = A Bayleef's neck is ringed by curled-up leaves. Inside each leaf is a small tree shoot. The fragrance of this shoot makes people peppy.
 Generation = 2
-Evolutions = MEGANIUM,Level,32
+Evolution = MEGANIUM,Level,32
 #-------------------------------
 [MEGANIUM]
 Name = Meganium
@@ -4107,7 +4116,7 @@ Habitat = Grassland
 Category = Fire Mouse
 Pokedex = It flares flames from its back to protect itself. The fire burns vigorously if the Pokémon is angry. When it is tired, it sputters with incomplete combustion.
 Generation = 2
-Evolutions = QUILAVA,Level,14
+Evolution = QUILAVA,Level,14
 #-------------------------------
 [QUILAVA]
 Name = Quilava
@@ -4133,7 +4142,7 @@ Habitat = Grassland
 Category = Volcano
 Pokedex = It intimidates foes with intense gusts of flames and superheated air. Its quick nimbleness lets it dodge attacks even while scorching an enemy.
 Generation = 2
-Evolutions = TYPHLOSION,Level,36
+Evolution = TYPHLOSION,Level,36
 #-------------------------------
 [TYPHLOSION]
 Name = Typhlosion
@@ -4185,7 +4194,7 @@ Habitat = WatersEdge
 Category = Big Jaw
 Pokedex = Despite its small body, Totodile's jaws are very powerful. While it may think it is just playfully nipping, its bite has enough strength to cause serious injury.
 Generation = 2
-Evolutions = CROCONAW,Level,18
+Evolution = CROCONAW,Level,18
 #-------------------------------
 [CROCONAW]
 Name = Croconaw
@@ -4211,7 +4220,7 @@ Habitat = WatersEdge
 Category = Big Jaw
 Pokedex = Once its jaws clamp down on its foe, it will absolutely not let go. Because the tips of its fangs are forked back like fishhooks, they become irremovably embedded.
 Generation = 2
-Evolutions = FERALIGATR,Level,30
+Evolution = FERALIGATR,Level,30
 #-------------------------------
 [FERALIGATR]
 Name = Feraligatr
@@ -4264,7 +4273,7 @@ Category = Scout
 Pokedex = They take turns standing guard when it is time to sleep. The sentry awakens the others if it senses danger. If one gets separated, it turns sleepless with fear.
 Generation = 2
 WildItemUncommon = ORANBERRY
-Evolutions = FURRET,Level,15
+Evolution = FURRET,Level,15
 #-------------------------------
 [FURRET]
 Name = Furret
@@ -4318,7 +4327,7 @@ Habitat = Forest
 Category = Owl
 Pokedex = It has an internal organ that senses the earth's rotation. Using this special organ, a Hoothoot begins hooting at precisely the same time every day.
 Generation = 2
-Evolutions = NOCTOWL,Level,20
+Evolution = NOCTOWL,Level,20
 #-------------------------------
 [NOCTOWL]
 Name = Noctowl
@@ -4370,7 +4379,7 @@ Habitat = Forest
 Category = Five Star
 Pokedex = Ledyba communicate using a fluid that they secrete from where the legs join the body. They are said to convey feelings to others by altering the fluid's scent.
 Generation = 2
-Evolutions = LEDIAN,Level,18
+Evolution = LEDIAN,Level,18
 #-------------------------------
 [LEDIAN]
 Name = Ledian
@@ -4422,7 +4431,7 @@ Habitat = Forest
 Category = String Spit
 Pokedex = The web it spins can be considered its second nervous system. It is said that a Spinarak determines its prey by the tiny vibrations it feels through the web.
 Generation = 2
-Evolutions = ARIADOS,Level,22
+Evolution = ARIADOS,Level,22
 #-------------------------------
 [ARIADOS]
 Name = Ariados
@@ -4500,7 +4509,7 @@ Category = Angler
 Pokedex = When it senses danger, it discharges positive and negative electricity from its two antennae. It lives in depths beyond sunlight's reach.
 Generation = 2
 WildItemUncommon = DEEPSEASCALE
-Evolutions = LANTURN,Level,27
+Evolution = LANTURN,Level,27
 #-------------------------------
 [LANTURN]
 Name = Lanturn
@@ -4554,7 +4563,7 @@ Category = Tiny Mouse
 Pokedex = It is still inept at retaining electricity. When it is startled, it discharges power accidentally. It gets better at holding power as it grows older.
 Generation = 2
 WildItemCommon = ORANBERRY
-Evolutions = PIKACHU,Happiness,
+Evolution = PIKACHU,Happiness
 #-------------------------------
 [CLEFFA]
 Name = Cleffa
@@ -4584,7 +4593,7 @@ Generation = 2
 WildItemCommon = LEPPABERRY
 WildItemUncommon = MOONSTONE
 WildItemRare = COMETSHARD
-Evolutions = CLEFAIRY,Happiness,
+Evolution = CLEFAIRY,Happiness
 #-------------------------------
 [IGGLYBUFF]
 Name = Igglybuff
@@ -4611,7 +4620,7 @@ Habitat = Grassland
 Category = Balloon
 Pokedex = Its soft and pliable body is very bouncy. When it sings continuously with all its might, its body steadily turns a deepening pink color.
 Generation = 2
-Evolutions = JIGGLYPUFF,Happiness,
+Evolution = JIGGLYPUFF,Happiness
 #-------------------------------
 [TOGEPI]
 Name = Togepi
@@ -4638,7 +4647,7 @@ Habitat = Forest
 Category = Spike Ball
 Pokedex = As its energy, it uses the feelings of compassion and pleasure exuded by people and Pokémon. It stores up happy feelings in its shell, then shares them out.
 Generation = 2
-Evolutions = TOGETIC,Happiness,
+Evolution = TOGETIC,Happiness
 #-------------------------------
 [TOGETIC]
 Name = Togetic
@@ -4664,7 +4673,7 @@ Habitat = Forest
 Category = Happiness
 Pokedex = It is said to be a Pokémon that brings good fortune. When it spots someone who is pure of heart, a Togetic appears and shares its happiness with that person.
 Generation = 2
-Evolutions = TOGEKISS,Item,SHINYSTONE
+Evolution = TOGEKISS,Item,SHINYSTONE
 #-------------------------------
 [NATU]
 Name = Natu
@@ -4691,7 +4700,7 @@ Habitat = Forest
 Category = Tiny Bird
 Pokedex = It runs up short trees that grow on the savanna to peck at new shoots. A Natu's eyes look as if they are always observing something.
 Generation = 2
-Evolutions = XATU,Level,25
+Evolution = XATU,Level,25
 #-------------------------------
 [XATU]
 Name = Xatu
@@ -4743,7 +4752,7 @@ Habitat = Grassland
 Category = Wool
 Pokedex = Its fluffy wool rubs together and builds a static charge. The more energy is charged, the more brightly the lightbulb at the tip of its tail glows.
 Generation = 2
-Evolutions = FLAAFFY,Level,15
+Evolution = FLAAFFY,Level,15
 #-------------------------------
 [FLAAFFY]
 Name = Flaaffy
@@ -4769,7 +4778,7 @@ Habitat = Grassland
 Category = Wool
 Pokedex = Its fleece quality changes to generate strong static electricity with a small amount of wool. The bare, slick parts of its hide are shielded against electricity.
 Generation = 2
-Evolutions = AMPHAROS,Level,30
+Evolution = AMPHAROS,Level,30
 #-------------------------------
 [AMPHAROS]
 Name = Ampharos
@@ -4846,7 +4855,7 @@ Habitat = WatersEdge
 Category = Aqua Mouse
 Pokedex = Its body is covered with water-repellent fur. Because of the fur, it can swim through water at high speed without being slowed by the water's resistance.
 Generation = 2
-Evolutions = AZUMARILL,Level,18
+Evolution = AZUMARILL,Level,18
 #-------------------------------
 [AZUMARILL]
 Name = Azumarill
@@ -4950,7 +4959,7 @@ Habitat = Grassland
 Category = Cottonweed
 Pokedex = This Pokémon drifts and floats with the wind. If it senses the approach of strong winds, a Hoppip links leaves with others to prepare against being blown away.
 Generation = 2
-Evolutions = SKIPLOOM,Level,18
+Evolution = SKIPLOOM,Level,18
 #-------------------------------
 [SKIPLOOM]
 Name = Skiploom
@@ -4976,7 +4985,7 @@ Habitat = Grassland
 Category = Cottonweed
 Pokedex = It blossoms when the temperature rises above 64 degrees F. Because its flower's blooming changes with the temperature, it is sometimes used as a thermometer.
 Generation = 2
-Evolutions = JUMPLUFF,Level,27
+Evolution = JUMPLUFF,Level,27
 #-------------------------------
 [JUMPLUFF]
 Name = Jumpluff
@@ -5028,7 +5037,7 @@ Habitat = Forest
 Category = Long Tail
 Pokedex = Its tail ends with a dexterous, handlike appendage. However, because it uses the tail so much, Aipom's real hands have become rather clumsy.
 Generation = 2
-Evolutions = AMBIPOM,HasMove,DOUBLEHIT
+Evolution = AMBIPOM,HasMove,DOUBLEHIT
 #-------------------------------
 [SUNKERN]
 Name = Sunkern
@@ -5056,7 +5065,7 @@ Category = Seed
 Pokedex = Sunkern try to minimize movement to conserve the nutrients they have stored in their bodies for evolution. They will not eat, subsisting only on morning dew.
 Generation = 2
 WildItemUncommon = COBABERRY
-Evolutions = SUNFLORA,Item,SUNSTONE
+Evolution = SUNFLORA,Item,SUNSTONE
 #-------------------------------
 [SUNFLORA]
 Name = Sunflora
@@ -5109,7 +5118,7 @@ Category = Clear Wing
 Pokedex = It can see 360 degrees without moving its eyes. It is a great flier capable of making sudden stops and turning midair to quickly chase down targeted prey.
 Generation = 2
 WildItemUncommon = WIDELENS
-Evolutions = YANMEGA,HasMove,ANCIENTPOWER
+Evolution = YANMEGA,HasMove,ANCIENTPOWER
 #-------------------------------
 [WOOPER]
 Name = Wooper
@@ -5136,7 +5145,7 @@ Habitat = WatersEdge
 Category = Water Fish
 Pokedex = Wooper usually live in water but come out onto land seeking food occasionally. On land, they coat their bodies with a gooey, toxic film.
 Generation = 2
-Evolutions = QUAGSIRE,Level,20
+Evolution = QUAGSIRE,Level,20
 #-------------------------------
 [QUAGSIRE]
 Name = Quagsire
@@ -5238,7 +5247,7 @@ Habitat = Forest
 Category = Darkness
 Pokedex = Murkrow were feared as the alleged bearers of ill fortune. It shows strong interest in anything that sparkles. It will even try to steal rings from women.
 Generation = 2
-Evolutions = HONCHKROW,Item,DUSKSTONE
+Evolution = HONCHKROW,Item,DUSKSTONE
 #-------------------------------
 [SLOWKING]
 Name = Slowking
@@ -5290,7 +5299,7 @@ Habitat = Cave
 Category = Screech
 Pokedex = A Misdreavus frightens people with a creepy, sobbing cry. It apparently uses its red spheres to absorb the fear of foes as its nutrition.
 Generation = 2
-Evolutions = MISMAGIUS,Item,DUSKSTONE
+Evolution = MISMAGIUS,Item,DUSKSTONE
 #-------------------------------
 [UNOWN]
 Name = Unown
@@ -5392,7 +5401,7 @@ Habitat = Forest
 Category = Bagworm
 Pokedex = A Pineco hangs from a tree branch and waits for prey. While eating, if it is disturbed by someone shaking its tree, it falls on the ground and explodes.
 Generation = 2
-Evolutions = FORRETRESS,Level,31
+Evolution = FORRETRESS,Level,31
 #-------------------------------
 [FORRETRESS]
 Name = Forretress
@@ -5470,7 +5479,7 @@ Habitat = Mountain
 Category = FlyScorpion
 Pokedex = It glides without making a single sound. It grasps the face of its foe using its hind and large front claws, then stabs with its poison barb.
 Generation = 2
-Evolutions = GLISCOR,NightHoldItem,RAZORFANG
+Evolution = GLISCOR,NightHoldItem,RAZORFANG
 #-------------------------------
 [STEELIX]
 Name = Steelix
@@ -5523,7 +5532,7 @@ Habitat = Urban
 Category = Fairy
 Pokedex = By baring its fangs and making a scary face, it sends smaller Pokémon scurrying in terror. The Snubbull does seem a little sad at making its foes flee.
 Generation = 2
-Evolutions = GRANBULL,Level,23
+Evolution = GRANBULL,Level,23
 #-------------------------------
 [GRANBULL]
 Name = Granbull
@@ -5684,7 +5693,7 @@ Pokedex = A Sneasel scales trees by punching its hooked claws into the bark. It
 Generation = 2
 WildItemCommon = GRIPCLAW
 WildItemUncommon = QUICKCLAW
-Evolutions = WEAVILE,NightHoldItem,RAZORCLAW
+Evolution = WEAVILE,NightHoldItem,RAZORCLAW
 #-------------------------------
 [TEDDIURSA]
 Name = Teddiursa
@@ -5711,7 +5720,7 @@ Habitat = Mountain
 Category = Little Bear
 Pokedex = It licks its palms that are sweetened by being soaked in honey. A Teddiursa makes its own honey by blending fruits and pollen collected by Beedrill.
 Generation = 2
-Evolutions = URSARING,Level,30
+Evolution = URSARING,Level,30
 #-------------------------------
 [URSARING]
 Name = Ursaring
@@ -5763,7 +5772,7 @@ Habitat = Mountain
 Category = Lava
 Pokedex = It is a species of Pokémon that lives in volcanic areas. If its body cools, its skin hardens and immobilizes it. To avoid that, it sleeps near magma.
 Generation = 2
-Evolutions = MAGCARGO,Level,38
+Evolution = MAGCARGO,Level,38
 #-------------------------------
 [MAGCARGO]
 Name = Magcargo
@@ -5815,7 +5824,7 @@ Habitat = Cave
 Category = Pig
 Pokedex = It roots for food by rubbing its snout against the ground. Its favorite food is a mushroom that grows under dried grass. It occasionally roots out hot springs.
 Generation = 2
-Evolutions = PILOSWINE,Level,33
+Evolution = PILOSWINE,Level,33
 #-------------------------------
 [PILOSWINE]
 Name = Piloswine
@@ -5841,7 +5850,7 @@ Habitat = Cave
 Category = Swine
 Pokedex = A Piloswine is covered by a thick coat of long hair for enduring freezing cold. It uses its tusks to dig up food that has been buried under ice.
 Generation = 2
-Evolutions = MAMOSWINE,HasMove,ANCIENTPOWER
+Evolution = MAMOSWINE,HasMove,ANCIENTPOWER
 #-------------------------------
 [CORSOLA]
 Name = Corsola
@@ -5895,7 +5904,7 @@ Habitat = Sea
 Category = Jet
 Pokedex = A Remoraid uses its abdominal muscles to forcefully expel swallowed water, then shoot down flying prey. When evolution approaches, it travels down rivers.
 Generation = 2
-Evolutions = OCTILLERY,Level,25
+Evolution = OCTILLERY,Level,25
 #-------------------------------
 [OCTILLERY]
 Name = Octillery
@@ -6025,7 +6034,7 @@ Habitat = RoughTerrain
 Category = Dark
 Pokedex = Houndour communicate with each other using a variety of cries to corner their prey. This Pokémon's remarkable teamwork is simply unparalleled.
 Generation = 2
-Evolutions = HOUNDOOM,Level,24
+Evolution = HOUNDOOM,Level,24
 #-------------------------------
 [HOUNDOOM]
 Name = Houndoom
@@ -6104,7 +6113,7 @@ Category = Long Nose
 Pokedex = Phanpy's big ears serve as broad fans. When it becomes hot, it flaps the ears busily to cool down. Even the young are very strong.
 Generation = 2
 WildItemUncommon = PASSHOBERRY
-Evolutions = DONPHAN,Level,25
+Evolution = DONPHAN,Level,25
 #-------------------------------
 [DONPHAN]
 Name = Donphan
@@ -6156,7 +6165,7 @@ Habitat = Urban
 Category = Virtual
 Pokedex = It was created by humans using the power of science. It has been given artificial intelligence that enables it to learn new gestures and emotions on its own.
 Generation = 2
-Evolutions = PORYGONZ,TradeItem,DUBIOUSDISC
+Evolution = PORYGONZ,TradeItem,DUBIOUSDISC
 #-------------------------------
 [STANTLER]
 Name = Stantler
@@ -6233,7 +6242,9 @@ Habitat = Urban
 Category = Scuffle
 Pokedex = Tyrogue become stressed out if they do not get to train every day. When raising this Pokémon, the trainer must establish a regular training schedule.
 Generation = 2
-Evolutions = HITMONLEE,AttackGreater,20,HITMONCHAN,DefenseGreater,20,HITMONTOP,AtkDefEqual,20
+Evolution = HITMONLEE,AttackGreater,20
+Evolution = HITMONCHAN,DefenseGreater,20
+Evolution = HITMONTOP,AtkDefEqual,20
 #-------------------------------
 [HITMONTOP]
 Name = Hitmontop
@@ -6288,7 +6299,7 @@ Generation = 2
 WildItemCommon = ASPEARBERRY
 WildItemUncommon = ASPEARBERRY
 WildItemRare = ASPEARBERRY
-Evolutions = JYNX,Level,30
+Evolution = JYNX,Level,30
 #-------------------------------
 [ELEKID]
 Name = Elekid
@@ -6316,7 +6327,7 @@ Category = Electric
 Pokedex = If it touches metal and discharges the electricity it has stored in its body, an Elekid begins swinging its arms in circles to recharge itself.
 Generation = 2
 WildItemUncommon = ELECTIRIZER
-Evolutions = ELECTABUZZ,Level,30
+Evolution = ELECTABUZZ,Level,30
 #-------------------------------
 [MAGBY]
 Name = Magby
@@ -6344,7 +6355,7 @@ Category = Live Coal
 Pokedex = If a Magby is spouting yellow flames from its mouth, it is in good health. When it is fatigued, black smoke will be mixed in with the flames.
 Generation = 2
 WildItemUncommon = MAGMARIZER
-Evolutions = MAGMAR,Level,30
+Evolution = MAGMAR,Level,30
 #-------------------------------
 [MILTANK]
 Name = Miltank
@@ -6506,7 +6517,7 @@ Habitat = Mountain
 Category = Rock Skin
 Pokedex = A Larvitar is born deep under the ground. It must eat its way through the soil above and reach the surface for it to see its parents' faces.
 Generation = 2
-Evolutions = PUPITAR,Level,30
+Evolution = PUPITAR,Level,30
 #-------------------------------
 [PUPITAR]
 Name = Pupitar
@@ -6531,7 +6542,7 @@ Habitat = Mountain
 Category = Hard Shell
 Pokedex = A Pupitar creates a gas inside its body that it ejects under compression to propel itself like a jet. Its body can withstand a collision with solid steel.
 Generation = 2
-Evolutions = TYRANITAR,Level,55
+Evolution = TYRANITAR,Level,55
 #-------------------------------
 [TYRANITAR]
 Name = Tyranitar
@@ -6666,7 +6677,7 @@ Habitat = Forest
 Category = Wood Gecko
 Pokedex = It makes its nest in a giant tree in the forest. It ferociously guards against anything nearing its territory. It is said to be the protector of the trees.
 Generation = 3
-Evolutions = GROVYLE,Level,16
+Evolution = GROVYLE,Level,16
 #-------------------------------
 [GROVYLE]
 Name = Grovyle
@@ -6692,7 +6703,7 @@ Habitat = Forest
 Category = Wood Gecko
 Pokedex = Leaves grow out of this Pokémon's body. They help obscure a Grovyle from the eyes of its enemies while it is in a thickly overgrown forest.
 Generation = 3
-Evolutions = SCEPTILE,Level,36
+Evolution = SCEPTILE,Level,36
 #-------------------------------
 [SCEPTILE]
 Name = Sceptile
@@ -6744,7 +6755,7 @@ Habitat = Grassland
 Category = Chick
 Pokedex = If attacked, it strikes back by spitting balls of fire it forms in its stomach. A Torchic dislikes darkness because it can't see its surroundings.
 Generation = 3
-Evolutions = COMBUSKEN,Level,16
+Evolution = COMBUSKEN,Level,16
 #-------------------------------
 [COMBUSKEN]
 Name = Combusken
@@ -6770,7 +6781,7 @@ Habitat = Grassland
 Category = Young Fowl
 Pokedex = It lashes out with 10 kicks per second. Its strong fighting instinct compels it to keep up its offensive until the opponent gives up.
 Generation = 3
-Evolutions = BLAZIKEN,Level,36
+Evolution = BLAZIKEN,Level,36
 #-------------------------------
 [BLAZIKEN]
 Name = Blaziken
@@ -6822,7 +6833,7 @@ Habitat = WatersEdge
 Category = Mud Fish
 Pokedex = On land, it can powerfully lift large boulders by planting its four feet and heaving. It sleeps by burying itself in soil at the water's edge.
 Generation = 3
-Evolutions = MARSHTOMP,Level,16
+Evolution = MARSHTOMP,Level,16
 #-------------------------------
 [MARSHTOMP]
 Name = Marshtomp
@@ -6848,7 +6859,7 @@ Habitat = WatersEdge
 Category = Mud Fish
 Pokedex = Its toughened hind legs enable it to stand upright. Because it weakens if its skin dries out, it replenishes fluids by playing in mud.
 Generation = 3
-Evolutions = SWAMPERT,Level,36
+Evolution = SWAMPERT,Level,36
 #-------------------------------
 [SWAMPERT]
 Name = Swampert
@@ -6901,7 +6912,7 @@ Category = Bite
 Pokedex = It savagely threatens foes with bared fangs. It chases after fleeing targets tenaciously. It turns tail and runs, however, if the foe strikes back.
 Generation = 3
 WildItemUncommon = PECHABERRY
-Evolutions = MIGHTYENA,Level,18
+Evolution = MIGHTYENA,Level,18
 #-------------------------------
 [MIGHTYENA]
 Name = Mightyena
@@ -6955,7 +6966,7 @@ Category = TinyRaccoon
 Pokedex = Rubbing its nose against the ground, it always wanders about back and forth in search of something. It is distinguished by the zigzag footprints it leaves.
 Generation = 3
 WildItemUncommon = ORANBERRY
-Evolutions = LINOONE,Level,20
+Evolution = LINOONE,Level,20
 #-------------------------------
 [LINOONE]
 Name = Linoone
@@ -7008,7 +7019,8 @@ Habitat = Forest
 Category = Worm
 Pokedex = It sticks to tree branches and eats leaves. The thread it spits from its mouth becomes gooey when it touches air and slows the movement of its foes.
 Generation = 3
-Evolutions = SILCOON,Silcoon,7,CASCOON,Cascoon,7
+Evolution = SILCOON,Silcoon,7
+Evolution = CASCOON,Cascoon,7
 #-------------------------------
 [SILCOON]
 Name = Silcoon
@@ -7033,7 +7045,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = It prepares for evolution using the energy it stored while it was a Wurmple. It keeps watch over the surroundings with its two eyes.
 Generation = 3
-Evolutions = BEAUTIFLY,Level,10
+Evolution = BEAUTIFLY,Level,10
 #-------------------------------
 [BEAUTIFLY]
 Name = Beautifly
@@ -7084,7 +7096,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = To avoid detection by its enemies, it hides motionlessly beneath large leaves and in the gaps of branches. It also attaches dead leaves to its body for camouflage.
 Generation = 3
-Evolutions = DUSTOX,Level,10
+Evolution = DUSTOX,Level,10
 #-------------------------------
 [DUSTOX]
 Name = Dustox
@@ -7137,7 +7149,7 @@ Habitat = WatersEdge
 Category = Water Weed
 Pokedex = This Pokémon lives in ponds with clean water. It is known to ferry small Pokémon across ponds by carrying them on the broad leaf on its head.
 Generation = 3
-Evolutions = LOMBRE,Level,14
+Evolution = LOMBRE,Level,14
 #-------------------------------
 [LOMBRE]
 Name = Lombre
@@ -7163,7 +7175,7 @@ Habitat = WatersEdge
 Category = Jolly
 Pokedex = In the evening, it takes great delight in popping out of rivers and startling people. It feeds on aquatic moss that grows on rocks in the riverbed.
 Generation = 3
-Evolutions = LUDICOLO,Item,WATERSTONE
+Evolution = LUDICOLO,Item,WATERSTONE
 #-------------------------------
 [LUDICOLO]
 Name = Ludicolo
@@ -7215,7 +7227,7 @@ Habitat = Forest
 Category = Acorn
 Pokedex = It hangs off branches and absorbs nutrients. When it finishes eating, its body becomes so heavy that it drops to the ground with a thump.
 Generation = 3
-Evolutions = NUZLEAF,Level,14
+Evolution = NUZLEAF,Level,14
 #-------------------------------
 [NUZLEAF]
 Name = Nuzleaf
@@ -7241,7 +7253,7 @@ Habitat = Forest
 Category = Wily
 Pokedex = A forest-dwelling Pokémon that is skilled at climbing trees. Its long and pointed nose is its weak point. It loses power if the nose is gripped.
 Generation = 3
-Evolutions = SHIFTRY,Item,LEAFSTONE
+Evolution = SHIFTRY,Item,LEAFSTONE
 #-------------------------------
 [SHIFTRY]
 Name = Shiftry
@@ -7294,7 +7306,7 @@ Category = TinySwallow
 Pokedex = Although it is small, it is very courageous. It will take on a larger Skarmory on an equal footing. However, its will weakens if it becomes hungry.
 Generation = 3
 WildItemUncommon = CHARTIBERRY
-Evolutions = SWELLOW,Level,22
+Evolution = SWELLOW,Level,22
 #-------------------------------
 [SWELLOW]
 Name = Swellow
@@ -7347,7 +7359,7 @@ Habitat = Sea
 Category = Seagull
 Pokedex = It makes its nest on a sheer cliff at the edge of the sea. It has trouble keeping its wings flapping in flight. Instead, it soars on updrafts.
 Generation = 3
-Evolutions = PELIPPER,Level,25
+Evolution = PELIPPER,Level,25
 #-------------------------------
 [PELIPPER]
 Name = Pelipper
@@ -7399,7 +7411,7 @@ Habitat = Urban
 Category = Feeling
 Pokedex = A Ralts has the power to sense the emotions of people and Pokémon with the horns on its head. It takes cover if it senses any hostility.
 Generation = 3
-Evolutions = KIRLIA,Level,20
+Evolution = KIRLIA,Level,20
 #-------------------------------
 [KIRLIA]
 Name = Kirlia
@@ -7425,7 +7437,8 @@ Habitat = Urban
 Category = Emotion
 Pokedex = A Kirlia has the psychic power to create a rip in the dimensions and see into the future. It is said to dance with pleasure on sunny mornings.
 Generation = 3
-Evolutions = GARDEVOIR,Level,30,GALLADE,ItemMale,DAWNSTONE
+Evolution = GARDEVOIR,Level,30
+Evolution = GALLADE,ItemMale,DAWNSTONE
 #-------------------------------
 [GARDEVOIR]
 Name = Gardevoir
@@ -7477,7 +7490,7 @@ Habitat = WatersEdge
 Category = Pond Skater
 Pokedex = They gather on puddles after evening downpours, gliding across the surface of water as if sliding. It secretes honey with a sweet aroma from its head.
 Generation = 3
-Evolutions = MASQUERAIN,Level,22
+Evolution = MASQUERAIN,Level,22
 #-------------------------------
 [MASQUERAIN]
 Name = Masquerain
@@ -7531,7 +7544,7 @@ Category = Mushroom
 Pokedex = It loves to eat damp, composted soil in forests. If you enter a forest after a long rain, you can see many Shroomish feasting on composted soil.
 Generation = 3
 WildItemUncommon = KEBIABERRY
-Evolutions = BRELOOM,Level,23
+Evolution = BRELOOM,Level,23
 #-------------------------------
 [BRELOOM]
 Name = Breloom
@@ -7583,7 +7596,7 @@ Habitat = Forest
 Category = Slacker
 Pokedex = It sleeps virtually all day and night long. It doesn't change its nest its entire life, but it sometimes travels great distances by swimming in rivers.
 Generation = 3
-Evolutions = VIGOROTH,Level,18
+Evolution = VIGOROTH,Level,18
 #-------------------------------
 [VIGOROTH]
 Name = Vigoroth
@@ -7608,7 +7621,7 @@ Habitat = Forest
 Category = Wild Monkey
 Pokedex = It can't keep still because its blood boils with energy. It runs through the fields and mountains all day to calm itself. If it doesn't, it can't sleep at night.
 Generation = 3
-Evolutions = SLAKING,Level,36
+Evolution = SLAKING,Level,36
 #-------------------------------
 [SLAKING]
 Name = Slaking
@@ -7659,7 +7672,8 @@ Habitat = Forest
 Category = Trainee
 Pokedex = It makes its nest at the roots of a mighty tree. Using its whiskerlike antennae, it probes its surroundings in the pitch-black darkness of soil.
 Generation = 3
-Evolutions = NINJASK,Ninjask,20,SHEDINJA,Shedinja,20
+Evolution = NINJASK,Ninjask,20
+Evolution = SHEDINJA,Shedinja,20
 #-------------------------------
 [NINJASK]
 Name = Ninjask
@@ -7736,7 +7750,7 @@ Category = Whisper
 Pokedex = Its cries equal a jet plane in volume. It inhales through its ear canals. Because of this system, it can cry continually without having to catch its breath.
 Generation = 3
 WildItemUncommon = CHESTOBERRY
-Evolutions = LOUDRED,Level,20
+Evolution = LOUDRED,Level,20
 #-------------------------------
 [LOUDRED]
 Name = Loudred
@@ -7763,7 +7777,7 @@ Category = Big Voice
 Pokedex = It positions the round speakers on its head to assail foes with ultrasonic waves at massive volume. It builds power by stomping the ground.
 Generation = 3
 WildItemUncommon = CHESTOBERRY
-Evolutions = EXPLOUD,Level,40
+Evolution = EXPLOUD,Level,40
 #-------------------------------
 [EXPLOUD]
 Name = Exploud
@@ -7816,7 +7830,7 @@ Habitat = Mountain
 Category = Guts
 Pokedex = It loves to toughen up its body above all else. If you hear quaking rumbles in a cave, it is the sound of Makuhita undertaking strenuous training.
 Generation = 3
-Evolutions = HARIYAMA,Level,24
+Evolution = HARIYAMA,Level,24
 #-------------------------------
 [HARIYAMA]
 Name = Hariyama
@@ -7870,7 +7884,7 @@ Habitat = WatersEdge
 Category = Polka Dot
 Pokedex = Its tail, which is packed with nutrition, is very bouncy like a rubber ball. On sunny days they gather at the edge of water and splash about for fun.
 Generation = 3
-Evolutions = MARILL,Happiness,
+Evolution = MARILL,Happiness
 #-------------------------------
 [NOSEPASS]
 Name = Nosepass
@@ -7898,7 +7912,7 @@ Category = Compass
 Pokedex = Its body emits a powerful magnetism. It feeds on prey that is pulled in by the force. Its magnetism is stronger in cold seasons.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = PROBOPASS,LocationFlag,Magnetic
+Evolution = PROBOPASS,LocationFlag,Magnetic
 #-------------------------------
 [SKITTY]
 Name = Skitty
@@ -7926,7 +7940,7 @@ Category = Kitten
 Pokedex = A Skitty's adorably cute behavior makes it highly popular. In battle, it makes its tail puff out. It threatens foes with a sharp growl.
 Generation = 3
 WildItemCommon = PECHABERRY
-Evolutions = DELCATTY,Item,MOONSTONE
+Evolution = DELCATTY,Item,MOONSTONE
 #-------------------------------
 [DELCATTY]
 Name = Delcatty
@@ -8033,7 +8047,7 @@ Category = Iron Armor
 Pokedex = A Pokémon that is clad in steel armor. A new suit of armor is made when it evolves. The old, discarded armor is salvaged as metal for making iron products.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = LAIRON,Level,32
+Evolution = LAIRON,Level,32
 #-------------------------------
 [LAIRON]
 Name = Lairon
@@ -8060,7 +8074,7 @@ Category = Iron Armor
 Pokedex = When two Lairon meet in the wild, they fight for territory by bashing into each other with their steel bodies. The sound of their collision carries for miles.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = AGGRON,Level,42
+Evolution = AGGRON,Level,42
 #-------------------------------
 [AGGRON]
 Name = Aggron
@@ -8113,7 +8127,7 @@ Habitat = Mountain
 Category = Meditate
 Pokedex = It continually meditates for hours every day. As a result of rigorous and dedicated yoga training, it has tempered its spiritual power so much it can fly.
 Generation = 3
-Evolutions = MEDICHAM,Level,37
+Evolution = MEDICHAM,Level,37
 #-------------------------------
 [MEDICHAM]
 Name = Medicham
@@ -8165,7 +8179,7 @@ Habitat = Grassland
 Category = Lightning
 Pokedex = It generates electricity using friction from the atmosphere. In seasons with especially arid air, its entire body blazes with violent showers of sparks.
 Generation = 3
-Evolutions = MANECTRIC,Level,26
+Evolution = MANECTRIC,Level,26
 #-------------------------------
 [MANECTRIC]
 Name = Manectric
@@ -8323,7 +8337,7 @@ Pokedex = A Roselia that drinks nutritionally rich springwater blooms with lovel
 Generation = 3
 WildItemUncommon = POISONBARB
 WildItemRare = ABSORBBULB
-Evolutions = ROSERADE,Item,SHINYSTONE
+Evolution = ROSERADE,Item,SHINYSTONE
 #-------------------------------
 [GULPIN]
 Name = Gulpin
@@ -8351,7 +8365,7 @@ Category = Stomach
 Pokedex = This Pokémon's stomach fluid can even digest scrap iron. In one gulp, it can swallow something that is as large as itself.
 Generation = 3
 WildItemUncommon = BIGPEARL
-Evolutions = SWALOT,Level,26
+Evolution = SWALOT,Level,26
 #-------------------------------
 [SWALOT]
 Name = Swalot
@@ -8405,7 +8419,7 @@ Category = Savage
 Pokedex = Carvanha attack ships in swarms, making them sink. Although it is said to be a very vicious Pokémon, it timidly flees as soon as it finds itself alone.
 Generation = 3
 WildItemUncommon = DEEPSEATOOTH
-Evolutions = SHARPEDO,Level,30
+Evolution = SHARPEDO,Level,30
 #-------------------------------
 [SHARPEDO]
 Name = Sharpedo
@@ -8458,7 +8472,7 @@ Habitat = Sea
 Category = Ball Whale
 Pokedex = While this Pokémon usually lives in the sea, it can survive on land, although not too long. It loses vitality if its body becomes dried out.
 Generation = 3
-Evolutions = WAILORD,Level,40
+Evolution = WAILORD,Level,40
 #-------------------------------
 [WAILORD]
 Name = Wailord
@@ -8513,7 +8527,7 @@ Generation = 3
 WildItemCommon = RAWSTBERRY
 WildItemUncommon = RAWSTBERRY
 WildItemRare = RAWSTBERRY
-Evolutions = CAMERUPT,Level,33
+Evolution = CAMERUPT,Level,33
 #-------------------------------
 [CAMERUPT]
 Name = Camerupt
@@ -8595,7 +8609,7 @@ Category = Bounce
 Pokedex = A Pokémon that manipulates psychic power at will. It doesn't stop bouncing even when it is asleep. It loves eating mushrooms that grow underground.
 Generation = 3
 WildItemCommon = PERSIMBERRY
-Evolutions = GRUMPIG,Level,32
+Evolution = GRUMPIG,Level,32
 #-------------------------------
 [GRUMPIG]
 Name = Grumpig
@@ -8676,7 +8690,7 @@ Category = Ant Pit
 Pokedex = Its big jaws crunch through boulders. Because its head is so big, it has a hard time getting back upright if it tips over onto its back.
 Generation = 3
 WildItemUncommon = SOFTSAND
-Evolutions = VIBRAVA,Level,35
+Evolution = VIBRAVA,Level,35
 #-------------------------------
 [VIBRAVA]
 Name = Vibrava
@@ -8701,7 +8715,7 @@ Habitat = RoughTerrain
 Category = Vibration
 Pokedex = It looses ultrasonic waves by rubbing its wings together. Since a Vibrava's wings are still in the process of growing, it can only fly short distances.
 Generation = 3
-Evolutions = FLYGON,Level,45
+Evolution = FLYGON,Level,45
 #-------------------------------
 [FLYGON]
 Name = Flygon
@@ -8753,7 +8767,7 @@ Category = Cactus
 Pokedex = Cacnea live in deserts with virtually no rainfall. It battles by swinging its thick, spiked arms. Once a year, a yellow flower blooms.
 Generation = 3
 WildItemUncommon = STICKYBARB
-Evolutions = CACTURNE,Level,32
+Evolution = CACTURNE,Level,32
 #-------------------------------
 [CACTURNE]
 Name = Cacturne
@@ -8806,7 +8820,7 @@ Habitat = Forest
 Category = Cotton Bird
 Pokedex = A Pokémon that has wings like cottony clouds. After enduring winter, in which little food is available, Swablu flocks move closer to towns in the spring.
 Generation = 3
-Evolutions = ALTARIA,Level,35
+Evolution = ALTARIA,Level,35
 #-------------------------------
 [ALTARIA]
 Name = Altaria
@@ -8963,7 +8977,7 @@ Habitat = WatersEdge
 Category = Whiskers
 Pokedex = Its body is covered with a slimy film. The film acts as a barrier to prevent germs in muddy water from entering the Barboach's body.
 Generation = 3
-Evolutions = WHISCASH,Level,30
+Evolution = WHISCASH,Level,30
 #-------------------------------
 [WHISCASH]
 Name = Whiscash
@@ -9015,7 +9029,7 @@ Habitat = WatersEdge
 Category = Ruffian
 Pokedex = Once it grips prey with its large pincers, it will never let go, no matter what. It is a hardy Pokémon that can thrive in any environment.
 Generation = 3
-Evolutions = CRAWDAUNT,Level,30
+Evolution = CRAWDAUNT,Level,30
 #-------------------------------
 [CRAWDAUNT]
 Name = Crawdaunt
@@ -9065,7 +9079,7 @@ Habitat = RoughTerrain
 Category = Clay Doll
 Pokedex = A Baltoy moves by spinning on its single foot. It has been depicted in murals adorning the walls of a once-bustling city in an ancient age.
 Generation = 3
-Evolutions = CLAYDOL,Level,36
+Evolution = CLAYDOL,Level,36
 #-------------------------------
 [CLAYDOL]
 Name = Claydol
@@ -9117,7 +9131,7 @@ Category = Sea Lily
 Pokedex = It disguises itself as seaweed by making its tentacles sway. Unsuspecting prey that come too close are swallowed whole. It became extinct 100 million years ago.
 Generation = 3
 WildItemUncommon = BIGROOT
-Evolutions = CRADILY,Level,40
+Evolution = CRADILY,Level,40
 #-------------------------------
 [CRADILY]
 Name = Cradily
@@ -9170,7 +9184,7 @@ Habitat = WatersEdge
 Category = Old Shrimp
 Pokedex = It was resurrected from a fossil using the power of science. It swims by undulating the wings at its sides. They were feet that adapted to life in the sea.
 Generation = 3
-Evolutions = ARMALDO,Level,40
+Evolution = ARMALDO,Level,40
 #-------------------------------
 [ARMALDO]
 Name = Armaldo
@@ -9222,7 +9236,8 @@ Habitat = WatersEdge
 Category = Fish
 Pokedex = Feebas live in ponds that are heavily infested with weeds. Because of its hopelessly shabby appearance, it seems as if few trainers raise it.
 Generation = 3
-Evolutions = MILOTIC,TradeItem,PRISMSCALE,MILOTIC,Beauty,170
+Evolution = MILOTIC,TradeItem,PRISMSCALE
+Evolution = MILOTIC,Beauty,170
 #-------------------------------
 [MILOTIC]
 Name = Milotic
@@ -9330,7 +9345,7 @@ Category = Puppet
 Pokedex = This Pokémon roams about deep in the night seeking such negative emotions as grudges and envy. It retreats to its nest when the sun begins to rise.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = BANETTE,Level,37
+Evolution = BANETTE,Level,37
 #-------------------------------
 [BANETTE]
 Name = Banette
@@ -9383,7 +9398,7 @@ Category = Requiem
 Pokedex = A glare from its single scarlet eye makes even burly grown-ups freeze in utter fear. It is a nocturnal Pokémon that roams about under the cloak of darkness.
 Generation = 3
 WildItemUncommon = KASIBBERRY
-Evolutions = DUSCLOPS,Level,37
+Evolution = DUSCLOPS,Level,37
 #-------------------------------
 [DUSCLOPS]
 Name = Dusclops
@@ -9409,7 +9424,7 @@ Category = Beckon
 Pokedex = It is thought that its body is hollow with only a spectral ball of fire burning inside. However, no one has been able to confirm this theory as fact.
 Generation = 3
 WildItemUncommon = KASIBBERRY
-Evolutions = DUSKNOIR,TradeItem,REAPERCLOTH
+Evolution = DUSKNOIR,TradeItem,REAPERCLOTH
 #-------------------------------
 [TROPIUS]
 Name = Tropius
@@ -9513,7 +9528,7 @@ Habitat = Cave
 Category = Bright
 Pokedex = A Wynaut loves to eat sweet fruits. It cleverly picks fruits using its earlike arms. They gather in fruit gardens, drawn by the fragrance.
 Generation = 3
-Evolutions = WOBBUFFET,Level,15
+Evolution = WOBBUFFET,Level,15
 #-------------------------------
 [SNORUNT]
 Name = Snorunt
@@ -9541,7 +9556,8 @@ Category = Snow Hat
 Pokedex = They tend to move about in groups of around five Snorunt. In snowy regions, it is said that when they are seen late at night, snowfall will arrive by morning.
 Generation = 3
 WildItemUncommon = BABIRIBERRY
-Evolutions = GLALIE,Level,42,FROSLASS,ItemFemale,DAWNSTONE
+Evolution = GLALIE,Level,42
+Evolution = FROSLASS,ItemFemale,DAWNSTONE
 #-------------------------------
 [GLALIE]
 Name = Glalie
@@ -9594,7 +9610,7 @@ Habitat = Sea
 Category = Clap
 Pokedex = It is completely covered with plushy fur. As a result, it never feels the cold even when it is rolling about on ice floes or diving in the sea.
 Generation = 3
-Evolutions = SEALEO,Level,32
+Evolution = SEALEO,Level,32
 #-------------------------------
 [SEALEO]
 Name = Sealeo
@@ -9620,7 +9636,7 @@ Habitat = Sea
 Category = Ball Roll
 Pokedex = Sealeo live in herds on ice floes. Using its powerful flippers, it shatters ice. It dives into the sea to hunt prey five times a day.
 Generation = 3
-Evolutions = WALREIN,Level,44
+Evolution = WALREIN,Level,44
 #-------------------------------
 [WALREIN]
 Name = Walrein
@@ -9673,7 +9689,8 @@ Category = Bivalve
 Pokedex = A Clamperl slams its shell closed on prey to prevent escape. The pearl it creates upon evolution is said to be infused with a mysterious energy.
 Generation = 3
 WildItemUncommon = BIGPEARL
-Evolutions = HUNTAIL,TradeItem,DEEPSEATOOTH,GOREBYSS,TradeItem,DEEPSEASCALE
+Evolution = HUNTAIL,TradeItem,DEEPSEATOOTH
+Evolution = GOREBYSS,TradeItem,DEEPSEASCALE
 #-------------------------------
 [HUNTAIL]
 Name = Huntail
@@ -9807,7 +9824,7 @@ Category = Rock Head
 Pokedex = Although it is small, this Pokémon is very powerful because its body is a bundle of muscles. It launches head-butts with its ironlike skull.
 Generation = 3
 WildItemUncommon = DRAGONFANG
-Evolutions = SHELGON,Level,30
+Evolution = SHELGON,Level,30
 #-------------------------------
 [SHELGON]
 Name = Shelgon
@@ -9834,7 +9851,7 @@ Category = Endurance
 Pokedex = It hardly eats while it awaits evolution. It becomes hardier by enduring hunger. Its shell peels off the instant it begins to evolve.
 Generation = 3
 WildItemUncommon = DRAGONFANG
-Evolutions = SALAMENCE,Level,50
+Evolution = SALAMENCE,Level,50
 #-------------------------------
 [SALAMENCE]
 Name = Salamence
@@ -9887,7 +9904,7 @@ Category = Iron Ball
 Pokedex = When Beldum gather in a swarm, they move in perfect unison as if they were but one Pokémon. They communicate with each other using brain waves.
 Generation = 3
 WildItemUncommon = METALCOAT
-Evolutions = METANG,Level,20
+Evolution = METANG,Level,20
 #-------------------------------
 [METANG]
 Name = Metang
@@ -9914,7 +9931,7 @@ Category = Iron Claw
 Pokedex = The claws tipping its arms pack the destructive power to tear through thick iron sheets as if they were silk. It flies at over 60 miles per hour.
 Generation = 3
 WildItemUncommon = METALCOAT
-Evolutions = METAGROSS,Level,45
+Evolution = METAGROSS,Level,45
 #-------------------------------
 [METAGROSS]
 Name = Metagross
@@ -10223,7 +10240,7 @@ Shape = Quadruped
 Category = Tiny Leaf
 Pokedex = Made from soil, the shell on its back hardens when it drinks water. It lives along lakes.
 Generation = 4
-Evolutions = GROTLE,Level,18
+Evolution = GROTLE,Level,18
 #-------------------------------
 [GROTLE]
 Name = Grotle
@@ -10248,7 +10265,7 @@ Shape = Quadruped
 Category = Grove
 Pokedex = It lives along water in forests. In the daytime, it leaves the forest to sunbathe its treed shell.
 Generation = 4
-Evolutions = TORTERRA,Level,32
+Evolution = TORTERRA,Level,32
 #-------------------------------
 [TORTERRA]
 Name = Torterra
@@ -10298,7 +10315,7 @@ Shape = BipedalTail
 Category = Chimp
 Pokedex = It agilely scales sheer cliffs to live atop craggy mountains. Its fire is put out when it sleeps.
 Generation = 4
-Evolutions = MONFERNO,Level,14
+Evolution = MONFERNO,Level,14
 #-------------------------------
 [MONFERNO]
 Name = Monferno
@@ -10323,7 +10340,7 @@ Shape = BipedalTail
 Category = Playful
 Pokedex = To intimidate attackers, it stretches the fire on its tail to make itself appear bigger.
 Generation = 4
-Evolutions = INFERNAPE,Level,36
+Evolution = INFERNAPE,Level,36
 #-------------------------------
 [INFERNAPE]
 Name = Infernape
@@ -10373,7 +10390,7 @@ Shape = Bipedal
 Category = Penguin
 Pokedex = Because it is very proud, it hates accepting food from people. Its thick down guards it from cold.
 Generation = 4
-Evolutions = PRINPLUP,Level,16
+Evolution = PRINPLUP,Level,16
 #-------------------------------
 [PRINPLUP]
 Name = Prinplup
@@ -10398,7 +10415,7 @@ Shape = BipedalTail
 Category = Penguin
 Pokedex = It lives alone, away from others. Apparently, every one of them believes it is the most important.
 Generation = 4
-Evolutions = EMPOLEON,Level,36
+Evolution = EMPOLEON,Level,36
 #-------------------------------
 [EMPOLEON]
 Name = Empoleon
@@ -10448,7 +10465,7 @@ Category = Starling
 Pokedex = They flock in great numbers. Though small, they flap their wings with great power.
 Generation = 4
 WildItemUncommon = YACHEBERRY
-Evolutions = STARAVIA,Level,14
+Evolution = STARAVIA,Level,14
 #-------------------------------
 [STARAVIA]
 Name = Staravia
@@ -10474,7 +10491,7 @@ Category = Starling
 Pokedex = It flies around forests and fields in search of bug Pokémon. It stays within a huge flock.
 Generation = 4
 WildItemUncommon = YACHEBERRY
-Evolutions = STARAPTOR,Level,34
+Evolution = STARAPTOR,Level,34
 #-------------------------------
 [STARAPTOR]
 Name = Staraptor
@@ -10525,7 +10542,7 @@ Shape = Quadruped
 Category = Plump Mouse
 Pokedex = With nerves of steel, nothing can perturb it. It is more agile and active than it appears.
 Generation = 4
-Evolutions = BIBAREL,Level,15
+Evolution = BIBAREL,Level,15
 #-------------------------------
 [BIBAREL]
 Name = Bibarel
@@ -10577,7 +10594,7 @@ Category = Cricket
 Pokedex = It shakes its head back to front, causing its antennae to hit each other and sound like a xylophone.
 Generation = 4
 WildItemUncommon = METRONOME
-Evolutions = KRICKETUNE,Level,10
+Evolution = KRICKETUNE,Level,10
 #-------------------------------
 [KRICKETUNE]
 Name = Kricketune
@@ -10628,7 +10645,7 @@ Shape = Quadruped
 Category = Flash
 Pokedex = All of its fur dazzles if danger is sensed. It flees while the foe is momentarily blinded.
 Generation = 4
-Evolutions = LUXIO,Level,15
+Evolution = LUXIO,Level,15
 #-------------------------------
 [LUXIO]
 Name = Luxio
@@ -10653,7 +10670,7 @@ Shape = Quadruped
 Category = Spark
 Pokedex = Its claws loose electricity with enough amperage to cause fainting. They live in small groups.
 Generation = 4
-Evolutions = LUXRAY,Level,30
+Evolution = LUXRAY,Level,30
 #-------------------------------
 [LUXRAY]
 Name = Luxray
@@ -10705,7 +10722,7 @@ Category = Bud
 Pokedex = Over the winter, it closes its bud and endures the cold. In spring, the bud opens and releases pollen.
 Generation = 4
 WildItemUncommon = POISONBARB
-Evolutions = ROSELIA,HappinessDay,
+Evolution = ROSELIA,HappinessDay
 #-------------------------------
 [ROSERADE]
 Name = Roserade
@@ -10757,7 +10774,7 @@ Shape = BipedalTail
 Category = Head Butt
 Pokedex = It lived in jungles around 100 million years ago. Its skull is as hard as iron.
 Generation = 4
-Evolutions = RAMPARDOS,Level,30
+Evolution = RAMPARDOS,Level,30
 #-------------------------------
 [RAMPARDOS]
 Name = Rampardos
@@ -10807,7 +10824,7 @@ Shape = Quadruped
 Category = Shield
 Pokedex = A Pokémon that lived in jungles around 100 million years ago. Its facial hide is extremely hard.
 Generation = 4
-Evolutions = BASTIODON,Level,30
+Evolution = BASTIODON,Level,30
 #-------------------------------
 [BASTIODON]
 Name = Bastiodon
@@ -10858,7 +10875,8 @@ Category = Bagworm
 Pokedex = To shelter itself from cold, wintry winds, it covers itself with a cloak made of twigs and leaves.
 Generation = 4
 Flags = InheritFormFromMother
-Evolutions = WORMADAM,LevelFemale,20,MOTHIM,LevelMale,20
+Evolution = WORMADAM,LevelFemale,20
+Evolution = MOTHIM,LevelMale,20
 #-------------------------------
 [WORMADAM]
 Name = Wormadam
@@ -10937,7 +10955,7 @@ Category = Tiny Bee
 Pokedex = A Pokémon formed by three others. It busily carries sweet floral honey to Vespiquen.
 Generation = 4
 WildItemUncommon = HONEY
-Evolutions = VESPIQUEN,LevelFemale,21
+Evolution = VESPIQUEN,LevelFemale,21
 #-------------------------------
 [VESPIQUEN]
 Name = Vespiquen
@@ -11014,7 +11032,7 @@ Category = Sea Weasel
 Pokedex = It has a flotation sac that is like an inflatable collar. It floats on water with its head out.
 Generation = 4
 WildItemUncommon = WACANBERRY
-Evolutions = FLOATZEL,Level,26
+Evolution = FLOATZEL,Level,26
 #-------------------------------
 [FLOATZEL]
 Name = Floatzel
@@ -11065,7 +11083,7 @@ Category = Cherry
 Pokedex = The small ball holds the nutrients needed for evolution. Apparently, it is very sweet and tasty.
 Generation = 4
 WildItemUncommon = MIRACLESEED
-Evolutions = CHERRIM,Level,25
+Evolution = CHERRIM,Level,25
 #-------------------------------
 [CHERRIM]
 Name = Cherrim
@@ -11118,7 +11136,7 @@ Category = Sea Slug
 Pokedex = Its colors and shapes differ from region to region. In the Sinnoh region, two types are confirmed.
 Generation = 4
 Flags = InheritFormFromMother
-Evolutions = GASTRODON,Level,30
+Evolution = GASTRODON,Level,30
 #-------------------------------
 [GASTRODON]
 Name = Gastrodon
@@ -11194,7 +11212,7 @@ Shape = HeadArms
 Category = Balloon
 Pokedex = A Pokémon formed by the spirits of people and Pokémon. It loves damp, humid seasons.
 Generation = 4
-Evolutions = DRIFBLIM,Level,28
+Evolution = DRIFBLIM,Level,28
 #-------------------------------
 [DRIFBLIM]
 Name = Drifblim
@@ -11246,7 +11264,7 @@ Category = Rabbit
 Pokedex = It slams foes by sharply uncoiling its rolled ears. It stings enough to make a grown-up cry in pain.
 Generation = 4
 WildItemCommon = PECHABERRY
-Evolutions = LOPUNNY,Happiness,
+Evolution = LOPUNNY,Happiness
 #-------------------------------
 [LOPUNNY]
 Name = Lopunny
@@ -11345,7 +11363,7 @@ Category = Catty
 Pokedex = It claws if displeased and purrs when affectionate. Its fickleness is very popular among some.
 Generation = 4
 WildItemUncommon = CHERIBERRY
-Evolutions = PURUGLY,Level,38
+Evolution = PURUGLY,Level,38
 #-------------------------------
 [PURUGLY]
 Name = Purugly
@@ -11397,7 +11415,7 @@ Category = Bell
 Pokedex = It emits cries by agitating an orb at the back of its throat. It moves with flouncing hops.
 Generation = 4
 WildItemUncommon = COLBURBERRY
-Evolutions = CHIMECHO,HappinessNight,
+Evolution = CHIMECHO,HappinessNight
 #-------------------------------
 [STUNKY]
 Name = Stunky
@@ -11424,7 +11442,7 @@ Category = Skunk
 Pokedex = It protects itself by spraying a noxious fluid from its rear. The stench lingers for 24 hours.
 Generation = 4
 WildItemUncommon = PECHABERRY
-Evolutions = SKUNTANK,Level,34
+Evolution = SKUNTANK,Level,34
 #-------------------------------
 [SKUNTANK]
 Name = Skuntank
@@ -11475,7 +11493,7 @@ Category = Bronze
 Pokedex = Implements shaped like it were discovered in ancient tombs. It is unknown if they are related.
 Generation = 4
 WildItemUncommon = METALCOAT
-Evolutions = BRONZONG,Level,33
+Evolution = BRONZONG,Level,33
 #-------------------------------
 [BRONZONG]
 Name = Bronzong
@@ -11527,7 +11545,7 @@ Shape = HeadLegs
 Category = Bonsai
 Pokedex = It looks as if it is always crying. It is actually adjusting its body's fluid levels by eliminating excess.
 Generation = 4
-Evolutions = SUDOWOODO,HasMove,MIMIC
+Evolution = SUDOWOODO,HasMove,MIMIC
 #-------------------------------
 [MIMEJR]
 Name = Mime Jr.
@@ -11555,7 +11573,7 @@ Category = Mime
 Pokedex = It habitually mimics foes. Once mimicked, the foe cannot take its eyes off this Pokémon.
 Generation = 4
 WildItemUncommon = LEPPABERRY
-Evolutions = MRMIME,HasMove,MIMIC
+Evolution = MRMIME,HasMove,MIMIC
 #-------------------------------
 [HAPPINY]
 Name = Happiny
@@ -11584,7 +11602,7 @@ Pokedex = It loves round white things. It carries an egg-shaped rock in imitatio
 Generation = 4
 WildItemCommon = OVALSTONE
 WildItemUncommon = LUCKYEGG
-Evolutions = CHANSEY,DayHoldItem,OVALSTONE
+Evolution = CHANSEY,DayHoldItem,OVALSTONE
 #-------------------------------
 [CHATOT]
 Name = Chatot
@@ -11662,7 +11680,7 @@ Category = Land Shark
 Pokedex = It nests in small, horizontal holes in cave walls. It pounces to catch prey that stray too close.
 Generation = 4
 WildItemUncommon = HABANBERRY
-Evolutions = GABITE,Level,24
+Evolution = GABITE,Level,24
 #-------------------------------
 [GABITE]
 Name = Gabite
@@ -11688,7 +11706,7 @@ Category = Cave
 Pokedex = There is a long-held belief that medicine made from its scales will heal even incurable illnesses.
 Generation = 4
 WildItemUncommon = HABANBERRY
-Evolutions = GARCHOMP,Level,48
+Evolution = GARCHOMP,Level,48
 #-------------------------------
 [GARCHOMP]
 Name = Garchomp
@@ -11743,7 +11761,7 @@ Generation = 4
 WildItemCommon = LEFTOVERS
 WildItemUncommon = LEFTOVERS
 WildItemRare = LEFTOVERS
-Evolutions = SNORLAX,Happiness,
+Evolution = SNORLAX,Happiness
 #-------------------------------
 [RIOLU]
 Name = Riolu
@@ -11769,7 +11787,7 @@ Shape = BipedalTail
 Category = Emanation
 Pokedex = The aura that emanates from its body intensifies to alert others if it is afraid or sad.
 Generation = 4
-Evolutions = LUCARIO,HappinessDay,
+Evolution = LUCARIO,HappinessDay
 #-------------------------------
 [LUCARIO]
 Name = Lucario
@@ -11819,7 +11837,7 @@ Shape = Quadruped
 Category = Hippo
 Pokedex = It lives in arid places. Instead of perspiration, it expels grainy sand from its body.
 Generation = 4
-Evolutions = HIPPOWDON,Level,34
+Evolution = HIPPOWDON,Level,34
 #-------------------------------
 [HIPPOWDON]
 Name = Hippowdon
@@ -11870,7 +11888,7 @@ Category = Scorpion
 Pokedex = It grips prey with its tail claws and injects poison. It tenaciously hangs on until the poison takes.
 Generation = 4
 WildItemUncommon = POISONBARB
-Evolutions = DRAPION,Level,40
+Evolution = DRAPION,Level,40
 #-------------------------------
 [DRAPION]
 Name = Drapion
@@ -11922,7 +11940,7 @@ Category = Toxic Mouth
 Pokedex = Its cheeks hold poison sacs. It tries to catch foes off guard to jab them with toxic fingers.
 Generation = 4
 WildItemUncommon = BLACKSLUDGE
-Evolutions = TOXICROAK,Level,37
+Evolution = TOXICROAK,Level,37
 #-------------------------------
 [TOXICROAK]
 Name = Toxicroak
@@ -11998,7 +12016,7 @@ Category = Wing Fish
 Pokedex = After long exposure to sunlight, the patterns on its tail fins shine vividly when darkness arrives.
 Generation = 4
 WildItemUncommon = RINDOBERRY
-Evolutions = LUMINEON,Level,31
+Evolution = LUMINEON,Level,31
 #-------------------------------
 [LUMINEON]
 Name = Lumineon
@@ -12050,7 +12068,7 @@ Shape = Winged
 Category = Kite
 Pokedex = A friendly Pokémon that captures the subtle flows of seawater using its two antennae.
 Generation = 4
-Evolutions = MANTINE,HasInParty,REMORAID
+Evolution = MANTINE,HasInParty,REMORAID
 #-------------------------------
 [SNOVER]
 Name = Snover
@@ -12077,7 +12095,7 @@ Category = Frost Tree
 Pokedex = It lives on snowy mountains. Having had little contact with humans, it is boldly inquisitive.
 Generation = 4
 WildItemUncommon = NEVERMELTICE
-Evolutions = ABOMASNOW,Level,40
+Evolution = ABOMASNOW,Level,40
 #-------------------------------
 [ABOMASNOW]
 Name = Abomasnow
@@ -12964,7 +12982,7 @@ Shape = BipedalTail
 Category = Grass Snake
 Pokedex = They photosynthesize by bathing their tails in sunlight. When they are not feeling well, their tails droop.
 Generation = 5
-Evolutions = SERVINE,Level,17
+Evolution = SERVINE,Level,17
 #-------------------------------
 [SERVINE]
 Name = Servine
@@ -12989,7 +13007,7 @@ Shape = BipedalTail
 Category = Grass Snake
 Pokedex = They avoid attacks by sinking into the shadows of thick foliage. They retaliate with masterful whipping techniques.
 Generation = 5
-Evolutions = SERPERIOR,Level,36
+Evolution = SERPERIOR,Level,36
 #-------------------------------
 [SERPERIOR]
 Name = Serperior
@@ -13039,7 +13057,7 @@ Shape = Quadruped
 Category = Fire Pig
 Pokedex = It blows fire through its nose. When it catches a cold, the fire becomes pitch-black smoke instead.
 Generation = 5
-Evolutions = PIGNITE,Level,17
+Evolution = PIGNITE,Level,17
 #-------------------------------
 [PIGNITE]
 Name = Pignite
@@ -13064,7 +13082,7 @@ Shape = BipedalTail
 Category = Fire Pig
 Pokedex = Whatever it eats becomes fuel for the flame in its stomach. When it is angered, the intensity of the flame increases.
 Generation = 5
-Evolutions = EMBOAR,Level,36
+Evolution = EMBOAR,Level,36
 #-------------------------------
 [EMBOAR]
 Name = Emboar
@@ -13114,7 +13132,7 @@ Shape = BipedalTail
 Category = Sea Otter
 Pokedex = The scalchop on its stomach is made from the same elements as claws. It detaches the scalchop for use as a blade.
 Generation = 5
-Evolutions = DEWOTT,Level,17
+Evolution = DEWOTT,Level,17
 #-------------------------------
 [DEWOTT]
 Name = Dewott
@@ -13139,7 +13157,7 @@ Shape = BipedalTail
 Category = Discipline
 Pokedex = Scalchop techniques differ from one Dewott to another. It never neglects maintaining its scalchops.
 Generation = 5
-Evolutions = SAMUROTT,Level,36
+Evolution = SAMUROTT,Level,36
 #-------------------------------
 [SAMUROTT]
 Name = Samurott
@@ -13189,7 +13207,7 @@ Shape = Quadruped
 Category = Scout
 Pokedex = Extremely cautious, they take shifts to maintain a constant watch of their nest. They feel insecure without a lookout.
 Generation = 5
-Evolutions = WATCHOG,Level,20
+Evolution = WATCHOG,Level,20
 #-------------------------------
 [WATCHOG]
 Name = Watchog
@@ -13239,7 +13257,7 @@ Shape = Quadruped
 Category = Puppy
 Pokedex = The long hair around its face provides an amazing radar that lets it sense subtle changes in its surroundings.
 Generation = 5
-Evolutions = HERDIER,Level,16
+Evolution = HERDIER,Level,16
 #-------------------------------
 [HERDIER]
 Name = Herdier
@@ -13264,7 +13282,7 @@ Shape = Quadruped
 Category = Loyal Dog
 Pokedex = It loyally follows its Trainer's orders. For ages, they have helped Trainers raise Pokémon.
 Generation = 5
-Evolutions = STOUTLAND,Level,32
+Evolution = STOUTLAND,Level,32
 #-------------------------------
 [STOUTLAND]
 Name = Stoutland
@@ -13314,7 +13332,7 @@ Shape = Quadruped
 Category = Devious
 Pokedex = Its cute act is a ruse. When victims let down their guard, they find their items taken. It attacks with sharp claws.
 Generation = 5
-Evolutions = LIEPARD,Level,20
+Evolution = LIEPARD,Level,20
 #-------------------------------
 [LIEPARD]
 Name = Liepard
@@ -13366,7 +13384,7 @@ Pokedex = It shares the leaf on its head with weary-looking Pokémon. These leav
 Generation = 5
 WildItemCommon = ORANBERRY
 WildItemUncommon = OCCABERRY
-Evolutions = SIMISAGE,Item,LEAFSTONE
+Evolution = SIMISAGE,Item,LEAFSTONE
 #-------------------------------
 [SIMISAGE]
 Name = Simisage
@@ -13420,7 +13438,7 @@ Pokedex = This Pokémon lives in caves in volcanoes. The fire within the tuft on
 Generation = 5
 WildItemCommon = ORANBERRY
 WildItemUncommon = PASSHOBERRY
-Evolutions = SIMISEAR,Item,FIRESTONE
+Evolution = SIMISEAR,Item,FIRESTONE
 #-------------------------------
 [SIMISEAR]
 Name = Simisear
@@ -13474,7 +13492,7 @@ Pokedex = It does not thrive in dry environments. It keeps itself damp by shooti
 Generation = 5
 WildItemCommon = ORANBERRY
 WildItemUncommon = RINDOBERRY
-Evolutions = SIMIPOUR,Item,WATERSTONE
+Evolution = SIMIPOUR,Item,WATERSTONE
 #-------------------------------
 [SIMIPOUR]
 Name = Simipour
@@ -13526,7 +13544,7 @@ Shape = Quadruped
 Category = Dream Eater
 Pokedex = It eats the dreams of people and Pokémon. When it eats a pleasant dreams, it expels pink-colored mist.
 Generation = 5
-Evolutions = MUSHARNA,Item,MOONSTONE
+Evolution = MUSHARNA,Item,MOONSTONE
 #-------------------------------
 [MUSHARNA]
 Name = Musharna
@@ -13576,7 +13594,7 @@ Shape = Winged
 Category = Tiny Pigeon
 Pokedex = These Pokémon live in cities. They are accustomed to people. Flocks often gather in parks and plazas.
 Generation = 5
-Evolutions = TRANQUILL,Level,21
+Evolution = TRANQUILL,Level,21
 #-------------------------------
 [TRANQUILL]
 Name = Tranquill
@@ -13601,7 +13619,7 @@ Shape = Winged
 Category = Wild Pigeon
 Pokedex = Many people believe that, deep in the forest where Tranquill live, there is a peaceful place where there is no war.
 Generation = 5
-Evolutions = UNFEZANT,Level,32
+Evolution = UNFEZANT,Level,32
 #-------------------------------
 [UNFEZANT]
 Name = Unfezant
@@ -13652,7 +13670,7 @@ Category = Electrified
 Pokedex = When thunderclouds cover the sky, it will appear. It can catch lightning with its mane and store the electricity.
 Generation = 5
 WildItemCommon = CHERIBERRY
-Evolutions = ZEBSTRIKA,Level,27
+Evolution = ZEBSTRIKA,Level,27
 #-------------------------------
 [ZEBSTRIKA]
 Name = Zebstrika
@@ -13705,7 +13723,7 @@ Pokedex = They were discovered a hundred years ago in an earthquake fissure. Ins
 Generation = 5
 WildItemCommon = EVERSTONE
 WildItemUncommon = HARDSTONE
-Evolutions = BOLDORE,Level,25
+Evolution = BOLDORE,Level,25
 #-------------------------------
 [BOLDORE]
 Name = Boldore
@@ -13732,7 +13750,7 @@ Pokedex = Because its energy was too great to be contained, the energy leaked an
 Generation = 5
 WildItemCommon = EVERSTONE
 WildItemUncommon = HARDSTONE
-Evolutions = GIGALITH,Trade,
+Evolution = GIGALITH,Trade
 #-------------------------------
 [GIGALITH]
 Name = Gigalith
@@ -13784,7 +13802,7 @@ Shape = Winged
 Category = Bat
 Pokedex = Suction from its nostrils enables it to stick to cave walls during sleep. It leaves a heart-shaped mark behind.
 Generation = 5
-Evolutions = SWOOBAT,Happiness,
+Evolution = SWOOBAT,Happiness
 #-------------------------------
 [SWOOBAT]
 Name = Swoobat
@@ -13834,7 +13852,7 @@ Shape = BipedalTail
 Category = Mole
 Pokedex = It makes its way swiftly through the soil by putting both claws together and rotating at high speed.
 Generation = 5
-Evolutions = EXCADRILL,Level,31
+Evolution = EXCADRILL,Level,31
 #-------------------------------
 [EXCADRILL]
 Name = Excadrill
@@ -13911,7 +13929,7 @@ Shape = Bipedal
 Category = Muscular
 Pokedex = These Pokémon appear at building sites and help out with construction. They always carry squared logs.
 Generation = 5
-Evolutions = GURDURR,Level,25
+Evolution = GURDURR,Level,25
 #-------------------------------
 [GURDURR]
 Name = Gurdurr
@@ -13936,7 +13954,7 @@ Shape = Bipedal
 Category = Muscular
 Pokedex = They strengthen their bodies by carrying steel beams. They show off their big muscles to their friends.
 Generation = 5
-Evolutions = CONKELDURR,Trade,
+Evolution = CONKELDURR,Trade
 #-------------------------------
 [CONKELDURR]
 Name = Conkeldurr
@@ -13987,7 +14005,7 @@ Category = Tadpole
 Pokedex = By vibrating its cheeks, it emits sound waves imperceptible to humans. It uses the rhythm of these sounds to talk.
 Generation = 5
 WildItemCommon = PECHABERRY
-Evolutions = PALPITOAD,Level,25
+Evolution = PALPITOAD,Level,25
 #-------------------------------
 [PALPITOAD]
 Name = Palpitoad
@@ -14013,7 +14031,7 @@ Category = Vibration
 Pokedex = It lives in the water and on land. It uses its long, sticky tongue to capture prey.
 Generation = 5
 WildItemCommon = PECHABERRY
-Evolutions = SEISMITOAD,Level,36
+Evolution = SEISMITOAD,Level,36
 #-------------------------------
 [SEISMITOAD]
 Name = Seismitoad
@@ -14117,7 +14135,7 @@ Category = Sewing
 Pokedex = This Pokémon makes clothes for itself. It chews up leaves and sews them with sticky thread extruded from its mouth.
 Generation = 5
 WildItemUncommon = MENTALHERB
-Evolutions = SWADLOON,Level,20
+Evolution = SWADLOON,Level,20
 #-------------------------------
 [SWADLOON]
 Name = Swadloon
@@ -14143,7 +14161,7 @@ Category = Leaf-Wrapped
 Pokedex = It protects itself from the cold by wrapping up in leaves. It stays on the move, eating leaves in forests.
 Generation = 5
 WildItemUncommon = MENTALHERB
-Evolutions = LEAVANNY,Happiness,
+Evolution = LEAVANNY,Happiness
 #-------------------------------
 [LEAVANNY]
 Name = Leavanny
@@ -14196,7 +14214,7 @@ Pokedex = It discovers what is going on around it by using the feelers on its he
 Generation = 5
 WildItemCommon = PECHABERRY
 WildItemUncommon = POISONBARB
-Evolutions = WHIRLIPEDE,Level,22
+Evolution = WHIRLIPEDE,Level,22
 #-------------------------------
 [WHIRLIPEDE]
 Name = Whirlipede
@@ -14223,7 +14241,7 @@ Pokedex = It is usually motionless, but when attacked, it rotates at high speed
 Generation = 5
 WildItemCommon = PECHABERRY
 WildItemUncommon = POISONBARB
-Evolutions = SCOLIPEDE,Level,30
+Evolution = SCOLIPEDE,Level,30
 #-------------------------------
 [SCOLIPEDE]
 Name = Scolipede
@@ -14275,7 +14293,7 @@ Shape = Head
 Category = Cotton Puff
 Pokedex = They go wherever the wind takes them. On rainy days, their bodies are heavier, so they take shelter beneath big trees.
 Generation = 5
-Evolutions = WHIMSICOTT,Item,SUNSTONE
+Evolution = WHIMSICOTT,Item,SUNSTONE
 #-------------------------------
 [WHIMSICOTT]
 Name = Whimsicott
@@ -14325,7 +14343,7 @@ Shape = HeadBase
 Category = Bulb
 Pokedex = Since they prefer moist, nutrient-rich soil, the areas where Petilil live are known to be good for growing plants.
 Generation = 5
-Evolutions = LILLIGANT,Item,SUNSTONE
+Evolution = LILLIGANT,Item,SUNSTONE
 #-------------------------------
 [LILLIGANT]
 Name = Lilligant
@@ -14403,7 +14421,7 @@ Shape = Quadruped
 Category = Desert Croc
 Pokedex = It moves along below the sand's surface, except for its nose and eyes. A dark membrane shields its eyes from the sun.
 Generation = 5
-Evolutions = KROKOROK,Level,29
+Evolution = KROKOROK,Level,29
 #-------------------------------
 [KROKOROK]
 Name = Krokorok
@@ -14428,7 +14446,7 @@ Shape = Quadruped
 Category = Desert Croc
 Pokedex = The special membrane covering its eyes can sense the heat of objects, so it can see its surroundings, even in darkness.
 Generation = 5
-Evolutions = KROOKODILE,Level,40
+Evolution = KROOKODILE,Level,40
 #-------------------------------
 [KROOKODILE]
 Name = Krookodile
@@ -14479,7 +14497,7 @@ Category = Zen Charm
 Pokedex = Darumaka's droppings are hot, so people used to put them in their clothes to keep themselves warm.
 Generation = 5
 WildItemCommon = RAWSTBERRY
-Evolutions = DARMANITAN,Level,35
+Evolution = DARMANITAN,Level,35
 #-------------------------------
 [DARMANITAN]
 Name = Darmanitan
@@ -14559,7 +14577,7 @@ Pokedex = It makes a hole in a suitable rock. If that rock breaks, the Pokémon
 Generation = 5
 WildItemUncommon = HARDSTONE
 WildItemRare = RAREBONE
-Evolutions = CRUSTLE,Level,34
+Evolution = CRUSTLE,Level,34
 #-------------------------------
 [CRUSTLE]
 Name = Crustle
@@ -14612,7 +14630,7 @@ Category = Shedding
 Pokedex = It immediately headbutts anyone that makes eye contact with it. Its skull is massively thick.
 Generation = 5
 WildItemUncommon = SHEDSHELL
-Evolutions = SCRAFTY,Level,39
+Evolution = SCRAFTY,Level,39
 #-------------------------------
 [SCRAFTY]
 Name = Scrafty
@@ -14688,7 +14706,7 @@ Category = Spirit
 Pokedex = These Pokémon arose from the spirits of people interred in graves in past ages. Each retains memories of its former life.
 Generation = 5
 WildItemUncommon = SPELLTAG
-Evolutions = COFAGRIGUS,Level,34
+Evolution = COFAGRIGUS,Level,34
 #-------------------------------
 [COFAGRIGUS]
 Name = Cofagrigus
@@ -14738,7 +14756,7 @@ Shape = Quadruped
 Category = Prototurtle
 Pokedex = About 100 million years ago, these Pokémon swam in oceans. It is thought they also went on land to attack prey.
 Generation = 5
-Evolutions = CARRACOSTA,Level,37
+Evolution = CARRACOSTA,Level,37
 #-------------------------------
 [CARRACOSTA]
 Name = Carracosta
@@ -14787,7 +14805,7 @@ Shape = Winged
 Category = First Bird
 Pokedex = Revived from a fossil, this Pokémon is thought to be the ancestor of all bird Pokémon.
 Generation = 5
-Evolutions = ARCHEOPS,Level,37
+Evolution = ARCHEOPS,Level,37
 #-------------------------------
 [ARCHEOPS]
 Name = Archeops
@@ -14838,7 +14856,7 @@ Pokedex = The combination of garbage bags and industrial waste caused the chemic
 Generation = 5
 WildItemUncommon = BLACKSLUDGE
 WildItemRare = NUGGET
-Evolutions = GARBODOR,Level,36
+Evolution = GARBODOR,Level,36
 #-------------------------------
 [GARBODOR]
 Name = Garbodor
@@ -14890,7 +14908,7 @@ Shape = Quadruped
 Category = Tricky Fox
 Pokedex = To protect themselves from danger, they hide their true identities by transforming into people and Pokémon.
 Generation = 5
-Evolutions = ZOROARK,Level,30
+Evolution = ZOROARK,Level,30
 #-------------------------------
 [ZOROARK]
 Name = Zoroark
@@ -14940,7 +14958,7 @@ Category = Chinchilla
 Pokedex = These Pokémon prefer a tidy habitat. They are always sweeping and dusting, using their tails as brooms.
 Generation = 5
 WildItemCommon = CHESTOBERRY
-Evolutions = CINCCINO,Item,SHINYSTONE
+Evolution = CINCCINO,Item,SHINYSTONE
 #-------------------------------
 [CINCCINO]
 Name = Cinccino
@@ -14992,7 +15010,7 @@ Category = Fixation
 Pokedex = They intently observe both Trainers and Pokémon. Apparently, they are looking at something that only Gothita can see.
 Generation = 5
 WildItemCommon = PERSIMBERRY
-Evolutions = GOTHORITA,Level,32
+Evolution = GOTHORITA,Level,32
 #-------------------------------
 [GOTHORITA]
 Name = Gothorita
@@ -15018,7 +15036,7 @@ Category = Manipulate
 Pokedex = Starlight is the source of their power. At night, they mark star positions by using psychic power to float stones.
 Generation = 5
 WildItemCommon = PERSIMBERRY
-Evolutions = GOTHITELLE,Level,41
+Evolution = GOTHITELLE,Level,41
 #-------------------------------
 [GOTHITELLE]
 Name = Gothitelle
@@ -15070,7 +15088,7 @@ Category = Cell
 Pokedex = Because their bodies are enveloped in a special liquid, they can survive in any environment.
 Generation = 5
 WildItemCommon = PERSIMBERRY
-Evolutions = DUOSION,Level,32
+Evolution = DUOSION,Level,32
 #-------------------------------
 [DUOSION]
 Name = Duosion
@@ -15096,7 +15114,7 @@ Category = Mitosis
 Pokedex = When their brains, now divided in two, are thinking the same thoughts, these Pokémon exhibit their maximum power.
 Generation = 5
 WildItemCommon = PERSIMBERRY
-Evolutions = REUNICLUS,Level,41
+Evolution = REUNICLUS,Level,41
 #-------------------------------
 [REUNICLUS]
 Name = Reuniclus
@@ -15147,7 +15165,7 @@ Shape = Winged
 Category = Water Bird
 Pokedex = When attacked, it uses its feathers to splash water, escaping under cover of the spray.
 Generation = 5
-Evolutions = SWANNA,Level,35
+Evolution = SWANNA,Level,35
 #-------------------------------
 [SWANNA]
 Name = Swanna
@@ -15197,7 +15215,7 @@ Shape = HeadBase
 Category = Fresh Snow
 Pokedex = This Pokémon formed from icicles bathed in energy from the morning sun. It sleeps buried in snow.
 Generation = 5
-Evolutions = VANILLISH,Level,35
+Evolution = VANILLISH,Level,35
 #-------------------------------
 [VANILLISH]
 Name = Vanillish
@@ -15222,7 +15240,7 @@ Shape = HeadBase
 Category = Icy Snow
 Pokedex = It conceals itself from enemy eyes by creating many small ice particles and hiding among them.
 Generation = 5
-Evolutions = VANILLUXE,Level,47
+Evolution = VANILLUXE,Level,47
 #-------------------------------
 [VANILLUXE]
 Name = Vanilluxe
@@ -15273,7 +15291,7 @@ Shape = Quadruped
 Category = Season
 Pokedex = The turning of the seasons changes the color and scent of this Pokémon's fur. People use it to mark the seasons.
 Generation = 5
-Evolutions = SAWSBUCK,Level,34
+Evolution = SAWSBUCK,Level,34
 #-------------------------------
 [SAWSBUCK]
 Name = Sawsbuck
@@ -15352,7 +15370,7 @@ Shape = Bipedal
 Category = Clamping
 Pokedex = When they feel threatened, they spit an acidic liquid to drive attackers away. This Pokémon targets Shelmet.
 Generation = 5
-Evolutions = ESCAVALIER,TradeSpecies,SHELMET
+Evolution = ESCAVALIER,TradeSpecies,SHELMET
 #-------------------------------
 [ESCAVALIER]
 Name = Escavalier
@@ -15405,7 +15423,7 @@ Generation = 5
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
 WildItemRare = BALMMUSHROOM
-Evolutions = AMOONGUSS,Level,39
+Evolution = AMOONGUSS,Level,39
 #-------------------------------
 [AMOONGUSS]
 Name = Amoonguss
@@ -15458,7 +15476,7 @@ Shape = Multiped
 Category = Floating
 Pokedex = They paralyze prey with poison, then drag them down to their lairs, five miles below the surface.
 Generation = 5
-Evolutions = JELLICENT,Level,40
+Evolution = JELLICENT,Level,40
 #-------------------------------
 [JELLICENT]
 Name = Jellicent
@@ -15533,7 +15551,7 @@ Shape = Insectoid
 Category = Attaching
 Pokedex = They attach themselves to large-bodied Pokémon and absorb static electricity, which they store in an electric pouch.
 Generation = 5
-Evolutions = GALVANTULA,Level,36
+Evolution = GALVANTULA,Level,36
 #-------------------------------
 [GALVANTULA]
 Name = Galvantula
@@ -15583,7 +15601,7 @@ Category = Thorn Seed
 Pokedex = They stick their spikes into cave walls and absorb the minerals they find in the rock.
 Generation = 5
 WildItemUncommon = STICKYBARB
-Evolutions = FERROTHORN,Level,40
+Evolution = FERROTHORN,Level,40
 #-------------------------------
 [FERROTHORN]
 Name = Ferrothorn
@@ -15632,7 +15650,7 @@ Shape = MultiBody
 Category = Gear
 Pokedex = Interlocking two bodies and spinning around generates the energy they need to live.
 Generation = 5
-Evolutions = KLANG,Level,38
+Evolution = KLANG,Level,38
 #-------------------------------
 [KLANG]
 Name = Klang
@@ -15657,7 +15675,7 @@ Shape = MultiBody
 Category = Gear
 Pokedex = Spinning minigears are rotated at high speed and repeatedly fired away. It is dangerous if the gears don't return.
 Generation = 5
-Evolutions = KLINKLANG,Level,49
+Evolution = KLINKLANG,Level,49
 #-------------------------------
 [KLINKLANG]
 Name = Klinklang
@@ -15705,7 +15723,7 @@ Shape = Finned
 Category = EleFish
 Pokedex = These Pokémon move in schools. They have an electricity-generating organ, so they discharge electricity if in danger.
 Generation = 5
-Evolutions = EELEKTRIK,Level,39
+Evolution = EELEKTRIK,Level,39
 #-------------------------------
 [EELEKTRIK]
 Name = Eelektrik
@@ -15729,7 +15747,7 @@ Shape = Finned
 Category = EleFish
 Pokedex = These Pokémon have a big appetite. When they spot their prey, they attack it and paralyze it with electricity.
 Generation = 5
-Evolutions = EELEKTROSS,Item,THUNDERSTONE
+Evolution = EELEKTROSS,Item,THUNDERSTONE
 #-------------------------------
 [EELEKTROSS]
 Name = Eelektross
@@ -15778,7 +15796,7 @@ Shape = BipedalTail
 Category = Cerebral
 Pokedex = This Pokémon had never been seen until it appeared from far in the desert 50 years ago.
 Generation = 5
-Evolutions = BEHEEYEM,Level,42
+Evolution = BEHEEYEM,Level,42
 #-------------------------------
 [BEHEEYEM]
 Name = Beheeyem
@@ -15828,7 +15846,7 @@ Shape = HeadBase
 Category = Candle
 Pokedex = While shining a light and pretending to be a guide, it leeches off the life force of any who follow it.
 Generation = 5
-Evolutions = LAMPENT,Level,41
+Evolution = LAMPENT,Level,41
 #-------------------------------
 [LAMPENT]
 Name = Lampent
@@ -15853,7 +15871,7 @@ Shape = HeadArms
 Category = Lamp
 Pokedex = It arrives near the moment of death and steals spirit from the body.
 Generation = 5
-Evolutions = CHANDELURE,Item,DUSKSTONE
+Evolution = CHANDELURE,Item,DUSKSTONE
 #-------------------------------
 [CHANDELURE]
 Name = Chandelure
@@ -15903,7 +15921,7 @@ Shape = BipedalTail
 Category = Tusk
 Pokedex = They mark their territory by leaving gashes in trees with their tusks. If a tusk breaks, a new one grows in quickly.
 Generation = 5
-Evolutions = FRAXURE,Level,38
+Evolution = FRAXURE,Level,38
 #-------------------------------
 [FRAXURE]
 Name = Fraxure
@@ -15928,7 +15946,7 @@ Shape = BipedalTail
 Category = Axe Jaw
 Pokedex = Their tusks can shatter rocks. Territory battles between Fraxure can be intensely violent.
 Generation = 5
-Evolutions = HAXORUS,Level,48
+Evolution = HAXORUS,Level,48
 #-------------------------------
 [HAXORUS]
 Name = Haxorus
@@ -15979,7 +15997,7 @@ Category = Chill
 Pokedex = Its nose is always running. It sniffs the snot back up because the mucus provides the raw material for its moves.
 Generation = 5
 WildItemCommon = ASPEARBERRY
-Evolutions = BEARTIC,Level,37
+Evolution = BEARTIC,Level,37
 #-------------------------------
 [BEARTIC]
 Name = Beartic
@@ -16054,7 +16072,7 @@ Shape = Head
 Category = Snail
 Pokedex = It evolves when bathed in an electric-like energy along with Karrablast. The reason is still unknown.
 Generation = 5
-Evolutions = ACCELGOR,TradeSpecies,KARRABLAST
+Evolution = ACCELGOR,TradeSpecies,KARRABLAST
 #-------------------------------
 [ACCELGOR]
 Name = Accelgor
@@ -16130,7 +16148,7 @@ Shape = BipedalTail
 Category = Martial Arts
 Pokedex = They have mastered elegant combos. As they concentrate, their battle moves become swifter and more precise.
 Generation = 5
-Evolutions = MIENSHAO,Level,50
+Evolution = MIENSHAO,Level,50
 #-------------------------------
 [MIENSHAO]
 Name = Mienshao
@@ -16206,7 +16224,7 @@ Category = Automaton
 Pokedex = These Pokémon are thought to have been created by the science of an ancient and mysterious civilization.
 Generation = 5
 WildItemUncommon = LIGHTCLAY
-Evolutions = GOLURK,Level,43
+Evolution = GOLURK,Level,43
 #-------------------------------
 [GOLURK]
 Name = Golurk
@@ -16257,7 +16275,7 @@ Shape = Bipedal
 Category = Sharp Blade
 Pokedex = They fight at Bisharp's command. They cling to their prey and inflict damage by sinking their blades into it.
 Generation = 5
-Evolutions = BISHARP,Level,52
+Evolution = BISHARP,Level,52
 #-------------------------------
 [BISHARP]
 Name = Bisharp
@@ -16331,7 +16349,7 @@ Shape = Winged
 Category = Eaglet
 Pokedex = They will challenge anything, even strong opponents, without fear. Their frequent fights help them become stronger.
 Generation = 5
-Evolutions = BRAVIARY,Level,54
+Evolution = BRAVIARY,Level,54
 #-------------------------------
 [BRAVIARY]
 Name = Braviary
@@ -16381,7 +16399,7 @@ Shape = Winged
 Category = Diapered
 Pokedex = They tend to guard their posteriors with suitable bones they have found. They pursue weak Pokémon.
 Generation = 5
-Evolutions = MANDIBUZZ,Level,54
+Evolution = MANDIBUZZ,Level,54
 #-------------------------------
 [MANDIBUZZ]
 Name = Mandibuzz
@@ -16481,7 +16499,7 @@ Shape = Quadruped
 Category = Irate
 Pokedex = They cannot see, so they tackle and bite to learn about their surroundings. Their bodies are covered in wounds.
 Generation = 5
-Evolutions = ZWEILOUS,Level,50
+Evolution = ZWEILOUS,Level,50
 #-------------------------------
 [ZWEILOUS]
 Name = Zweilous
@@ -16505,7 +16523,7 @@ Shape = Quadruped
 Category = Hostile
 Pokedex = Since their two heads do not get along and compete with each other for food, they always eat too much.
 Generation = 5
-Evolutions = HYDREIGON,Level,64
+Evolution = HYDREIGON,Level,64
 #-------------------------------
 [HYDREIGON]
 Name = Hydreigon
@@ -16554,7 +16572,7 @@ Shape = Insectoid
 Category = Torch
 Pokedex = The base of volcanoes is where they make their homes. They shoot fire from their five horns to repel attacking enemies.
 Generation = 5
-Evolutions = VOLCARONA,Level,59
+Evolution = VOLCARONA,Level,59
 #-------------------------------
 [VOLCARONA]
 Name = Volcarona
diff --git a/PBS/Gen 5 backup/pokemon_forms.txt b/PBS/Gen 5 backup/pokemon_forms.txt
index 27a6aa6e3..397ef0314 100644
--- a/PBS/Gen 5 backup/pokemon_forms.txt	
+++ b/PBS/Gen 5 backup/pokemon_forms.txt	
@@ -3,7 +3,7 @@
 [PICHU,2]
 FormName = Spiky-Eared
 Generation = 4
-Evolutions = PIKACHU,None,
+Evolution = PIKACHU,None
 #-------------------------------
 [UNOWN,1]
 FormName = B
diff --git a/PBS/Gen 6 backup/pokemon.txt b/PBS/Gen 6 backup/pokemon.txt
index 46e723ac7..c09d8bebf 100644
--- a/PBS/Gen 6 backup/pokemon.txt	
+++ b/PBS/Gen 6 backup/pokemon.txt	
@@ -25,7 +25,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = Bulbasaur can be seen napping in bright sunlight. There is a seed on its back. By soaking up the sun's rays, the seed grows progressively larger.
 Generation = 1
-Evolutions = IVYSAUR,Level,16
+Evolution = IVYSAUR,Level,16
 #-------------------------------
 [IVYSAUR]
 Name = Ivysaur
@@ -51,7 +51,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = To support its bulb, Ivysaur's legs grow sturdy. If it spends more time lying in the sunlight, the bud will soon bloom into a large flower.
 Generation = 1
-Evolutions = VENUSAUR,Level,32
+Evolution = VENUSAUR,Level,32
 #-------------------------------
 [VENUSAUR]
 Name = Venusaur
@@ -103,7 +103,7 @@ Habitat = Mountain
 Category = Lizard
 Pokedex = The flame that burns at the tip of its tail is an indication of its emotions. The flame wavers when Charmander is happy, and blazes when it is enraged.
 Generation = 1
-Evolutions = CHARMELEON,Level,16
+Evolution = CHARMELEON,Level,16
 #-------------------------------
 [CHARMELEON]
 Name = Charmeleon
@@ -129,7 +129,7 @@ Habitat = Mountain
 Category = Flame
 Pokedex = Without pity, its sharp claws destroy foes. If it encounters a strong enemy, it becomes agitated, and the flame on its tail flares with a bluish white color.
 Generation = 1
-Evolutions = CHARIZARD,Level,36
+Evolution = CHARIZARD,Level,36
 #-------------------------------
 [CHARIZARD]
 Name = Charizard
@@ -181,7 +181,7 @@ Habitat = WatersEdge
 Category = Tiny Turtle
 Pokedex = Its shell is not just for protection. Its rounded shape and the grooves on its surface minimize resistance in water, enabling Squirtle to swim at high speeds.
 Generation = 1
-Evolutions = WARTORTLE,Level,16
+Evolution = WARTORTLE,Level,16
 #-------------------------------
 [WARTORTLE]
 Name = Wartortle
@@ -207,7 +207,7 @@ Habitat = WatersEdge
 Category = Turtle
 Pokedex = Its large tail is covered with rich, thick fur that deepens in color with age. The scratches on its shell are evidence of this Pokémon's toughness in battle.
 Generation = 1
-Evolutions = BLASTOISE,Level,36
+Evolution = BLASTOISE,Level,36
 #-------------------------------
 [BLASTOISE]
 Name = Blastoise
@@ -258,7 +258,7 @@ Habitat = Forest
 Category = Worm
 Pokedex = Its voracious appetite compels it to devour leaves bigger than itself without hesitation. It releases a terribly strong odor from its antennae.
 Generation = 1
-Evolutions = METAPOD,Level,7
+Evolution = METAPOD,Level,7
 #-------------------------------
 [METAPOD]
 Name = Metapod
@@ -283,7 +283,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = Its shell is as hard as an iron slab. A Metapod does not move very much because it is preparing its soft innards for evolution inside the shell.
 Generation = 1
-Evolutions = BUTTERFREE,Level,10
+Evolution = BUTTERFREE,Level,10
 #-------------------------------
 [BUTTERFREE]
 Name = Butterfree
@@ -335,7 +335,7 @@ Habitat = Forest
 Category = Hairy Bug
 Pokedex = A Weedle has an extremely acute sense of smell. It distinguishes its favorite kinds of leaves from those it dislikes by sniffing with its big red proboscis (nose).
 Generation = 1
-Evolutions = KAKUNA,Level,7
+Evolution = KAKUNA,Level,7
 #-------------------------------
 [KAKUNA]
 Name = Kakuna
@@ -360,7 +360,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = It remains virtually immobile while it clings to a tree. However, on the inside, it busily prepares for evolution. This is evident from how hot its shell becomes.
 Generation = 1
-Evolutions = BEEDRILL,Level,10
+Evolution = BEEDRILL,Level,10
 #-------------------------------
 [BEEDRILL]
 Name = Beedrill
@@ -413,7 +413,7 @@ Habitat = Forest
 Category = Tiny Bird
 Pokedex = It has an extremely sharp sense of direction. It can unerringly return home to its nest, however far it may be removed from its familiar surroundings.
 Generation = 1
-Evolutions = PIDGEOTTO,Level,18
+Evolution = PIDGEOTTO,Level,18
 #-------------------------------
 [PIDGEOTTO]
 Name = Pidgeotto
@@ -439,7 +439,7 @@ Habitat = Forest
 Category = Bird
 Pokedex = This Pokémon flies around, patrolling its large territory. If its living space is violated, it shows no mercy in thoroughly punishing the foe with its sharp claws.
 Generation = 1
-Evolutions = PIDGEOT,Level,36
+Evolution = PIDGEOT,Level,36
 #-------------------------------
 [PIDGEOT]
 Name = Pidgeot
@@ -492,7 +492,7 @@ Category = Mouse
 Pokedex = A Rattata is cautious in the extreme. Even while it is asleep, it constantly moves its ears and listens for danger. It will make its nest anywhere.
 Generation = 1
 WildItemUncommon = CHILANBERRY
-Evolutions = RATICATE,Level,20
+Evolution = RATICATE,Level,20
 #-------------------------------
 [RATICATE]
 Name = Raticate
@@ -545,7 +545,7 @@ Habitat = RoughTerrain
 Category = Tiny Bird
 Pokedex = Its loud cry can be heard over half a mile away. If its high, keening cry is heard echoing all around, it is a sign that they are warning each other of danger.
 Generation = 1
-Evolutions = FEAROW,Level,20
+Evolution = FEAROW,Level,20
 #-------------------------------
 [FEAROW]
 Name = Fearow
@@ -598,7 +598,7 @@ Habitat = Grassland
 Category = Snake
 Pokedex = An Ekans curls itself up in a spiral while it rests. This position allows it to quickly respond to an enemy from any direction with a threat from its upraised head.
 Generation = 1
-Evolutions = ARBOK,Level,22
+Evolution = ARBOK,Level,22
 #-------------------------------
 [ARBOK]
 Name = Arbok
@@ -650,7 +650,7 @@ Category = Mouse
 Pokedex = It stores electricity in the electric sacs on its cheeks. When it releases pent-up energy in a burst, the electric power is equal to a lightning bolt.
 Generation = 1
 WildItemUncommon = LIGHTBALL
-Evolutions = RAICHU,Item,THUNDERSTONE
+Evolution = RAICHU,Item,THUNDERSTONE
 #-------------------------------
 [RAICHU]
 Name = Raichu
@@ -703,7 +703,7 @@ Category = Mouse
 Pokedex = When it curls up in a ball, it can make any attack bounce off harmlessly. Its hide has turned tough and solid as a result of living in the desert.
 Generation = 1
 WildItemUncommon = GRIPCLAW
-Evolutions = SANDSLASH,Level,22
+Evolution = SANDSLASH,Level,22
 #-------------------------------
 [SANDSLASH]
 Name = Sandslash
@@ -757,7 +757,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = Its highly toxic barbs are thought to have developed as protection for this small-bodied Pokémon. When enraged, it releases a horrible toxin from its horn.
 Generation = 1
-Evolutions = NIDORINA,Level,16
+Evolution = NIDORINA,Level,16
 #-------------------------------
 [NIDORINA]
 Name = Nidorina
@@ -783,7 +783,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = When it is with its friends or family, its barbs are tucked away to prevent injury. It appears to become nervous if separated from the others.
 Generation = 1
-Evolutions = NIDOQUEEN,Item,MOONSTONE
+Evolution = NIDOQUEEN,Item,MOONSTONE
 #-------------------------------
 [NIDOQUEEN]
 Name = Nidoqueen
@@ -836,7 +836,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = The male Nidoran has developed muscles that freely move its ears in any direction. Even the slightest sound does not escape this Pokémon's notice.
 Generation = 1
-Evolutions = NIDORINO,Level,16
+Evolution = NIDORINO,Level,16
 #-------------------------------
 [NIDORINO]
 Name = Nidorino
@@ -862,7 +862,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = Its horn is harder than a diamond. If it senses a hostile presence, all the barbs on its back bristle up at once, and it challenges the foe with all its might.
 Generation = 1
-Evolutions = NIDOKING,Item,MOONSTONE
+Evolution = NIDOKING,Item,MOONSTONE
 #-------------------------------
 [NIDOKING]
 Name = Nidoking
@@ -914,7 +914,7 @@ Category = Fairy
 Pokedex = On every night of a full moon, they come out to play. When dawn arrives, the tired Clefairy go to sleep nestled up against each other in deep and quiet mountains.
 Generation = 1
 WildItemUncommon = MOONSTONE
-Evolutions = CLEFABLE,Item,MOONSTONE
+Evolution = CLEFABLE,Item,MOONSTONE
 #-------------------------------
 [CLEFABLE]
 Name = Clefable
@@ -968,7 +968,7 @@ Category = Fox
 Pokedex = It can freely control fire, making fiery orbs fly like will-o'-the-wisps. Just before evolution, its six tails grow hot as if on fire.
 Generation = 1
 WildItemUncommon = CHARCOAL
-Evolutions = NINETALES,Item,FIRESTONE
+Evolution = NINETALES,Item,FIRESTONE
 #-------------------------------
 [NINETALES]
 Name = Ninetales
@@ -1020,7 +1020,7 @@ Habitat = Grassland
 Category = Balloon
 Pokedex = Nothing can avoid falling asleep hearing a Jigglypuff's song. The sound waves of its singing voice match the brain waves of someone in a deep sleep.
 Generation = 1
-Evolutions = WIGGLYTUFF,Item,MOONSTONE
+Evolution = WIGGLYTUFF,Item,MOONSTONE
 #-------------------------------
 [WIGGLYTUFF]
 Name = Wigglytuff
@@ -1072,7 +1072,7 @@ Habitat = Cave
 Category = Bat
 Pokedex = While living in pitch-black caverns, their eyes gradually grew shut and deprived them of vision. They use ultrasonic waves to detect obstacles.
 Generation = 1
-Evolutions = GOLBAT,Level,22
+Evolution = GOLBAT,Level,22
 #-------------------------------
 [GOLBAT]
 Name = Golbat
@@ -1098,7 +1098,7 @@ Habitat = Cave
 Category = Bat
 Pokedex = Its fangs easily puncture even thick animal hide. It loves to feast on the blood of people and Pokémon. It flits about in darkness and strikes from behind.
 Generation = 1
-Evolutions = CROBAT,Happiness,
+Evolution = CROBAT,Happiness
 #-------------------------------
 [ODDISH]
 Name = Oddish
@@ -1126,7 +1126,7 @@ Category = Weed
 Pokedex = It grows by absorbing moonlight. During the daytime, it buries itself in the ground, leaving only its leaves exposed to avoid detection by its enemies.
 Generation = 1
 WildItemUncommon = ABSORBBULB
-Evolutions = GLOOM,Level,21
+Evolution = GLOOM,Level,21
 #-------------------------------
 [GLOOM]
 Name = Gloom
@@ -1153,7 +1153,8 @@ Category = Weed
 Pokedex = A horribly noxious honey drools from its mouth. One whiff of the honey can result in memory loss. Some fans are said to enjoy this overwhelming stink, however.
 Generation = 1
 WildItemUncommon = ABSORBBULB
-Evolutions = VILEPLUME,Item,LEAFSTONE,BELLOSSOM,Item,SUNSTONE
+Evolution = VILEPLUME,Item,LEAFSTONE
+Evolution = BELLOSSOM,Item,SUNSTONE
 #-------------------------------
 [VILEPLUME]
 Name = Vileplume
@@ -1208,7 +1209,7 @@ Pokedex = A Paras has parasitic tochukaso mushrooms growing on its back. They gr
 Generation = 1
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = PARASECT,Level,24
+Evolution = PARASECT,Level,24
 #-------------------------------
 [PARASECT]
 Name = Parasect
@@ -1262,7 +1263,7 @@ Habitat = Forest
 Category = Insect
 Pokedex = Its coat of thin, stiff hair that covers its entire body is said to have evolved for protection. Its large eyes never fail to spot even miniscule prey.
 Generation = 1
-Evolutions = VENOMOTH,Level,31
+Evolution = VENOMOTH,Level,31
 #-------------------------------
 [VENOMOTH]
 Name = Venomoth
@@ -1316,7 +1317,7 @@ Category = Mole
 Pokedex = Diglett are raised in most farms. The reason is simple--wherever they burrow, the soil is left perfectly tilled for growing delicious crops.
 Generation = 1
 WildItemUncommon = SOFTSAND
-Evolutions = DUGTRIO,Level,26
+Evolution = DUGTRIO,Level,26
 #-------------------------------
 [DUGTRIO]
 Name = Dugtrio
@@ -1370,7 +1371,7 @@ Category = Scratch Cat
 Pokedex = Meowth withdraw their sharp claws into their paws to silently sneak about. For some reason, this Pokémon loves shiny coins that glitter with light.
 Generation = 1
 WildItemUncommon = QUICKCLAW
-Evolutions = PERSIAN,Level,28
+Evolution = PERSIAN,Level,28
 #-------------------------------
 [PERSIAN]
 Name = Persian
@@ -1423,7 +1424,7 @@ Habitat = WatersEdge
 Category = Duck
 Pokedex = When its headache intensifies, it starts using strange powers. However, it has no recollection of its powers, so it always looks befuddled and bewildered.
 Generation = 1
-Evolutions = GOLDUCK,Level,33
+Evolution = GOLDUCK,Level,33
 #-------------------------------
 [GOLDUCK]
 Name = Golduck
@@ -1475,7 +1476,7 @@ Habitat = Mountain
 Category = Pig Monkey
 Pokedex = When it starts shaking and its nasal breathing turns rough, it's a sure sign of anger. However, since this happens instantly, there is no time to flee.
 Generation = 1
-Evolutions = PRIMEAPE,Level,28
+Evolution = PRIMEAPE,Level,28
 #-------------------------------
 [PRIMEAPE]
 Name = Primeape
@@ -1527,7 +1528,7 @@ Habitat = Grassland
 Category = Puppy
 Pokedex = Its superb sense of smell ensures that this Pokémon won't forget any scent, no matter what. It uses its sense of smell to detect the emotions of others.
 Generation = 1
-Evolutions = ARCANINE,Item,FIRESTONE
+Evolution = ARCANINE,Item,FIRESTONE
 #-------------------------------
 [ARCANINE]
 Name = Arcanine
@@ -1579,7 +1580,7 @@ Habitat = WatersEdge
 Category = Tadpole
 Pokedex = It is possible to see this Pokémon's spiral innards right through its thin skin. However, the skin is also very flexible. Even sharp fangs bounce right off it.
 Generation = 1
-Evolutions = POLIWHIRL,Level,25
+Evolution = POLIWHIRL,Level,25
 #-------------------------------
 [POLIWHIRL]
 Name = Poliwhirl
@@ -1606,7 +1607,8 @@ Category = Tadpole
 Pokedex = Its body surface is always wet and slick with an oily fluid. Because of this greasy covering, it can easily slip and slide out of the clutches of any enemy in battle.
 Generation = 1
 WildItemUncommon = KINGSROCK
-Evolutions = POLIWRATH,Item,WATERSTONE,POLITOED,TradeItem,KINGSROCK
+Evolution = POLIWRATH,Item,WATERSTONE
+Evolution = POLITOED,TradeItem,KINGSROCK
 #-------------------------------
 [POLIWRATH]
 Name = Poliwrath
@@ -1660,7 +1662,7 @@ Category = Psi
 Pokedex = A Pokémon that sleeps 18 hours a day. Observation revealed that it uses Teleport to change its location once every hour.
 Generation = 1
 WildItemUncommon = TWISTEDSPOON
-Evolutions = KADABRA,Level,16
+Evolution = KADABRA,Level,16
 #-------------------------------
 [KADABRA]
 Name = Kadabra
@@ -1687,7 +1689,7 @@ Category = Psi
 Pokedex = It is rumored that a boy with psychic abilities suddenly transformed into Kadabra while he was assisting research into extrasensory powers.
 Generation = 1
 WildItemUncommon = TWISTEDSPOON
-Evolutions = ALAKAZAM,Trade,
+Evolution = ALAKAZAM,Trade
 #-------------------------------
 [ALAKAZAM]
 Name = Alakazam
@@ -1741,7 +1743,7 @@ Category = Superpower
 Pokedex = It continually undertakes strenuous training to master all forms of martial arts. Its strength lets it easily hoist a sumo wrestler onto its shoulders.
 Generation = 1
 WildItemUncommon = FOCUSBAND
-Evolutions = MACHOKE,Level,28
+Evolution = MACHOKE,Level,28
 #-------------------------------
 [MACHOKE]
 Name = Machoke
@@ -1768,7 +1770,7 @@ Category = Superpower
 Pokedex = A belt is worn by a Machoke to keep its overwhelming power under control. Because it is so dangerous, no one has ever removed the belt.
 Generation = 1
 WildItemUncommon = FOCUSBAND
-Evolutions = MACHAMP,Trade,
+Evolution = MACHAMP,Trade
 #-------------------------------
 [MACHAMP]
 Name = Machamp
@@ -1821,7 +1823,7 @@ Habitat = Forest
 Category = Flower
 Pokedex = A Bellsprout's thin and flexible body lets it bend and sway to avoid any attack, however strong it may be. From its mouth, it leaks a fluid that melts even iron.
 Generation = 1
-Evolutions = WEEPINBELL,Level,21
+Evolution = WEEPINBELL,Level,21
 #-------------------------------
 [WEEPINBELL]
 Name = Weepinbell
@@ -1847,7 +1849,7 @@ Habitat = Forest
 Category = Flycatcher
 Pokedex = At night, a Weepinbell hangs on to a tree branch with its hooked rear and sleeps. If it moves around in its sleep, it may wake up to find itself on the ground.
 Generation = 1
-Evolutions = VICTREEBEL,Item,LEAFSTONE
+Evolution = VICTREEBEL,Item,LEAFSTONE
 #-------------------------------
 [VICTREEBEL]
 Name = Victreebel
@@ -1900,7 +1902,7 @@ Category = Jellyfish
 Pokedex = Its body is almost entirely composed of water. It ensnares its foe with its two long tentacles, then stabs with the poison stingers at their tips.
 Generation = 1
 WildItemUncommon = POISONBARB
-Evolutions = TENTACRUEL,Level,30
+Evolution = TENTACRUEL,Level,30
 #-------------------------------
 [TENTACRUEL]
 Name = Tentacruel
@@ -1954,7 +1956,7 @@ Category = Rock
 Pokedex = It climbs mountain paths using only the power of its arms. Because they look just like boulders lining paths, hikers may step on them without noticing.
 Generation = 1
 WildItemUncommon = EVERSTONE
-Evolutions = GRAVELER,Level,25
+Evolution = GRAVELER,Level,25
 #-------------------------------
 [GRAVELER]
 Name = Graveler
@@ -1981,7 +1983,7 @@ Category = Rock
 Pokedex = They descend from mountains by tumbling down steep slopes. They are so brutal, they smash aside obstructing trees and huge boulders with thunderous tackles.
 Generation = 1
 WildItemUncommon = EVERSTONE
-Evolutions = GOLEM,Trade,
+Evolution = GOLEM,Trade
 #-------------------------------
 [GOLEM]
 Name = Golem
@@ -2034,7 +2036,7 @@ Habitat = Grassland
 Category = Fire Horse
 Pokedex = A Ponyta is very weak at birth. It can barely stand up. Its legs become stronger as it stumbles and falls while trying to keep up with its parent.
 Generation = 1
-Evolutions = RAPIDASH,Level,40
+Evolution = RAPIDASH,Level,40
 #-------------------------------
 [RAPIDASH]
 Name = Rapidash
@@ -2087,7 +2089,8 @@ Category = Dopey
 Pokedex = It catches prey by dipping its tail in water at the side of a river. But it often forgets what it is doing and spends whole days just loafing at the water's edge.
 Generation = 1
 WildItemUncommon = LAGGINGTAIL
-Evolutions = SLOWBRO,Level,37,SLOWKING,TradeItem,KINGSROCK
+Evolution = SLOWBRO,Level,37
+Evolution = SLOWKING,TradeItem,KINGSROCK
 #-------------------------------
 [SLOWBRO]
 Name = Slowbro
@@ -2140,7 +2143,7 @@ Category = Magnet
 Pokedex = The units at its sides are extremely powerful magnets. They generate enough magnetism to draw in iron objects from over 300 feet away.
 Generation = 1
 WildItemUncommon = METALCOAT
-Evolutions = MAGNETON,Level,30
+Evolution = MAGNETON,Level,30
 #-------------------------------
 [MAGNETON]
 Name = Magneton
@@ -2167,7 +2170,7 @@ Category = Magnet
 Pokedex = It is actually three Magnemite linked by magnetism. It generates powerful radio waves that raise temperatures by 3.6 degrees F within a 3,300-foot radius.
 Generation = 1
 WildItemUncommon = METALCOAT
-Evolutions = MAGNEZONE,LocationFlag,Magnetic
+Evolution = MAGNEZONE,LocationFlag,Magnetic
 #-------------------------------
 [FARFETCHD]
 Name = Farfetch'd
@@ -2222,7 +2225,7 @@ Category = Twin Bird
 Pokedex = Even while eating or sleeping, one of the heads remains always vigilant for any sign of danger. When threatened, it flees at over 60 miles per hour.
 Generation = 1
 WildItemUncommon = SHARPBEAK
-Evolutions = DODRIO,Level,31
+Evolution = DODRIO,Level,31
 #-------------------------------
 [DODRIO]
 Name = Dodrio
@@ -2275,7 +2278,7 @@ Habitat = Sea
 Category = Sea Lion
 Pokedex = Seel hunt for prey in frigid, ice-covered seas. When it needs to breathe, it punches a hole through the ice with the sharply protruding section of its head.
 Generation = 1
-Evolutions = DEWGONG,Level,34
+Evolution = DEWGONG,Level,34
 #-------------------------------
 [DEWGONG]
 Name = Dewgong
@@ -2328,7 +2331,7 @@ Category = Sludge
 Pokedex = Born from polluted sludge in the sea, Grimer's favorite food is anything filthy. They feed on wastewater pumped out from factories.
 Generation = 1
 WildItemUncommon = BLACKSLUDGE
-Evolutions = MUK,Level,38
+Evolution = MUK,Level,38
 #-------------------------------
 [MUK]
 Name = Muk
@@ -2383,7 +2386,7 @@ Pokedex = At night, it burrows a hole in the seafloor with its broad tongue to m
 Generation = 1
 WildItemCommon = PEARL
 WildItemUncommon = BIGPEARL
-Evolutions = CLOYSTER,Item,WATERSTONE
+Evolution = CLOYSTER,Item,WATERSTONE
 #-------------------------------
 [CLOYSTER]
 Name = Cloyster
@@ -2436,7 +2439,7 @@ Habitat = Cave
 Category = Gas
 Pokedex = When exposed to a strong wind, a Gastly's gaseous body quickly dwindles away. They cluster under the eaves of houses to escape the ravages of wind.
 Generation = 1
-Evolutions = HAUNTER,Level,25
+Evolution = HAUNTER,Level,25
 #-------------------------------
 [HAUNTER]
 Name = Haunter
@@ -2461,7 +2464,7 @@ Habitat = Cave
 Category = Gas
 Pokedex = If a Haunter beckons you while it is floating in darkness, don't approach it. This Pokémon will try to lick you with its tongue and steal your life away.
 Generation = 1
-Evolutions = GENGAR,Trade,
+Evolution = GENGAR,Trade
 #-------------------------------
 [GENGAR]
 Name = Gengar
@@ -2512,7 +2515,7 @@ Habitat = Cave
 Category = Rock Snake
 Pokedex = There is a magnet in its brain that prevents an Onix from losing direction while tunneling. As it grows older, its body becomes steadily rounder and smoother.
 Generation = 1
-Evolutions = STEELIX,TradeItem,METALCOAT
+Evolution = STEELIX,TradeItem,METALCOAT
 #-------------------------------
 [DROWZEE]
 Name = Drowzee
@@ -2539,7 +2542,7 @@ Habitat = Grassland
 Category = Hypnosis
 Pokedex = If your nose becomes itchy while you are sleeping, it's a sure sign that a Drowzee is standing above your pillow and trying to eat your dream through your nostrils.
 Generation = 1
-Evolutions = HYPNO,Level,26
+Evolution = HYPNO,Level,26
 #-------------------------------
 [HYPNO]
 Name = Hypno
@@ -2591,7 +2594,7 @@ Habitat = WatersEdge
 Category = River Crab
 Pokedex = Krabby live in holes dug into beaches. On sandy shores with little in the way of food, they can be seen squabbling with each other over territory.
 Generation = 1
-Evolutions = KINGLER,Level,28
+Evolution = KINGLER,Level,28
 #-------------------------------
 [KINGLER]
 Name = Kingler
@@ -2642,7 +2645,7 @@ Habitat = Urban
 Category = Ball
 Pokedex = It bears an uncanny and unexplained resemblance to a Poké Ball. Because it explodes at the slightest shock, even veteran trainers treat it with caution.
 Generation = 1
-Evolutions = ELECTRODE,Level,30
+Evolution = ELECTRODE,Level,30
 #-------------------------------
 [ELECTRODE]
 Name = Electrode
@@ -2694,7 +2697,7 @@ Habitat = Forest
 Category = Egg
 Pokedex = It consists of six eggs that care for each other. The eggs attract each other and spin around. When cracks increasingly appear, it is close to evolution.
 Generation = 1
-Evolutions = EXEGGUTOR,Item,LEAFSTONE
+Evolution = EXEGGUTOR,Item,LEAFSTONE
 #-------------------------------
 [EXEGGUTOR]
 Name = Exeggutor
@@ -2747,7 +2750,7 @@ Category = Lonely
 Pokedex = It pines for the mother it will never see again. Seeing a likeness of its mother in the full moon, it cries. The stains on the skull it wears are from its tears.
 Generation = 1
 WildItemUncommon = THICKCLUB
-Evolutions = MAROWAK,Level,28
+Evolution = MAROWAK,Level,28
 #-------------------------------
 [MAROWAK]
 Name = Marowak
@@ -2851,7 +2854,7 @@ Category = Licking
 Pokedex = Whenever it sees something unfamiliar, it always licks the object because it memorizes things by texture and taste. It is somewhat put off by sour things.
 Generation = 1
 WildItemUncommon = LAGGINGTAIL
-Evolutions = LICKILICKY,HasMove,ROLLOUT
+Evolution = LICKILICKY,HasMove,ROLLOUT
 #-------------------------------
 [KOFFING]
 Name = Koffing
@@ -2878,7 +2881,7 @@ Category = Poison Gas
 Pokedex = Getting up close to a Koffing will give you a chance to observe, through its thin skin, the toxic gases swirling inside. It blows up at the slightest stimulation.
 Generation = 1
 WildItemUncommon = SMOKEBALL
-Evolutions = WEEZING,Level,35
+Evolution = WEEZING,Level,35
 #-------------------------------
 [WEEZING]
 Name = Weezing
@@ -2930,7 +2933,7 @@ Habitat = RoughTerrain
 Category = Spikes
 Pokedex = Once it starts running, it doesn't stop. Its tiny brain makes it so stupid that it can't remember why it started running in the first place.
 Generation = 1
-Evolutions = RHYDON,Level,42
+Evolution = RHYDON,Level,42
 #-------------------------------
 [RHYDON]
 Name = Rhydon
@@ -2956,7 +2959,7 @@ Habitat = RoughTerrain
 Category = Drill
 Pokedex = Its horn, which rotates like a drill, destroys tall buildings with one strike. It stands on its hind legs, and its brain is well developed.
 Generation = 1
-Evolutions = RHYPERIOR,TradeItem,PROTECTOR
+Evolution = RHYPERIOR,TradeItem,PROTECTOR
 #-------------------------------
 [CHANSEY]
 Name = Chansey
@@ -2985,7 +2988,7 @@ Pokedex = Chansey lay nutritionally excellent eggs every day. The eggs are so de
 Generation = 1
 WildItemCommon = LUCKYPUNCH
 WildItemUncommon = LUCKYEGG
-Evolutions = BLISSEY,Happiness,
+Evolution = BLISSEY,Happiness
 #-------------------------------
 [TANGELA]
 Name = Tangela
@@ -3012,7 +3015,7 @@ Habitat = Grassland
 Category = Vine
 Pokedex = Its vines snap off easily and painlessly if they are grabbed, allowing it to make a quick getaway. The lost vines are replaced by new growth the very next day.
 Generation = 1
-Evolutions = TANGROWTH,HasMove,ANCIENTPOWER
+Evolution = TANGROWTH,HasMove,ANCIENTPOWER
 #-------------------------------
 [KANGASKHAN]
 Name = Kangaskhan
@@ -3066,7 +3069,7 @@ Category = Dragon
 Pokedex = By cleverly flicking the fins on its back side to side, it moves in any direction while facing forward. It spits ink to escape if it senses danger.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = SEADRA,Level,32
+Evolution = SEADRA,Level,32
 #-------------------------------
 [SEADRA]
 Name = Seadra
@@ -3093,7 +3096,7 @@ Category = Dragon
 Pokedex = The poisonous barbs all over its body are highly valued as ingredients for making traditional herbal medicine. It shows no mercy to anything approaching its nest.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = KINGDRA,TradeItem,DRAGONSCALE
+Evolution = KINGDRA,TradeItem,DRAGONSCALE
 #-------------------------------
 [GOLDEEN]
 Name = Goldeen
@@ -3121,7 +3124,7 @@ Category = Goldfish
 Pokedex = In the springtime, schools of Goldeen can be seen swimming up falls and rivers. It metes out staggering damage with its single horn.
 Generation = 1
 WildItemUncommon = MYSTICWATER
-Evolutions = SEAKING,Level,33
+Evolution = SEAKING,Level,33
 #-------------------------------
 [SEAKING]
 Name = Seaking
@@ -3175,7 +3178,7 @@ Pokedex = It gathers with others in the night and makes its red core glow on and
 Generation = 1
 WildItemCommon = STARDUST
 WildItemUncommon = STARPIECE
-Evolutions = STARMIE,Item,WATERSTONE
+Evolution = STARMIE,Item,WATERSTONE
 #-------------------------------
 [STARMIE]
 Name = Starmie
@@ -3255,7 +3258,7 @@ Habitat = Grassland
 Category = Mantis
 Pokedex = Its blindingly fast speed adds to the sharpness of its twin forearm scythes. The scythes can slice through thick logs in one wicked stroke.
 Generation = 1
-Evolutions = SCIZOR,TradeItem,METALCOAT
+Evolution = SCIZOR,TradeItem,METALCOAT
 #-------------------------------
 [JYNX]
 Name = Jynx
@@ -3307,7 +3310,7 @@ Category = Electric
 Pokedex = When a storm approaches, it competes with others to scale heights that are likely to be stricken by lightning. Some towns use Electabuzz as lightning rods.
 Generation = 1
 WildItemUncommon = ELECTIRIZER
-Evolutions = ELECTIVIRE,TradeItem,ELECTIRIZER
+Evolution = ELECTIVIRE,TradeItem,ELECTIRIZER
 #-------------------------------
 [MAGMAR]
 Name = Magmar
@@ -3334,7 +3337,7 @@ Category = Spitfire
 Pokedex = In battle, it blows out intense flames from all over its body to intimidate its foe. These fiery bursts create heat waves that ignite grass and trees.
 Generation = 1
 WildItemUncommon = MAGMARIZER
-Evolutions = MAGMORTAR,TradeItem,MAGMARIZER
+Evolution = MAGMORTAR,TradeItem,MAGMARIZER
 #-------------------------------
 [PINSIR]
 Name = Pinsir
@@ -3411,7 +3414,7 @@ Habitat = WatersEdge
 Category = Fish
 Pokedex = Its swimming muscles are weak, so it is easily washed away by currents. In places where water pools, you can see many Magikarp deposited there by the flow.
 Generation = 1
-Evolutions = GYARADOS,Level,20
+Evolution = GYARADOS,Level,20
 #-------------------------------
 [GYARADOS]
 Name = Gyarados
@@ -3518,7 +3521,14 @@ Habitat = Urban
 Category = Evolution
 Pokedex = An Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokémon to evolve.
 Generation = 1
-Evolutions = VAPOREON,Item,WATERSTONE,JOLTEON,Item,THUNDERSTONE,FLAREON,Item,FIRESTONE,LEAFEON,LocationFlag,MossRock,GLACEON,LocationFlag,IceRock,SYLVEON,HappinessMoveType,FAIRY,ESPEON,HappinessDay,,UMBREON,HappinessNight,
+Evolution = VAPOREON,Item,WATERSTONE
+Evolution = JOLTEON,Item,THUNDERSTONE
+Evolution = FLAREON,Item,FIRESTONE
+Evolution = LEAFEON,LocationFlag,MossRock
+Evolution = GLACEON,LocationFlag,IceRock
+Evolution = SYLVEON,HappinessMoveType,FAIRY
+Evolution = ESPEON,HappinessDay
+Evolution = UMBREON,HappinessNight
 #-------------------------------
 [VAPOREON]
 Name = Vaporeon
@@ -3619,7 +3629,7 @@ Habitat = Urban
 Category = Virtual
 Pokedex = It is capable of reverting itself entirely back to program data in order to enter cyberspace. A Porygon is copy-protected so it cannot be duplicated.
 Generation = 1
-Evolutions = PORYGON2,TradeItem,UPGRADE
+Evolution = PORYGON2,TradeItem,UPGRADE
 #-------------------------------
 [OMANYTE]
 Name = Omanyte
@@ -3646,7 +3656,7 @@ Habitat = Sea
 Category = Spiral
 Pokedex = One of the ancient and long-since-extinct Pokémon that have been regenerated from fossils by humans. If attacked, it withdraws into its hard shell.
 Generation = 1
-Evolutions = OMASTAR,Level,40
+Evolution = OMASTAR,Level,40
 #-------------------------------
 [OMASTAR]
 Name = Omastar
@@ -3698,7 +3708,7 @@ Habitat = Sea
 Category = Shellfish
 Pokedex = This Pokémon has been regenerated from a fossil. However, in rare cases, living examples have been discovered. Kabuto have not changed for 300 million years.
 Generation = 1
-Evolutions = KABUTOPS,Level,40
+Evolution = KABUTOPS,Level,40
 #-------------------------------
 [KABUTOPS]
 Name = Kabutops
@@ -3884,7 +3894,7 @@ Category = Dragon
 Pokedex = A Dratini continually molts and sloughs off its old skin. It does so because the life energy within its body steadily builds to reach uncontrollable levels.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = DRAGONAIR,Level,30
+Evolution = DRAGONAIR,Level,30
 #-------------------------------
 [DRAGONAIR]
 Name = Dragonair
@@ -3911,7 +3921,7 @@ Category = Dragon
 Pokedex = A Dragonair stores an enormous amount of energy inside its body. It is said to alter the weather around it by loosing energy from the crystals on its neck and tail.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = DRAGONITE,Level,55
+Evolution = DRAGONITE,Level,55
 #-------------------------------
 [DRAGONITE]
 Name = Dragonite
@@ -4018,7 +4028,7 @@ Habitat = Grassland
 Category = Leaf
 Pokedex = It waves its leaf around to keep foes at bay. However, a sweet fragrance also wafts from the leaf, creating a friendly atmosphere that becalms the battlers.
 Generation = 2
-Evolutions = BAYLEEF,Level,16
+Evolution = BAYLEEF,Level,16
 #-------------------------------
 [BAYLEEF]
 Name = Bayleef
@@ -4044,7 +4054,7 @@ Habitat = Grassland
 Category = Leaf
 Pokedex = A Bayleef's neck is ringed by curled-up leaves. Inside each leaf is a small tree shoot. The fragrance of this shoot makes people peppy.
 Generation = 2
-Evolutions = MEGANIUM,Level,32
+Evolution = MEGANIUM,Level,32
 #-------------------------------
 [MEGANIUM]
 Name = Meganium
@@ -4096,7 +4106,7 @@ Habitat = Grassland
 Category = Fire Mouse
 Pokedex = It flares flames from its back to protect itself. The fire burns vigorously if the Pokémon is angry. When it is tired, it sputters with incomplete combustion.
 Generation = 2
-Evolutions = QUILAVA,Level,14
+Evolution = QUILAVA,Level,14
 #-------------------------------
 [QUILAVA]
 Name = Quilava
@@ -4122,7 +4132,7 @@ Habitat = Grassland
 Category = Volcano
 Pokedex = It intimidates foes with intense gusts of flames and superheated air. Its quick nimbleness lets it dodge attacks even while scorching an enemy.
 Generation = 2
-Evolutions = TYPHLOSION,Level,36
+Evolution = TYPHLOSION,Level,36
 #-------------------------------
 [TYPHLOSION]
 Name = Typhlosion
@@ -4174,7 +4184,7 @@ Habitat = WatersEdge
 Category = Big Jaw
 Pokedex = Despite its small body, Totodile's jaws are very powerful. While it may think it is just playfully nipping, its bite has enough strength to cause serious injury.
 Generation = 2
-Evolutions = CROCONAW,Level,18
+Evolution = CROCONAW,Level,18
 #-------------------------------
 [CROCONAW]
 Name = Croconaw
@@ -4200,7 +4210,7 @@ Habitat = WatersEdge
 Category = Big Jaw
 Pokedex = Once its jaws clamp down on its foe, it will absolutely not let go. Because the tips of its fangs are forked back like fishhooks, they become irremovably embedded.
 Generation = 2
-Evolutions = FERALIGATR,Level,30
+Evolution = FERALIGATR,Level,30
 #-------------------------------
 [FERALIGATR]
 Name = Feraligatr
@@ -4252,7 +4262,7 @@ Habitat = Grassland
 Category = Scout
 Pokedex = They take turns standing guard when it is time to sleep. The sentry awakens the others if it senses danger. If one gets separated, it turns sleepless with fear.
 Generation = 2
-Evolutions = FURRET,Level,15
+Evolution = FURRET,Level,15
 #-------------------------------
 [FURRET]
 Name = Furret
@@ -4304,7 +4314,7 @@ Habitat = Forest
 Category = Owl
 Pokedex = It has an internal organ that senses the earth's rotation. Using this special organ, a Hoothoot begins hooting at precisely the same time every day.
 Generation = 2
-Evolutions = NOCTOWL,Level,20
+Evolution = NOCTOWL,Level,20
 #-------------------------------
 [NOCTOWL]
 Name = Noctowl
@@ -4356,7 +4366,7 @@ Habitat = Forest
 Category = Five Star
 Pokedex = Ledyba communicate using a fluid that they secrete from where the legs join the body. They are said to convey feelings to others by altering the fluid's scent.
 Generation = 2
-Evolutions = LEDIAN,Level,18
+Evolution = LEDIAN,Level,18
 #-------------------------------
 [LEDIAN]
 Name = Ledian
@@ -4408,7 +4418,7 @@ Habitat = Forest
 Category = String Spit
 Pokedex = The web it spins can be considered its second nervous system. It is said that a Spinarak determines its prey by the tiny vibrations it feels through the web.
 Generation = 2
-Evolutions = ARIADOS,Level,22
+Evolution = ARIADOS,Level,22
 #-------------------------------
 [ARIADOS]
 Name = Ariados
@@ -4486,7 +4496,7 @@ Category = Angler
 Pokedex = When it senses danger, it discharges positive and negative electricity from its two antennae. It lives in depths beyond sunlight's reach.
 Generation = 2
 WildItemUncommon = DEEPSEASCALE
-Evolutions = LANTURN,Level,27
+Evolution = LANTURN,Level,27
 #-------------------------------
 [LANTURN]
 Name = Lanturn
@@ -4539,7 +4549,7 @@ Habitat = Forest
 Category = Tiny Mouse
 Pokedex = It is still inept at retaining electricity. When it is startled, it discharges power accidentally. It gets better at holding power as it grows older.
 Generation = 2
-Evolutions = PIKACHU,Happiness,
+Evolution = PIKACHU,Happiness
 #-------------------------------
 [CLEFFA]
 Name = Cleffa
@@ -4567,7 +4577,7 @@ Category = Star Shape
 Pokedex = On nights with many shooting stars, Cleffa can be seen dancing in a ring. They dance until daybreak, when they quench their thirst with the morning dew.
 Generation = 2
 WildItemUncommon = MOONSTONE
-Evolutions = CLEFAIRY,Happiness,
+Evolution = CLEFAIRY,Happiness
 #-------------------------------
 [IGGLYBUFF]
 Name = Igglybuff
@@ -4594,7 +4604,7 @@ Habitat = Grassland
 Category = Balloon
 Pokedex = Its soft and pliable body is very bouncy. When it sings continuously with all its might, its body steadily turns a deepening pink color.
 Generation = 2
-Evolutions = JIGGLYPUFF,Happiness,
+Evolution = JIGGLYPUFF,Happiness
 #-------------------------------
 [TOGEPI]
 Name = Togepi
@@ -4621,7 +4631,7 @@ Habitat = Forest
 Category = Spike Ball
 Pokedex = As its energy, it uses the feelings of compassion and pleasure exuded by people and Pokémon. It stores up happy feelings in its shell, then shares them out.
 Generation = 2
-Evolutions = TOGETIC,Happiness,
+Evolution = TOGETIC,Happiness
 #-------------------------------
 [TOGETIC]
 Name = Togetic
@@ -4647,7 +4657,7 @@ Habitat = Forest
 Category = Happiness
 Pokedex = It is said to be a Pokémon that brings good fortune. When it spots someone who is pure of heart, a Togetic appears and shares its happiness with that person.
 Generation = 2
-Evolutions = TOGEKISS,Item,SHINYSTONE
+Evolution = TOGEKISS,Item,SHINYSTONE
 #-------------------------------
 [NATU]
 Name = Natu
@@ -4674,7 +4684,7 @@ Habitat = Forest
 Category = Tiny Bird
 Pokedex = It runs up short trees that grow on the savanna to peck at new shoots. A Natu's eyes look as if they are always observing something.
 Generation = 2
-Evolutions = XATU,Level,25
+Evolution = XATU,Level,25
 #-------------------------------
 [XATU]
 Name = Xatu
@@ -4726,7 +4736,7 @@ Habitat = Grassland
 Category = Wool
 Pokedex = Its fluffy wool rubs together and builds a static charge. The more energy is charged, the more brightly the lightbulb at the tip of its tail glows.
 Generation = 2
-Evolutions = FLAAFFY,Level,15
+Evolution = FLAAFFY,Level,15
 #-------------------------------
 [FLAAFFY]
 Name = Flaaffy
@@ -4752,7 +4762,7 @@ Habitat = Grassland
 Category = Wool
 Pokedex = Its fleece quality changes to generate strong static electricity with a small amount of wool. The bare, slick parts of its hide are shielded against electricity.
 Generation = 2
-Evolutions = AMPHAROS,Level,30
+Evolution = AMPHAROS,Level,30
 #-------------------------------
 [AMPHAROS]
 Name = Ampharos
@@ -4830,7 +4840,7 @@ Habitat = WatersEdge
 Category = Aqua Mouse
 Pokedex = Its body is covered with water-repellent fur. Because of the fur, it can swim through water at high speed without being slowed by the water's resistance.
 Generation = 2
-Evolutions = AZUMARILL,Level,18
+Evolution = AZUMARILL,Level,18
 #-------------------------------
 [AZUMARILL]
 Name = Azumarill
@@ -4934,7 +4944,7 @@ Habitat = Grassland
 Category = Cottonweed
 Pokedex = This Pokémon drifts and floats with the wind. If it senses the approach of strong winds, a Hoppip links leaves with others to prepare against being blown away.
 Generation = 2
-Evolutions = SKIPLOOM,Level,18
+Evolution = SKIPLOOM,Level,18
 #-------------------------------
 [SKIPLOOM]
 Name = Skiploom
@@ -4960,7 +4970,7 @@ Habitat = Grassland
 Category = Cottonweed
 Pokedex = It blossoms when the temperature rises above 64 degrees F. Because its flower's blooming changes with the temperature, it is sometimes used as a thermometer.
 Generation = 2
-Evolutions = JUMPLUFF,Level,27
+Evolution = JUMPLUFF,Level,27
 #-------------------------------
 [JUMPLUFF]
 Name = Jumpluff
@@ -5012,7 +5022,7 @@ Habitat = Forest
 Category = Long Tail
 Pokedex = Its tail ends with a dexterous, handlike appendage. However, because it uses the tail so much, Aipom's real hands have become rather clumsy.
 Generation = 2
-Evolutions = AMBIPOM,HasMove,DOUBLEHIT
+Evolution = AMBIPOM,HasMove,DOUBLEHIT
 #-------------------------------
 [SUNKERN]
 Name = Sunkern
@@ -5039,7 +5049,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = Sunkern try to minimize movement to conserve the nutrients they have stored in their bodies for evolution. They will not eat, subsisting only on morning dew.
 Generation = 2
-Evolutions = SUNFLORA,Item,SUNSTONE
+Evolution = SUNFLORA,Item,SUNSTONE
 #-------------------------------
 [SUNFLORA]
 Name = Sunflora
@@ -5092,7 +5102,7 @@ Category = Clear Wing
 Pokedex = It can see 360 degrees without moving its eyes. It is a great flier capable of making sudden stops and turning midair to quickly chase down targeted prey.
 Generation = 2
 WildItemUncommon = WIDELENS
-Evolutions = YANMEGA,HasMove,ANCIENTPOWER
+Evolution = YANMEGA,HasMove,ANCIENTPOWER
 #-------------------------------
 [WOOPER]
 Name = Wooper
@@ -5119,7 +5129,7 @@ Habitat = WatersEdge
 Category = Water Fish
 Pokedex = Wooper usually live in water but come out onto land seeking food occasionally. On land, they coat their bodies with a gooey, toxic film.
 Generation = 2
-Evolutions = QUAGSIRE,Level,20
+Evolution = QUAGSIRE,Level,20
 #-------------------------------
 [QUAGSIRE]
 Name = Quagsire
@@ -5221,7 +5231,7 @@ Habitat = Forest
 Category = Darkness
 Pokedex = Murkrow were feared as the alleged bearers of ill fortune. It shows strong interest in anything that sparkles. It will even try to steal rings from women.
 Generation = 2
-Evolutions = HONCHKROW,Item,DUSKSTONE
+Evolution = HONCHKROW,Item,DUSKSTONE
 #-------------------------------
 [SLOWKING]
 Name = Slowking
@@ -5273,7 +5283,7 @@ Habitat = Cave
 Category = Screech
 Pokedex = A Misdreavus frightens people with a creepy, sobbing cry. It apparently uses its red spheres to absorb the fear of foes as its nutrition.
 Generation = 2
-Evolutions = MISMAGIUS,Item,DUSKSTONE
+Evolution = MISMAGIUS,Item,DUSKSTONE
 #-------------------------------
 [UNOWN]
 Name = Unown
@@ -5376,7 +5386,7 @@ Habitat = Forest
 Category = Bagworm
 Pokedex = A Pineco hangs from a tree branch and waits for prey. While eating, if it is disturbed by someone shaking its tree, it falls on the ground and explodes.
 Generation = 2
-Evolutions = FORRETRESS,Level,31
+Evolution = FORRETRESS,Level,31
 #-------------------------------
 [FORRETRESS]
 Name = Forretress
@@ -5454,7 +5464,7 @@ Habitat = Mountain
 Category = Fly Scorpion
 Pokedex = It glides without making a single sound. It grasps the face of its foe using its hind and large front claws, then stabs with its poison barb.
 Generation = 2
-Evolutions = GLISCOR,NightHoldItem,RAZORFANG
+Evolution = GLISCOR,NightHoldItem,RAZORFANG
 #-------------------------------
 [STEELIX]
 Name = Steelix
@@ -5507,7 +5517,7 @@ Habitat = Urban
 Category = Fairy
 Pokedex = By baring its fangs and making a scary face, it sends smaller Pokémon scurrying in terror. The Snubbull does seem a little sad at making its foes flee.
 Generation = 2
-Evolutions = GRANBULL,Level,23
+Evolution = GRANBULL,Level,23
 #-------------------------------
 [GRANBULL]
 Name = Granbull
@@ -5667,7 +5677,7 @@ Category = Sharp Claw
 Pokedex = A Sneasel scales trees by punching its hooked claws into the bark. It seeks out unguarded nests and steals eggs for food while the parents are away.
 Generation = 2
 WildItemUncommon = QUICKCLAW
-Evolutions = WEAVILE,NightHoldItem,RAZORCLAW
+Evolution = WEAVILE,NightHoldItem,RAZORCLAW
 #-------------------------------
 [TEDDIURSA]
 Name = Teddiursa
@@ -5694,7 +5704,7 @@ Habitat = Mountain
 Category = Little Bear
 Pokedex = It licks its palms that are sweetened by being soaked in honey. A Teddiursa makes its own honey by blending fruits and pollen collected by Beedrill.
 Generation = 2
-Evolutions = URSARING,Level,30
+Evolution = URSARING,Level,30
 #-------------------------------
 [URSARING]
 Name = Ursaring
@@ -5746,7 +5756,7 @@ Habitat = Mountain
 Category = Lava
 Pokedex = It is a species of Pokémon that lives in volcanic areas. If its body cools, its skin hardens and immobilizes it. To avoid that, it sleeps near magma.
 Generation = 2
-Evolutions = MAGCARGO,Level,38
+Evolution = MAGCARGO,Level,38
 #-------------------------------
 [MAGCARGO]
 Name = Magcargo
@@ -5798,7 +5808,7 @@ Habitat = Cave
 Category = Pig
 Pokedex = It roots for food by rubbing its snout against the ground. Its favorite food is a mushroom that grows under dried grass. It occasionally roots out hot springs.
 Generation = 2
-Evolutions = PILOSWINE,Level,33
+Evolution = PILOSWINE,Level,33
 #-------------------------------
 [PILOSWINE]
 Name = Piloswine
@@ -5824,7 +5834,7 @@ Habitat = Cave
 Category = Swine
 Pokedex = A Piloswine is covered by a thick coat of long hair for enduring freezing cold. It uses its tusks to dig up food that has been buried under ice.
 Generation = 2
-Evolutions = MAMOSWINE,HasMove,ANCIENTPOWER
+Evolution = MAMOSWINE,HasMove,ANCIENTPOWER
 #-------------------------------
 [CORSOLA]
 Name = Corsola
@@ -5878,7 +5888,7 @@ Habitat = Sea
 Category = Jet
 Pokedex = A Remoraid uses its abdominal muscles to forcefully expel swallowed water, then shoot down flying prey. When evolution approaches, it travels down rivers.
 Generation = 2
-Evolutions = OCTILLERY,Level,25
+Evolution = OCTILLERY,Level,25
 #-------------------------------
 [OCTILLERY]
 Name = Octillery
@@ -6009,7 +6019,7 @@ Habitat = RoughTerrain
 Category = Dark
 Pokedex = Houndour communicate with each other using a variety of cries to corner their prey. This Pokémon's remarkable teamwork is simply unparalleled.
 Generation = 2
-Evolutions = HOUNDOOM,Level,24
+Evolution = HOUNDOOM,Level,24
 #-------------------------------
 [HOUNDOOM]
 Name = Houndoom
@@ -6087,7 +6097,7 @@ Habitat = RoughTerrain
 Category = Long Nose
 Pokedex = Phanpy's big ears serve as broad fans. When it becomes hot, it flaps the ears busily to cool down. Even the young are very strong.
 Generation = 2
-Evolutions = DONPHAN,Level,25
+Evolution = DONPHAN,Level,25
 #-------------------------------
 [DONPHAN]
 Name = Donphan
@@ -6138,7 +6148,7 @@ Habitat = Urban
 Category = Virtual
 Pokedex = It was created by humans using the power of science. It has been given artificial intelligence that enables it to learn new gestures and emotions on its own.
 Generation = 2
-Evolutions = PORYGONZ,TradeItem,DUBIOUSDISC
+Evolution = PORYGONZ,TradeItem,DUBIOUSDISC
 #-------------------------------
 [STANTLER]
 Name = Stantler
@@ -6215,7 +6225,9 @@ Habitat = Urban
 Category = Scuffle
 Pokedex = Tyrogue become stressed out if they do not get to train every day. When raising this Pokémon, the trainer must establish a regular training schedule.
 Generation = 2
-Evolutions = HITMONLEE,AttackGreater,20,HITMONCHAN,DefenseGreater,20,HITMONTOP,AtkDefEqual,20
+Evolution = HITMONLEE,AttackGreater,20
+Evolution = HITMONCHAN,DefenseGreater,20
+Evolution = HITMONTOP,AtkDefEqual,20
 #-------------------------------
 [HITMONTOP]
 Name = Hitmontop
@@ -6267,7 +6279,7 @@ Habitat = Urban
 Category = Kiss
 Pokedex = It actively runs about, but also falls often. Whenever it falls, it will check its reflection on a lake's surface to make sure its face hasn't become dirty.
 Generation = 2
-Evolutions = JYNX,Level,30
+Evolution = JYNX,Level,30
 #-------------------------------
 [ELEKID]
 Name = Elekid
@@ -6295,7 +6307,7 @@ Category = Electric
 Pokedex = If it touches metal and discharges the electricity it has stored in its body, an Elekid begins swinging its arms in circles to recharge itself.
 Generation = 2
 WildItemUncommon = ELECTIRIZER
-Evolutions = ELECTABUZZ,Level,30
+Evolution = ELECTABUZZ,Level,30
 #-------------------------------
 [MAGBY]
 Name = Magby
@@ -6323,7 +6335,7 @@ Category = Live Coal
 Pokedex = If a Magby is spouting yellow flames from its mouth, it is in good health. When it is fatigued, black smoke will be mixed in with the flames.
 Generation = 2
 WildItemUncommon = MAGMARIZER
-Evolutions = MAGMAR,Level,30
+Evolution = MAGMAR,Level,30
 #-------------------------------
 [MILTANK]
 Name = Miltank
@@ -6485,7 +6497,7 @@ Habitat = Mountain
 Category = Rock Skin
 Pokedex = A Larvitar is born deep under the ground. It must eat its way through the soil above and reach the surface for it to see its parents' faces.
 Generation = 2
-Evolutions = PUPITAR,Level,30
+Evolution = PUPITAR,Level,30
 #-------------------------------
 [PUPITAR]
 Name = Pupitar
@@ -6510,7 +6522,7 @@ Habitat = Mountain
 Category = Hard Shell
 Pokedex = A Pupitar creates a gas inside its body that it ejects under compression to propel itself like a jet. Its body can withstand a collision with solid steel.
 Generation = 2
-Evolutions = TYRANITAR,Level,55
+Evolution = TYRANITAR,Level,55
 #-------------------------------
 [TYRANITAR]
 Name = Tyranitar
@@ -6645,7 +6657,7 @@ Habitat = Forest
 Category = Wood Gecko
 Pokedex = It makes its nest in a giant tree in the forest. It ferociously guards against anything nearing its territory. It is said to be the protector of the trees.
 Generation = 3
-Evolutions = GROVYLE,Level,16
+Evolution = GROVYLE,Level,16
 #-------------------------------
 [GROVYLE]
 Name = Grovyle
@@ -6671,7 +6683,7 @@ Habitat = Forest
 Category = Wood Gecko
 Pokedex = Leaves grow out of this Pokémon's body. They help obscure a Grovyle from the eyes of its enemies while it is in a thickly overgrown forest.
 Generation = 3
-Evolutions = SCEPTILE,Level,36
+Evolution = SCEPTILE,Level,36
 #-------------------------------
 [SCEPTILE]
 Name = Sceptile
@@ -6723,7 +6735,7 @@ Habitat = Grassland
 Category = Chick
 Pokedex = If attacked, it strikes back by spitting balls of fire it forms in its stomach. A Torchic dislikes darkness because it can't see its surroundings.
 Generation = 3
-Evolutions = COMBUSKEN,Level,16
+Evolution = COMBUSKEN,Level,16
 #-------------------------------
 [COMBUSKEN]
 Name = Combusken
@@ -6749,7 +6761,7 @@ Habitat = Grassland
 Category = Young Fowl
 Pokedex = It lashes out with 10 kicks per second. Its strong fighting instinct compels it to keep up its offensive until the opponent gives up.
 Generation = 3
-Evolutions = BLAZIKEN,Level,36
+Evolution = BLAZIKEN,Level,36
 #-------------------------------
 [BLAZIKEN]
 Name = Blaziken
@@ -6801,7 +6813,7 @@ Habitat = WatersEdge
 Category = Mud Fish
 Pokedex = On land, it can powerfully lift large boulders by planting its four feet and heaving. It sleeps by burying itself in soil at the water's edge.
 Generation = 3
-Evolutions = MARSHTOMP,Level,16
+Evolution = MARSHTOMP,Level,16
 #-------------------------------
 [MARSHTOMP]
 Name = Marshtomp
@@ -6827,7 +6839,7 @@ Habitat = WatersEdge
 Category = Mud Fish
 Pokedex = Its toughened hind legs enable it to stand upright. Because it weakens if its skin dries out, it replenishes fluids by playing in mud.
 Generation = 3
-Evolutions = SWAMPERT,Level,36
+Evolution = SWAMPERT,Level,36
 #-------------------------------
 [SWAMPERT]
 Name = Swampert
@@ -6879,7 +6891,7 @@ Habitat = Grassland
 Category = Bite
 Pokedex = It savagely threatens foes with bared fangs. It chases after fleeing targets tenaciously. It turns tail and runs, however, if the foe strikes back.
 Generation = 3
-Evolutions = MIGHTYENA,Level,18
+Evolution = MIGHTYENA,Level,18
 #-------------------------------
 [MIGHTYENA]
 Name = Mightyena
@@ -6933,7 +6945,7 @@ Pokedex = Rubbing its nose against the ground, it always wanders about back and
 Generation = 3
 WildItemCommon = POTION
 WildItemUncommon = REVIVE
-Evolutions = LINOONE,Level,20
+Evolution = LINOONE,Level,20
 #-------------------------------
 [LINOONE]
 Name = Linoone
@@ -6988,7 +7000,8 @@ Pokedex = It sticks to tree branches and eats leaves. The thread it spits from i
 Generation = 3
 WildItemCommon = PECHABERRY
 WildItemUncommon = BRIGHTPOWDER
-Evolutions = SILCOON,Silcoon,7,CASCOON,Cascoon,7
+Evolution = SILCOON,Silcoon,7
+Evolution = CASCOON,Cascoon,7
 #-------------------------------
 [SILCOON]
 Name = Silcoon
@@ -7013,7 +7026,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = It prepares for evolution using the energy it stored while it was a Wurmple. It keeps watch over the surroundings with its two eyes.
 Generation = 3
-Evolutions = BEAUTIFLY,Level,10
+Evolution = BEAUTIFLY,Level,10
 #-------------------------------
 [BEAUTIFLY]
 Name = Beautifly
@@ -7064,7 +7077,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = To avoid detection by its enemies, it hides motionlessly beneath large leaves and in the gaps of branches. It also attaches dead leaves to its body for camouflage.
 Generation = 3
-Evolutions = DUSTOX,Level,10
+Evolution = DUSTOX,Level,10
 #-------------------------------
 [DUSTOX]
 Name = Dustox
@@ -7118,7 +7131,7 @@ Category = Water Weed
 Pokedex = This Pokémon lives in ponds with clean water. It is known to ferry small Pokémon across ponds by carrying them on the broad leaf on its head.
 Generation = 3
 WildItemUncommon = MENTALHERB
-Evolutions = LOMBRE,Level,14
+Evolution = LOMBRE,Level,14
 #-------------------------------
 [LOMBRE]
 Name = Lombre
@@ -7145,7 +7158,7 @@ Category = Jolly
 Pokedex = In the evening, it takes great delight in popping out of rivers and startling people. It feeds on aquatic moss that grows on rocks in the riverbed.
 Generation = 3
 WildItemUncommon = MENTALHERB
-Evolutions = LUDICOLO,Item,WATERSTONE
+Evolution = LUDICOLO,Item,WATERSTONE
 #-------------------------------
 [LUDICOLO]
 Name = Ludicolo
@@ -7199,7 +7212,7 @@ Category = Acorn
 Pokedex = It hangs off branches and absorbs nutrients. When it finishes eating, its body becomes so heavy that it drops to the ground with a thump.
 Generation = 3
 WildItemUncommon = POWERHERB
-Evolutions = NUZLEAF,Level,14
+Evolution = NUZLEAF,Level,14
 #-------------------------------
 [NUZLEAF]
 Name = Nuzleaf
@@ -7226,7 +7239,7 @@ Category = Wily
 Pokedex = A forest-dwelling Pokémon that is skilled at climbing trees. Its long and pointed nose is its weak point. It loses power if the nose is gripped.
 Generation = 3
 WildItemUncommon = POWERHERB
-Evolutions = SHIFTRY,Item,LEAFSTONE
+Evolution = SHIFTRY,Item,LEAFSTONE
 #-------------------------------
 [SHIFTRY]
 Name = Shiftry
@@ -7279,7 +7292,7 @@ Habitat = Grassland
 Category = Tiny Swallow
 Pokedex = Although it is small, it is very courageous. It will take on a larger Skarmory on an equal footing. However, its will weakens if it becomes hungry.
 Generation = 3
-Evolutions = SWELLOW,Level,22
+Evolution = SWELLOW,Level,22
 #-------------------------------
 [SWELLOW]
 Name = Swellow
@@ -7332,7 +7345,7 @@ Category = Seagull
 Pokedex = It makes its nest on a sheer cliff at the edge of the sea. It has trouble keeping its wings flapping in flight. Instead, it soars on updrafts.
 Generation = 3
 WildItemCommon = PRETTYWING
-Evolutions = PELIPPER,Level,25
+Evolution = PELIPPER,Level,25
 #-------------------------------
 [PELIPPER]
 Name = Pelipper
@@ -7386,7 +7399,7 @@ Habitat = Urban
 Category = Feeling
 Pokedex = A Ralts has the power to sense the emotions of people and Pokémon with the horns on its head. It takes cover if it senses any hostility.
 Generation = 3
-Evolutions = KIRLIA,Level,20
+Evolution = KIRLIA,Level,20
 #-------------------------------
 [KIRLIA]
 Name = Kirlia
@@ -7412,7 +7425,8 @@ Habitat = Urban
 Category = Emotion
 Pokedex = A Kirlia has the psychic power to create a rip in the dimensions and see into the future. It is said to dance with pleasure on sunny mornings.
 Generation = 3
-Evolutions = GARDEVOIR,Level,30,GALLADE,ItemMale,DAWNSTONE
+Evolution = GARDEVOIR,Level,30
+Evolution = GALLADE,ItemMale,DAWNSTONE
 #-------------------------------
 [GARDEVOIR]
 Name = Gardevoir
@@ -7465,7 +7479,7 @@ Category = Pond Skater
 Pokedex = They gather on puddles after evening downpours, gliding across the surface of water as if sliding. It secretes honey with a sweet aroma from its head.
 Generation = 3
 WildItemUncommon = HONEY
-Evolutions = MASQUERAIN,Level,22
+Evolution = MASQUERAIN,Level,22
 #-------------------------------
 [MASQUERAIN]
 Name = Masquerain
@@ -7520,7 +7534,7 @@ Pokedex = It loves to eat damp, composted soil in forests. If you enter a forest
 Generation = 3
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = BRELOOM,Level,23
+Evolution = BRELOOM,Level,23
 #-------------------------------
 [BRELOOM]
 Name = Breloom
@@ -7573,7 +7587,7 @@ Habitat = Forest
 Category = Slacker
 Pokedex = It sleeps virtually all day and night long. It doesn't change its nest its entire life, but it sometimes travels great distances by swimming in rivers.
 Generation = 3
-Evolutions = VIGOROTH,Level,18
+Evolution = VIGOROTH,Level,18
 #-------------------------------
 [VIGOROTH]
 Name = Vigoroth
@@ -7598,7 +7612,7 @@ Habitat = Forest
 Category = Wild Monkey
 Pokedex = It can't keep still because its blood boils with energy. It runs through the fields and mountains all day to calm itself. If it doesn't, it can't sleep at night.
 Generation = 3
-Evolutions = SLAKING,Level,36
+Evolution = SLAKING,Level,36
 #-------------------------------
 [SLAKING]
 Name = Slaking
@@ -7650,7 +7664,8 @@ Category = Trainee
 Pokedex = It makes its nest at the roots of a mighty tree. Using its whiskerlike antennae, it probes its surroundings in the pitch-black darkness of soil.
 Generation = 3
 WildItemUncommon = SOFTSAND
-Evolutions = NINJASK,Ninjask,20,SHEDINJA,Shedinja,20
+Evolution = NINJASK,Ninjask,20
+Evolution = SHEDINJA,Shedinja,20
 #-------------------------------
 [NINJASK]
 Name = Ninjask
@@ -7726,7 +7741,7 @@ Habitat = Cave
 Category = Whisper
 Pokedex = Its cries equal a jet plane in volume. It inhales through its ear canals. Because of this system, it can cry continually without having to catch its breath.
 Generation = 3
-Evolutions = LOUDRED,Level,20
+Evolution = LOUDRED,Level,20
 #-------------------------------
 [LOUDRED]
 Name = Loudred
@@ -7752,7 +7767,7 @@ Habitat = Cave
 Category = Big Voice
 Pokedex = It positions the round speakers on its head to assail foes with ultrasonic waves at massive volume. It builds power by stomping the ground.
 Generation = 3
-Evolutions = EXPLOUD,Level,40
+Evolution = EXPLOUD,Level,40
 #-------------------------------
 [EXPLOUD]
 Name = Exploud
@@ -7805,7 +7820,7 @@ Category = Guts
 Pokedex = It loves to toughen up its body above all else. If you hear quaking rumbles in a cave, it is the sound of Makuhita undertaking strenuous training.
 Generation = 3
 WildItemUncommon = BLACKBELT
-Evolutions = HARIYAMA,Level,24
+Evolution = HARIYAMA,Level,24
 #-------------------------------
 [HARIYAMA]
 Name = Hariyama
@@ -7859,7 +7874,7 @@ Habitat = WatersEdge
 Category = Polka Dot
 Pokedex = Its tail, which is packed with nutrition, is very bouncy like a rubber ball. On sunny days they gather at the edge of water and splash about for fun.
 Generation = 3
-Evolutions = MARILL,Happiness,
+Evolution = MARILL,Happiness
 #-------------------------------
 [NOSEPASS]
 Name = Nosepass
@@ -7887,7 +7902,7 @@ Category = Compass
 Pokedex = Its body emits a powerful magnetism. It feeds on prey that is pulled in by the force. Its magnetism is stronger in cold seasons.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = PROBOPASS,LocationFlag,Magnetic
+Evolution = PROBOPASS,LocationFlag,Magnetic
 #-------------------------------
 [SKITTY]
 Name = Skitty
@@ -7914,7 +7929,7 @@ Habitat = Forest
 Category = Kitten
 Pokedex = A Skitty's adorably cute behavior makes it highly popular. In battle, it makes its tail puff out. It threatens foes with a sharp growl.
 Generation = 3
-Evolutions = DELCATTY,Item,MOONSTONE
+Evolution = DELCATTY,Item,MOONSTONE
 #-------------------------------
 [DELCATTY]
 Name = Delcatty
@@ -8021,7 +8036,7 @@ Category = Iron Armor
 Pokedex = A Pokémon that is clad in steel armor. A new suit of armor is made when it evolves. The old, discarded armor is salvaged as metal for making iron products.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = LAIRON,Level,32
+Evolution = LAIRON,Level,32
 #-------------------------------
 [LAIRON]
 Name = Lairon
@@ -8048,7 +8063,7 @@ Category = Iron Armor
 Pokedex = When two Lairon meet in the wild, they fight for territory by bashing into each other with their steel bodies. The sound of their collision carries for miles.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = AGGRON,Level,42
+Evolution = AGGRON,Level,42
 #-------------------------------
 [AGGRON]
 Name = Aggron
@@ -8101,7 +8116,7 @@ Habitat = Mountain
 Category = Meditate
 Pokedex = It continually meditates for hours every day. As a result of rigorous and dedicated yoga training, it has tempered its spiritual power so much it can fly.
 Generation = 3
-Evolutions = MEDICHAM,Level,37
+Evolution = MEDICHAM,Level,37
 #-------------------------------
 [MEDICHAM]
 Name = Medicham
@@ -8153,7 +8168,7 @@ Habitat = Grassland
 Category = Lightning
 Pokedex = It generates electricity using friction from the atmosphere. In seasons with especially arid air, its entire body blazes with violent showers of sparks.
 Generation = 3
-Evolutions = MANECTRIC,Level,26
+Evolution = MANECTRIC,Level,26
 #-------------------------------
 [MANECTRIC]
 Name = Manectric
@@ -8316,7 +8331,7 @@ Category = Thorn
 Pokedex = A Roselia that drinks nutritionally rich springwater blooms with lovely flowers. The fragrance of its flowers has the effect of making its foes careless.
 Generation = 3
 WildItemUncommon = POISONBARB
-Evolutions = ROSERADE,Item,SHINYSTONE
+Evolution = ROSERADE,Item,SHINYSTONE
 #-------------------------------
 [GULPIN]
 Name = Gulpin
@@ -8345,7 +8360,7 @@ Pokedex = This Pokémon's stomach fluid can even digest scrap iron. In one gulp,
 Generation = 3
 WildItemCommon = ORANBERRY
 WildItemUncommon = SITRUSBERRY
-Evolutions = SWALOT,Level,26
+Evolution = SWALOT,Level,26
 #-------------------------------
 [SWALOT]
 Name = Swalot
@@ -8400,7 +8415,7 @@ Category = Savage
 Pokedex = Carvanha attack ships in swarms, making them sink. Although it is said to be a very vicious Pokémon, it timidly flees as soon as it finds itself alone.
 Generation = 3
 WildItemUncommon = DEEPSEATOOTH
-Evolutions = SHARPEDO,Level,30
+Evolution = SHARPEDO,Level,30
 #-------------------------------
 [SHARPEDO]
 Name = Sharpedo
@@ -8453,7 +8468,7 @@ Habitat = Sea
 Category = Ball Whale
 Pokedex = While this Pokémon usually lives in the sea, it can survive on land, although not too long. It loses vitality if its body becomes dried out.
 Generation = 3
-Evolutions = WAILORD,Level,40
+Evolution = WAILORD,Level,40
 #-------------------------------
 [WAILORD]
 Name = Wailord
@@ -8505,7 +8520,7 @@ Habitat = Mountain
 Category = Numb
 Pokedex = A Numel stores boiling magma in the hump on its back. It is a hardy Pokémon that can transport a 220-pound load. It has served humans at work since long ago.
 Generation = 3
-Evolutions = CAMERUPT,Level,33
+Evolution = CAMERUPT,Level,33
 #-------------------------------
 [CAMERUPT]
 Name = Camerupt
@@ -8584,7 +8599,7 @@ Habitat = Mountain
 Category = Bounce
 Pokedex = A Pokémon that manipulates psychic power at will. It doesn't stop bouncing even when it is asleep. It loves eating mushrooms that grow underground.
 Generation = 3
-Evolutions = GRUMPIG,Level,32
+Evolution = GRUMPIG,Level,32
 #-------------------------------
 [GRUMPIG]
 Name = Grumpig
@@ -8663,7 +8678,7 @@ Category = Ant Pit
 Pokedex = Its big jaws crunch through boulders. Because its head is so big, it has a hard time getting back upright if it tips over onto its back.
 Generation = 3
 WildItemUncommon = SOFTSAND
-Evolutions = VIBRAVA,Level,35
+Evolution = VIBRAVA,Level,35
 #-------------------------------
 [VIBRAVA]
 Name = Vibrava
@@ -8688,7 +8703,7 @@ Habitat = RoughTerrain
 Category = Vibration
 Pokedex = It looses ultrasonic waves by rubbing its wings together. Since a Vibrava's wings are still in the process of growing, it can only fly short distances.
 Generation = 3
-Evolutions = FLYGON,Level,45
+Evolution = FLYGON,Level,45
 #-------------------------------
 [FLYGON]
 Name = Flygon
@@ -8740,7 +8755,7 @@ Category = Cactus
 Pokedex = Cacnea live in deserts with virtually no rainfall. It battles by swinging its thick, spiked arms. Once a year, a yellow flower blooms.
 Generation = 3
 WildItemUncommon = STICKYBARB
-Evolutions = CACTURNE,Level,32
+Evolution = CACTURNE,Level,32
 #-------------------------------
 [CACTURNE]
 Name = Cacturne
@@ -8793,7 +8808,7 @@ Habitat = Forest
 Category = Cotton Bird
 Pokedex = A Pokémon that has wings like cottony clouds. After enduring winter, in which little food is available, Swablu flocks move closer to towns in the spring.
 Generation = 3
-Evolutions = ALTARIA,Level,35
+Evolution = ALTARIA,Level,35
 #-------------------------------
 [ALTARIA]
 Name = Altaria
@@ -8951,7 +8966,7 @@ Habitat = WatersEdge
 Category = Whiskers
 Pokedex = Its body is covered with a slimy film. The film acts as a barrier to prevent germs in muddy water from entering the Barboach's body.
 Generation = 3
-Evolutions = WHISCASH,Level,30
+Evolution = WHISCASH,Level,30
 #-------------------------------
 [WHISCASH]
 Name = Whiscash
@@ -9003,7 +9018,7 @@ Habitat = WatersEdge
 Category = Ruffian
 Pokedex = Once it grips prey with its large pincers, it will never let go, no matter what. It is a hardy Pokémon that can thrive in any environment.
 Generation = 3
-Evolutions = CRAWDAUNT,Level,30
+Evolution = CRAWDAUNT,Level,30
 #-------------------------------
 [CRAWDAUNT]
 Name = Crawdaunt
@@ -9054,7 +9069,7 @@ Category = Clay Doll
 Pokedex = A Baltoy moves by spinning on its single foot. It has been depicted in murals adorning the walls of a once-bustling city in an ancient age.
 Generation = 3
 WildItemUncommon = LIGHTCLAY
-Evolutions = CLAYDOL,Level,36
+Evolution = CLAYDOL,Level,36
 #-------------------------------
 [CLAYDOL]
 Name = Claydol
@@ -9107,7 +9122,7 @@ Category = Sea Lily
 Pokedex = It disguises itself as seaweed by making its tentacles sway. Unsuspecting prey that come too close are swallowed whole. It became extinct 100 million years ago.
 Generation = 3
 WildItemUncommon = BIGROOT
-Evolutions = CRADILY,Level,40
+Evolution = CRADILY,Level,40
 #-------------------------------
 [CRADILY]
 Name = Cradily
@@ -9160,7 +9175,7 @@ Habitat = WatersEdge
 Category = Old Shrimp
 Pokedex = It was resurrected from a fossil using the power of science. It swims by undulating the wings at its sides. They were feet that adapted to life in the sea.
 Generation = 3
-Evolutions = ARMALDO,Level,40
+Evolution = ARMALDO,Level,40
 #-------------------------------
 [ARMALDO]
 Name = Armaldo
@@ -9212,7 +9227,8 @@ Habitat = WatersEdge
 Category = Fish
 Pokedex = Feebas live in ponds that are heavily infested with weeds. Because of its hopelessly shabby appearance, it seems as if few trainers raise it.
 Generation = 3
-Evolutions = MILOTIC,TradeItem,PRISMSCALE,MILOTIC,Beauty,170
+Evolution = MILOTIC,TradeItem,PRISMSCALE
+Evolution = MILOTIC,Beauty,170
 #-------------------------------
 [MILOTIC]
 Name = Milotic
@@ -9320,7 +9336,7 @@ Category = Puppet
 Pokedex = This Pokémon roams about deep in the night seeking such negative emotions as grudges and envy. It retreats to its nest when the sun begins to rise.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = BANETTE,Level,37
+Evolution = BANETTE,Level,37
 #-------------------------------
 [BANETTE]
 Name = Banette
@@ -9374,7 +9390,7 @@ Category = Requiem
 Pokedex = A glare from its single scarlet eye makes even burly grown-ups freeze in utter fear. It is a nocturnal Pokémon that roams about under the cloak of darkness.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = DUSCLOPS,Level,37
+Evolution = DUSCLOPS,Level,37
 #-------------------------------
 [DUSCLOPS]
 Name = Dusclops
@@ -9401,7 +9417,7 @@ Category = Beckon
 Pokedex = It is thought that its body is hollow with only a spectral ball of fire burning inside. However, no one has been able to confirm this theory as fact.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = DUSKNOIR,TradeItem,REAPERCLOTH
+Evolution = DUSKNOIR,TradeItem,REAPERCLOTH
 #-------------------------------
 [TROPIUS]
 Name = Tropius
@@ -9507,7 +9523,7 @@ Habitat = Cave
 Category = Bright
 Pokedex = A Wynaut loves to eat sweet fruits. It cleverly picks fruits using its earlike arms. They gather in fruit gardens, drawn by the fragrance.
 Generation = 3
-Evolutions = WOBBUFFET,Level,15
+Evolution = WOBBUFFET,Level,15
 #-------------------------------
 [SNORUNT]
 Name = Snorunt
@@ -9535,7 +9551,8 @@ Category = Snow Hat
 Pokedex = They tend to move about in groups of around five Snorunt. In snowy regions, it is said that when they are seen late at night, snowfall will arrive by morning.
 Generation = 3
 WildItemUncommon = SNOWBALL
-Evolutions = GLALIE,Level,42,FROSLASS,ItemFemale,DAWNSTONE
+Evolution = GLALIE,Level,42
+Evolution = FROSLASS,ItemFemale,DAWNSTONE
 #-------------------------------
 [GLALIE]
 Name = Glalie
@@ -9587,7 +9604,7 @@ Habitat = Sea
 Category = Clap
 Pokedex = It is completely covered with plushy fur. As a result, it never feels the cold even when it is rolling about on ice floes or diving in the sea.
 Generation = 3
-Evolutions = SEALEO,Level,32
+Evolution = SEALEO,Level,32
 #-------------------------------
 [SEALEO]
 Name = Sealeo
@@ -9613,7 +9630,7 @@ Habitat = Sea
 Category = Ball Roll
 Pokedex = Sealeo live in herds on ice floes. Using its powerful flippers, it shatters ice. It dives into the sea to hunt prey five times a day.
 Generation = 3
-Evolutions = WALREIN,Level,44
+Evolution = WALREIN,Level,44
 #-------------------------------
 [WALREIN]
 Name = Walrein
@@ -9667,7 +9684,8 @@ Pokedex = A Clamperl slams its shell closed on prey to prevent escape. The pearl
 Generation = 3
 WildItemCommon = PEARL
 WildItemUncommon = BIGPEARL
-Evolutions = HUNTAIL,TradeItem,DEEPSEATOOTH,GOREBYSS,TradeItem,DEEPSEASCALE
+Evolution = HUNTAIL,TradeItem,DEEPSEATOOTH
+Evolution = GOREBYSS,TradeItem,DEEPSEASCALE
 #-------------------------------
 [HUNTAIL]
 Name = Huntail
@@ -9801,7 +9819,7 @@ Category = Rock Head
 Pokedex = Although it is small, this Pokémon is very powerful because its body is a bundle of muscles. It launches head-butts with its ironlike skull.
 Generation = 3
 WildItemUncommon = DRAGONFANG
-Evolutions = SHELGON,Level,30
+Evolution = SHELGON,Level,30
 #-------------------------------
 [SHELGON]
 Name = Shelgon
@@ -9828,7 +9846,7 @@ Category = Endurance
 Pokedex = It hardly eats while it awaits evolution. It becomes hardier by enduring hunger. Its shell peels off the instant it begins to evolve.
 Generation = 3
 WildItemUncommon = DRAGONFANG
-Evolutions = SALAMENCE,Level,50
+Evolution = SALAMENCE,Level,50
 #-------------------------------
 [SALAMENCE]
 Name = Salamence
@@ -9881,7 +9899,7 @@ Category = Iron Ball
 Pokedex = When Beldum gather in a swarm, they move in perfect unison as if they were but one Pokémon. They communicate with each other using brain waves.
 Generation = 3
 WildItemUncommon = METALCOAT
-Evolutions = METANG,Level,20
+Evolution = METANG,Level,20
 #-------------------------------
 [METANG]
 Name = Metang
@@ -9908,7 +9926,7 @@ Category = Iron Claw
 Pokedex = The claws tipping its arms pack the destructive power to tear through thick iron sheets as if they were silk. It flies at over 60 miles per hour.
 Generation = 3
 WildItemUncommon = METALCOAT
-Evolutions = METAGROSS,Level,45
+Evolution = METAGROSS,Level,45
 #-------------------------------
 [METAGROSS]
 Name = Metagross
@@ -10217,7 +10235,7 @@ Shape = Quadruped
 Category = Tiny Leaf
 Pokedex = Made from soil, the shell on its back hardens when it drinks water. It lives along lakes.
 Generation = 4
-Evolutions = GROTLE,Level,18
+Evolution = GROTLE,Level,18
 #-------------------------------
 [GROTLE]
 Name = Grotle
@@ -10242,7 +10260,7 @@ Shape = Quadruped
 Category = Grove
 Pokedex = It lives along water in forests. In the daytime, it leaves the forest to sunbathe its treed shell.
 Generation = 4
-Evolutions = TORTERRA,Level,32
+Evolution = TORTERRA,Level,32
 #-------------------------------
 [TORTERRA]
 Name = Torterra
@@ -10292,7 +10310,7 @@ Shape = BipedalTail
 Category = Chimp
 Pokedex = It agilely scales sheer cliffs to live atop craggy mountains. Its fire is put out when it sleeps.
 Generation = 4
-Evolutions = MONFERNO,Level,14
+Evolution = MONFERNO,Level,14
 #-------------------------------
 [MONFERNO]
 Name = Monferno
@@ -10317,7 +10335,7 @@ Shape = BipedalTail
 Category = Playful
 Pokedex = To intimidate attackers, it stretches the fire on its tail to make itself appear bigger.
 Generation = 4
-Evolutions = INFERNAPE,Level,36
+Evolution = INFERNAPE,Level,36
 #-------------------------------
 [INFERNAPE]
 Name = Infernape
@@ -10367,7 +10385,7 @@ Shape = Bipedal
 Category = Penguin
 Pokedex = Because it is very proud, it hates accepting food from people. Its thick down guards it from cold.
 Generation = 4
-Evolutions = PRINPLUP,Level,16
+Evolution = PRINPLUP,Level,16
 #-------------------------------
 [PRINPLUP]
 Name = Prinplup
@@ -10392,7 +10410,7 @@ Shape = BipedalTail
 Category = Penguin
 Pokedex = It lives alone, away from others. Apparently, every one of them believes it is the most important.
 Generation = 4
-Evolutions = EMPOLEON,Level,36
+Evolution = EMPOLEON,Level,36
 #-------------------------------
 [EMPOLEON]
 Name = Empoleon
@@ -10442,7 +10460,7 @@ Shape = Winged
 Category = Starling
 Pokedex = They flock in great numbers. Though small, they flap their wings with great power.
 Generation = 4
-Evolutions = STARAVIA,Level,14
+Evolution = STARAVIA,Level,14
 #-------------------------------
 [STARAVIA]
 Name = Staravia
@@ -10467,7 +10485,7 @@ Shape = Winged
 Category = Starling
 Pokedex = It flies around forests and fields in search of bug Pokémon. It stays within a huge flock.
 Generation = 4
-Evolutions = STARAPTOR,Level,34
+Evolution = STARAPTOR,Level,34
 #-------------------------------
 [STARAPTOR]
 Name = Staraptor
@@ -10517,7 +10535,7 @@ Shape = Quadruped
 Category = Plump Mouse
 Pokedex = With nerves of steel, nothing can perturb it. It is more agile and active than it appears.
 Generation = 4
-Evolutions = BIBAREL,Level,15
+Evolution = BIBAREL,Level,15
 #-------------------------------
 [BIBAREL]
 Name = Bibarel
@@ -10567,7 +10585,7 @@ Category = Cricket
 Pokedex = It shakes its head back to front, causing its antennae to hit each other and sound like a xylophone.
 Generation = 4
 WildItemUncommon = METRONOME
-Evolutions = KRICKETUNE,Level,10
+Evolution = KRICKETUNE,Level,10
 #-------------------------------
 [KRICKETUNE]
 Name = Kricketune
@@ -10618,7 +10636,7 @@ Shape = Quadruped
 Category = Flash
 Pokedex = All of its fur dazzles if danger is sensed. It flees while the foe is momentarily blinded.
 Generation = 4
-Evolutions = LUXIO,Level,15
+Evolution = LUXIO,Level,15
 #-------------------------------
 [LUXIO]
 Name = Luxio
@@ -10643,7 +10661,7 @@ Shape = Quadruped
 Category = Spark
 Pokedex = Its claws loose electricity with enough amperage to cause fainting. They live in small groups.
 Generation = 4
-Evolutions = LUXRAY,Level,30
+Evolution = LUXRAY,Level,30
 #-------------------------------
 [LUXRAY]
 Name = Luxray
@@ -10695,7 +10713,7 @@ Category = Bud
 Pokedex = Over the winter, it closes its bud and endures the cold. In spring, the bud opens and releases pollen.
 Generation = 4
 WildItemUncommon = POISONBARB
-Evolutions = ROSELIA,HappinessDay,
+Evolution = ROSELIA,HappinessDay
 #-------------------------------
 [ROSERADE]
 Name = Roserade
@@ -10746,7 +10764,7 @@ Shape = BipedalTail
 Category = Head Butt
 Pokedex = It lived in jungles around 100 million years ago. Its skull is as hard as iron.
 Generation = 4
-Evolutions = RAMPARDOS,Level,30
+Evolution = RAMPARDOS,Level,30
 #-------------------------------
 [RAMPARDOS]
 Name = Rampardos
@@ -10796,7 +10814,7 @@ Shape = Quadruped
 Category = Shield
 Pokedex = A Pokémon that lived in jungles around 100 million years ago. Its facial hide is extremely hard.
 Generation = 4
-Evolutions = BASTIODON,Level,30
+Evolution = BASTIODON,Level,30
 #-------------------------------
 [BASTIODON]
 Name = Bastiodon
@@ -10847,7 +10865,8 @@ Category = Bagworm
 Pokedex = To shelter itself from cold, wintry winds, it covers itself with a cloak made of twigs and leaves.
 Generation = 4
 Flags = InheritFormFromMother
-Evolutions = WORMADAM,LevelFemale,20,MOTHIM,LevelMale,20
+Evolution = WORMADAM,LevelFemale,20
+Evolution = MOTHIM,LevelMale,20
 #-------------------------------
 [WORMADAM]
 Name = Wormadam
@@ -10926,7 +10945,7 @@ Category = Tiny Bee
 Pokedex = A Pokémon formed by three others. It busily carries sweet floral honey to Vespiquen.
 Generation = 4
 WildItemUncommon = HONEY
-Evolutions = VESPIQUEN,LevelFemale,21
+Evolution = VESPIQUEN,LevelFemale,21
 #-------------------------------
 [VESPIQUEN]
 Name = Vespiquen
@@ -11002,7 +11021,7 @@ Shape = Quadruped
 Category = Sea Weasel
 Pokedex = It has a flotation sac that is like an inflatable collar. It floats on water with its head out.
 Generation = 4
-Evolutions = FLOATZEL,Level,26
+Evolution = FLOATZEL,Level,26
 #-------------------------------
 [FLOATZEL]
 Name = Floatzel
@@ -11052,7 +11071,7 @@ Category = Cherry
 Pokedex = The small ball holds the nutrients needed for evolution. Apparently, it is very sweet and tasty.
 Generation = 4
 WildItemUncommon = MIRACLESEED
-Evolutions = CHERRIM,Level,25
+Evolution = CHERRIM,Level,25
 #-------------------------------
 [CHERRIM]
 Name = Cherrim
@@ -11105,7 +11124,7 @@ Category = Sea Slug
 Pokedex = Its colors and shapes differ from region to region. In the Sinnoh region, two types are confirmed.
 Generation = 4
 Flags = InheritFormFromMother
-Evolutions = GASTRODON,Level,30
+Evolution = GASTRODON,Level,30
 #-------------------------------
 [GASTRODON]
 Name = Gastrodon
@@ -11181,7 +11200,7 @@ Shape = HeadArms
 Category = Balloon
 Pokedex = A Pokémon formed by the spirits of people and Pokémon. It loves damp, humid seasons.
 Generation = 4
-Evolutions = DRIFBLIM,Level,28
+Evolution = DRIFBLIM,Level,28
 #-------------------------------
 [DRIFBLIM]
 Name = Drifblim
@@ -11231,7 +11250,7 @@ Shape = BipedalTail
 Category = Rabbit
 Pokedex = It slams foes by sharply uncoiling its rolled ears. It stings enough to make a grown-up cry in pain.
 Generation = 4
-Evolutions = LOPUNNY,Happiness,
+Evolution = LOPUNNY,Happiness
 #-------------------------------
 [LOPUNNY]
 Name = Lopunny
@@ -11328,7 +11347,7 @@ Shape = Quadruped
 Category = Catty
 Pokedex = It claws if displeased and purrs when affectionate. Its fickleness is very popular among some.
 Generation = 4
-Evolutions = PURUGLY,Level,38
+Evolution = PURUGLY,Level,38
 #-------------------------------
 [PURUGLY]
 Name = Purugly
@@ -11379,7 +11398,7 @@ Category = Bell
 Pokedex = It emits cries by agitating an orb at the back of its throat. It moves with flouncing hops.
 Generation = 4
 WildItemUncommon = CLEANSETAG
-Evolutions = CHIMECHO,HappinessNight,
+Evolution = CHIMECHO,HappinessNight
 #-------------------------------
 [STUNKY]
 Name = Stunky
@@ -11405,7 +11424,7 @@ Shape = Quadruped
 Category = Skunk
 Pokedex = It protects itself by spraying a noxious fluid from its rear. The stench lingers for 24 hours.
 Generation = 4
-Evolutions = SKUNTANK,Level,34
+Evolution = SKUNTANK,Level,34
 #-------------------------------
 [SKUNTANK]
 Name = Skuntank
@@ -11455,7 +11474,7 @@ Category = Bronze
 Pokedex = Implements shaped like it were discovered in ancient tombs. It is unknown if they are related.
 Generation = 4
 WildItemUncommon = METALCOAT
-Evolutions = BRONZONG,Level,33
+Evolution = BRONZONG,Level,33
 #-------------------------------
 [BRONZONG]
 Name = Bronzong
@@ -11507,7 +11526,7 @@ Shape = HeadLegs
 Category = Bonsai
 Pokedex = It looks as if it is always crying. It is actually adjusting its body's fluid levels by eliminating excess.
 Generation = 4
-Evolutions = SUDOWOODO,HasMove,MIMIC
+Evolution = SUDOWOODO,HasMove,MIMIC
 #-------------------------------
 [MIMEJR]
 Name = Mime Jr.
@@ -11534,7 +11553,7 @@ Shape = Bipedal
 Category = Mime
 Pokedex = It habitually mimics foes. Once mimicked, the foe cannot take its eyes off this Pokémon.
 Generation = 4
-Evolutions = MRMIME,HasMove,MIMIC
+Evolution = MRMIME,HasMove,MIMIC
 #-------------------------------
 [HAPPINY]
 Name = Happiny
@@ -11563,7 +11582,7 @@ Pokedex = It loves round white things. It carries an egg-shaped rock in imitatio
 Generation = 4
 WildItemCommon = OVALSTONE
 WildItemUncommon = LUCKYEGG
-Evolutions = CHANSEY,DayHoldItem,OVALSTONE
+Evolution = CHANSEY,DayHoldItem,OVALSTONE
 #-------------------------------
 [CHATOT]
 Name = Chatot
@@ -11643,7 +11662,7 @@ Shape = BipedalTail
 Category = Land Shark
 Pokedex = It nests in small, horizontal holes in cave walls. It pounces to catch prey that stray too close.
 Generation = 4
-Evolutions = GABITE,Level,24
+Evolution = GABITE,Level,24
 #-------------------------------
 [GABITE]
 Name = Gabite
@@ -11668,7 +11687,7 @@ Shape = BipedalTail
 Category = Cave
 Pokedex = There is a long-held belief that medicine made from its scales will heal even incurable illnesses.
 Generation = 4
-Evolutions = GARCHOMP,Level,48
+Evolution = GARCHOMP,Level,48
 #-------------------------------
 [GARCHOMP]
 Name = Garchomp
@@ -11722,7 +11741,7 @@ Generation = 4
 WildItemCommon = LEFTOVERS
 WildItemUncommon = LEFTOVERS
 WildItemRare = LEFTOVERS
-Evolutions = SNORLAX,Happiness,
+Evolution = SNORLAX,Happiness
 #-------------------------------
 [RIOLU]
 Name = Riolu
@@ -11748,7 +11767,7 @@ Shape = BipedalTail
 Category = Emanation
 Pokedex = The aura that emanates from its body intensifies to alert others if it is afraid or sad.
 Generation = 4
-Evolutions = LUCARIO,HappinessDay,
+Evolution = LUCARIO,HappinessDay
 #-------------------------------
 [LUCARIO]
 Name = Lucario
@@ -11798,7 +11817,7 @@ Shape = Quadruped
 Category = Hippo
 Pokedex = It lives in arid places. Instead of perspiration, it expels grainy sand from its body.
 Generation = 4
-Evolutions = HIPPOWDON,Level,34
+Evolution = HIPPOWDON,Level,34
 #-------------------------------
 [HIPPOWDON]
 Name = Hippowdon
@@ -11849,7 +11868,7 @@ Category = Scorpion
 Pokedex = It grips prey with its tail claws and injects poison. It tenaciously hangs on until the poison takes.
 Generation = 4
 WildItemUncommon = POISONBARB
-Evolutions = DRAPION,Level,40
+Evolution = DRAPION,Level,40
 #-------------------------------
 [DRAPION]
 Name = Drapion
@@ -11901,7 +11920,7 @@ Category = Toxic Mouth
 Pokedex = Its cheeks hold poison sacs. It tries to catch foes off guard to jab them with toxic fingers.
 Generation = 4
 WildItemUncommon = BLACKSLUDGE
-Evolutions = TOXICROAK,Level,37
+Evolution = TOXICROAK,Level,37
 #-------------------------------
 [TOXICROAK]
 Name = Toxicroak
@@ -11976,7 +11995,7 @@ Shape = Finned
 Category = Wing Fish
 Pokedex = After long exposure to sunlight, the patterns on its tail fins shine vividly when darkness arrives.
 Generation = 4
-Evolutions = LUMINEON,Level,31
+Evolution = LUMINEON,Level,31
 #-------------------------------
 [LUMINEON]
 Name = Lumineon
@@ -12027,7 +12046,7 @@ Shape = Winged
 Category = Kite
 Pokedex = A friendly Pokémon that captures the subtle flows of seawater using its two antennae.
 Generation = 4
-Evolutions = MANTINE,HasInParty,REMORAID
+Evolution = MANTINE,HasInParty,REMORAID
 #-------------------------------
 [SNOVER]
 Name = Snover
@@ -12054,7 +12073,7 @@ Category = Frost Tree
 Pokedex = It lives on snowy mountains. Having had little contact with humans, it is boldly inquisitive.
 Generation = 4
 WildItemUncommon = NEVERMELTICE
-Evolutions = ABOMASNOW,Level,40
+Evolution = ABOMASNOW,Level,40
 #-------------------------------
 [ABOMASNOW]
 Name = Abomasnow
@@ -12940,7 +12959,7 @@ Shape = BipedalTail
 Category = Grass Snake
 Pokedex = They photosynthesize by bathing their tails in sunlight. When they are not feeling well, their tails droop.
 Generation = 5
-Evolutions = SERVINE,Level,17
+Evolution = SERVINE,Level,17
 #-------------------------------
 [SERVINE]
 Name = Servine
@@ -12965,7 +12984,7 @@ Shape = BipedalTail
 Category = Grass Snake
 Pokedex = They avoid attacks by sinking into the shadows of thick foliage. They retaliate with masterful whipping techniques.
 Generation = 5
-Evolutions = SERPERIOR,Level,36
+Evolution = SERPERIOR,Level,36
 #-------------------------------
 [SERPERIOR]
 Name = Serperior
@@ -13015,7 +13034,7 @@ Shape = Quadruped
 Category = Fire Pig
 Pokedex = It blows fire through its nose. When it catches a cold, the fire becomes pitch-black smoke instead.
 Generation = 5
-Evolutions = PIGNITE,Level,17
+Evolution = PIGNITE,Level,17
 #-------------------------------
 [PIGNITE]
 Name = Pignite
@@ -13040,7 +13059,7 @@ Shape = BipedalTail
 Category = Fire Pig
 Pokedex = Whatever it eats becomes fuel for the flame in its stomach. When it is angered, the intensity of the flame increases.
 Generation = 5
-Evolutions = EMBOAR,Level,36
+Evolution = EMBOAR,Level,36
 #-------------------------------
 [EMBOAR]
 Name = Emboar
@@ -13090,7 +13109,7 @@ Shape = BipedalTail
 Category = Sea Otter
 Pokedex = The scalchop on its stomach is made from the same elements as claws. It detaches the scalchop for use as a blade.
 Generation = 5
-Evolutions = DEWOTT,Level,17
+Evolution = DEWOTT,Level,17
 #-------------------------------
 [DEWOTT]
 Name = Dewott
@@ -13115,7 +13134,7 @@ Shape = BipedalTail
 Category = Discipline
 Pokedex = Scalchop techniques differ from one Dewott to another. It never neglects maintaining its scalchops.
 Generation = 5
-Evolutions = SAMUROTT,Level,36
+Evolution = SAMUROTT,Level,36
 #-------------------------------
 [SAMUROTT]
 Name = Samurott
@@ -13165,7 +13184,7 @@ Shape = Quadruped
 Category = Scout
 Pokedex = Extremely cautious, they take shifts to maintain a constant watch of their nest. They feel insecure without a lookout.
 Generation = 5
-Evolutions = WATCHOG,Level,20
+Evolution = WATCHOG,Level,20
 #-------------------------------
 [WATCHOG]
 Name = Watchog
@@ -13215,7 +13234,7 @@ Shape = Quadruped
 Category = Puppy
 Pokedex = The long hair around its face provides an amazing radar that lets it sense subtle changes in its surroundings.
 Generation = 5
-Evolutions = HERDIER,Level,16
+Evolution = HERDIER,Level,16
 #-------------------------------
 [HERDIER]
 Name = Herdier
@@ -13240,7 +13259,7 @@ Shape = Quadruped
 Category = Loyal Dog
 Pokedex = It loyally follows its Trainer's orders. For ages, they have helped Trainers raise Pokémon.
 Generation = 5
-Evolutions = STOUTLAND,Level,32
+Evolution = STOUTLAND,Level,32
 #-------------------------------
 [STOUTLAND]
 Name = Stoutland
@@ -13290,7 +13309,7 @@ Shape = Quadruped
 Category = Devious
 Pokedex = Its cute act is a ruse. When victims let down their guard, they find their items taken. It attacks with sharp claws.
 Generation = 5
-Evolutions = LIEPARD,Level,20
+Evolution = LIEPARD,Level,20
 #-------------------------------
 [LIEPARD]
 Name = Liepard
@@ -13340,7 +13359,7 @@ Shape = BipedalTail
 Category = Grass Monkey
 Pokedex = It shares the leaf on its head with weary-looking Pokémon. These leaves are known to relieve stress.
 Generation = 5
-Evolutions = SIMISAGE,Item,LEAFSTONE
+Evolution = SIMISAGE,Item,LEAFSTONE
 #-------------------------------
 [SIMISAGE]
 Name = Simisage
@@ -13390,7 +13409,7 @@ Shape = BipedalTail
 Category = High Temp
 Pokedex = This Pokémon lives in caves in volcanoes. The fire within the tuft on its head can reach 600º F.
 Generation = 5
-Evolutions = SIMISEAR,Item,FIRESTONE
+Evolution = SIMISEAR,Item,FIRESTONE
 #-------------------------------
 [SIMISEAR]
 Name = Simisear
@@ -13440,7 +13459,7 @@ Shape = BipedalTail
 Category = Spray
 Pokedex = It does not thrive in dry environments. It keeps itself damp by shooting water stored in its head tuft from its tail.
 Generation = 5
-Evolutions = SIMIPOUR,Item,WATERSTONE
+Evolution = SIMIPOUR,Item,WATERSTONE
 #-------------------------------
 [SIMIPOUR]
 Name = Simipour
@@ -13490,7 +13509,7 @@ Shape = Quadruped
 Category = Dream Eater
 Pokedex = It eats the dreams of people and Pokémon. When it eats a pleasant dreams, it expels pink-colored mist.
 Generation = 5
-Evolutions = MUSHARNA,Item,MOONSTONE
+Evolution = MUSHARNA,Item,MOONSTONE
 #-------------------------------
 [MUSHARNA]
 Name = Musharna
@@ -13540,7 +13559,7 @@ Shape = Winged
 Category = Tiny Pigeon
 Pokedex = These Pokémon live in cities. They are accustomed to people. Flocks often gather in parks and plazas.
 Generation = 5
-Evolutions = TRANQUILL,Level,21
+Evolution = TRANQUILL,Level,21
 #-------------------------------
 [TRANQUILL]
 Name = Tranquill
@@ -13565,7 +13584,7 @@ Shape = Winged
 Category = Wild Pigeon
 Pokedex = Many people believe that, deep in the forest where Tranquill live, there is a peaceful place where there is no war.
 Generation = 5
-Evolutions = UNFEZANT,Level,32
+Evolution = UNFEZANT,Level,32
 #-------------------------------
 [UNFEZANT]
 Name = Unfezant
@@ -13615,7 +13634,7 @@ Shape = Quadruped
 Category = Electrified
 Pokedex = When thunderclouds cover the sky, it will appear. It can catch lightning with its mane and store the electricity.
 Generation = 5
-Evolutions = ZEBSTRIKA,Level,27
+Evolution = ZEBSTRIKA,Level,27
 #-------------------------------
 [ZEBSTRIKA]
 Name = Zebstrika
@@ -13667,7 +13686,7 @@ Pokedex = They were discovered a hundred years ago in an earthquake fissure. Ins
 Generation = 5
 WildItemCommon = EVERSTONE
 WildItemUncommon = HARDSTONE
-Evolutions = BOLDORE,Level,25
+Evolution = BOLDORE,Level,25
 #-------------------------------
 [BOLDORE]
 Name = Boldore
@@ -13694,7 +13713,7 @@ Pokedex = Because its energy was too great to be contained, the energy leaked an
 Generation = 5
 WildItemCommon = EVERSTONE
 WildItemUncommon = HARDSTONE
-Evolutions = GIGALITH,Trade,
+Evolution = GIGALITH,Trade
 #-------------------------------
 [GIGALITH]
 Name = Gigalith
@@ -13746,7 +13765,7 @@ Shape = Winged
 Category = Bat
 Pokedex = Suction from its nostrils enables it to stick to cave walls during sleep. It leaves a heart-shaped mark behind.
 Generation = 5
-Evolutions = SWOOBAT,Happiness,
+Evolution = SWOOBAT,Happiness
 #-------------------------------
 [SWOOBAT]
 Name = Swoobat
@@ -13796,7 +13815,7 @@ Shape = BipedalTail
 Category = Mole
 Pokedex = It makes its way swiftly through the soil by putting both claws together and rotating at high speed.
 Generation = 5
-Evolutions = EXCADRILL,Level,31
+Evolution = EXCADRILL,Level,31
 #-------------------------------
 [EXCADRILL]
 Name = Excadrill
@@ -13873,7 +13892,7 @@ Shape = Bipedal
 Category = Muscular
 Pokedex = These Pokémon appear at building sites and help out with construction. They always carry squared logs.
 Generation = 5
-Evolutions = GURDURR,Level,25
+Evolution = GURDURR,Level,25
 #-------------------------------
 [GURDURR]
 Name = Gurdurr
@@ -13898,7 +13917,7 @@ Shape = Bipedal
 Category = Muscular
 Pokedex = They strengthen their bodies by carrying steel beams. They show off their big muscles to their friends.
 Generation = 5
-Evolutions = CONKELDURR,Trade,
+Evolution = CONKELDURR,Trade
 #-------------------------------
 [CONKELDURR]
 Name = Conkeldurr
@@ -13948,7 +13967,7 @@ Shape = Finned
 Category = Tadpole
 Pokedex = By vibrating its cheeks, it emits sound waves imperceptible to humans. It uses the rhythm of these sounds to talk.
 Generation = 5
-Evolutions = PALPITOAD,Level,25
+Evolution = PALPITOAD,Level,25
 #-------------------------------
 [PALPITOAD]
 Name = Palpitoad
@@ -13973,7 +13992,7 @@ Shape = BipedalTail
 Category = Vibration
 Pokedex = It lives in the water and on land. It uses its long, sticky tongue to capture prey.
 Generation = 5
-Evolutions = SEISMITOAD,Level,36
+Evolution = SEISMITOAD,Level,36
 #-------------------------------
 [SEISMITOAD]
 Name = Seismitoad
@@ -14074,7 +14093,7 @@ Category = Sewing
 Pokedex = This Pokémon makes clothes for itself. It chews up leaves and sews them with sticky thread extruded from its mouth.
 Generation = 5
 WildItemUncommon = MENTALHERB
-Evolutions = SWADLOON,Level,20
+Evolution = SWADLOON,Level,20
 #-------------------------------
 [SWADLOON]
 Name = Swadloon
@@ -14100,7 +14119,7 @@ Category = Leaf-Wrapped
 Pokedex = It protects itself from the cold by wrapping up in leaves. It stays on the move, eating leaves in forests.
 Generation = 5
 WildItemUncommon = MENTALHERB
-Evolutions = LEAVANNY,Happiness,
+Evolution = LEAVANNY,Happiness
 #-------------------------------
 [LEAVANNY]
 Name = Leavanny
@@ -14152,7 +14171,7 @@ Category = Centipede
 Pokedex = It discovers what is going on around it by using the feelers on its head and tail. It is brutally aggresive.
 Generation = 5
 WildItemUncommon = POISONBARB
-Evolutions = WHIRLIPEDE,Level,22
+Evolution = WHIRLIPEDE,Level,22
 #-------------------------------
 [WHIRLIPEDE]
 Name = Whirlipede
@@ -14178,7 +14197,7 @@ Category = Curlipede
 Pokedex = It is usually motionless, but when attacked, it rotates at high speed and then crashes into its opponent.
 Generation = 5
 WildItemUncommon = POISONBARB
-Evolutions = SCOLIPEDE,Level,30
+Evolution = SCOLIPEDE,Level,30
 #-------------------------------
 [SCOLIPEDE]
 Name = Scolipede
@@ -14229,7 +14248,7 @@ Shape = Head
 Category = Cotton Puff
 Pokedex = They go wherever the wind takes them. On rainy days, their bodies are heavier, so they take shelter beneath big trees.
 Generation = 5
-Evolutions = WHIMSICOTT,Item,SUNSTONE
+Evolution = WHIMSICOTT,Item,SUNSTONE
 #-------------------------------
 [WHIMSICOTT]
 Name = Whimsicott
@@ -14279,7 +14298,7 @@ Shape = HeadBase
 Category = Bulb
 Pokedex = Since they prefer moist, nutrient-rich soil, the areas where Petilil live are known to be good for growing plants.
 Generation = 5
-Evolutions = LILLIGANT,Item,SUNSTONE
+Evolution = LILLIGANT,Item,SUNSTONE
 #-------------------------------
 [LILLIGANT]
 Name = Lilligant
@@ -14357,7 +14376,7 @@ Shape = Quadruped
 Category = Desert Croc
 Pokedex = It moves along below the sand's surface, except for its nose and eyes. A dark membrane shields its eyes from the sun.
 Generation = 5
-Evolutions = KROKOROK,Level,29
+Evolution = KROKOROK,Level,29
 #-------------------------------
 [KROKOROK]
 Name = Krokorok
@@ -14382,7 +14401,7 @@ Shape = Quadruped
 Category = Desert Croc
 Pokedex = The special membrane covering its eyes can sense the heat of objects, so it can see its surroundings, even in darkness.
 Generation = 5
-Evolutions = KROOKODILE,Level,40
+Evolution = KROOKODILE,Level,40
 #-------------------------------
 [KROOKODILE]
 Name = Krookodile
@@ -14432,7 +14451,7 @@ Shape = Bipedal
 Category = Zen Charm
 Pokedex = Darumaka's droppings are hot, so people used to put them in their clothes to keep themselves warm.
 Generation = 5
-Evolutions = DARMANITAN,Level,35
+Evolution = DARMANITAN,Level,35
 #-------------------------------
 [DARMANITAN]
 Name = Darmanitan
@@ -14510,7 +14529,7 @@ Category = Rock Inn
 Pokedex = It makes a hole in a suitable rock. If that rock breaks, the Pokémon remains agitated until it locates a replacement.
 Generation = 5
 WildItemUncommon = HARDSTONE
-Evolutions = CRUSTLE,Level,34
+Evolution = CRUSTLE,Level,34
 #-------------------------------
 [CRUSTLE]
 Name = Crustle
@@ -14562,7 +14581,7 @@ Category = Shedding
 Pokedex = It immediately headbutts anyone that makes eye contact with it. Its skull is massively thick.
 Generation = 5
 WildItemUncommon = SHEDSHELL
-Evolutions = SCRAFTY,Level,39
+Evolution = SCRAFTY,Level,39
 #-------------------------------
 [SCRAFTY]
 Name = Scrafty
@@ -14638,7 +14657,7 @@ Category = Spirit
 Pokedex = These Pokémon arose from the spirits of people interred in graves in past ages. Each retains memories of its former life.
 Generation = 5
 WildItemUncommon = SPELLTAG
-Evolutions = COFAGRIGUS,Level,34
+Evolution = COFAGRIGUS,Level,34
 #-------------------------------
 [COFAGRIGUS]
 Name = Cofagrigus
@@ -14688,7 +14707,7 @@ Shape = Quadruped
 Category = Prototurtle
 Pokedex = About 100 million years ago, these Pokémon swam in oceans. It is thought they also went on land to attack prey.
 Generation = 5
-Evolutions = CARRACOSTA,Level,37
+Evolution = CARRACOSTA,Level,37
 #-------------------------------
 [CARRACOSTA]
 Name = Carracosta
@@ -14737,7 +14756,7 @@ Shape = Winged
 Category = First Bird
 Pokedex = Revived from a fossil, this Pokémon is thought to be the ancestor of all bird Pokémon.
 Generation = 5
-Evolutions = ARCHEOPS,Level,37
+Evolution = ARCHEOPS,Level,37
 #-------------------------------
 [ARCHEOPS]
 Name = Archeops
@@ -14787,7 +14806,7 @@ Category = Trash Bag
 Pokedex = The combination of garbage bags and industrial waste caused the chemical reaction that crated this Pokémon.
 Generation = 5
 WildItemUncommon = BLACKSLUDGE
-Evolutions = GARBODOR,Level,36
+Evolution = GARBODOR,Level,36
 #-------------------------------
 [GARBODOR]
 Name = Garbodor
@@ -14838,7 +14857,7 @@ Shape = Quadruped
 Category = Tricky Fox
 Pokedex = To protect themselves from danger, they hide their true identities by transforming into people and Pokémon.
 Generation = 5
-Evolutions = ZOROARK,Level,30
+Evolution = ZOROARK,Level,30
 #-------------------------------
 [ZOROARK]
 Name = Zoroark
@@ -14887,7 +14906,7 @@ Shape = Quadruped
 Category = Chinchilla
 Pokedex = These Pokémon prefer a tidy habitat. They are always sweeping and dusting, using their tails as brooms.
 Generation = 5
-Evolutions = CINCCINO,Item,SHINYSTONE
+Evolution = CINCCINO,Item,SHINYSTONE
 #-------------------------------
 [CINCCINO]
 Name = Cinccino
@@ -14937,7 +14956,7 @@ Shape = Bipedal
 Category = Fixation
 Pokedex = They intently observe both Trainers and Pokémon. Apparently, they are looking at something that only Gothita can see.
 Generation = 5
-Evolutions = GOTHORITA,Level,32
+Evolution = GOTHORITA,Level,32
 #-------------------------------
 [GOTHORITA]
 Name = Gothorita
@@ -14962,7 +14981,7 @@ Shape = Bipedal
 Category = Manipulate
 Pokedex = Starlight is the source of their power. At night, they mark star positions by using psychic power to float stones.
 Generation = 5
-Evolutions = GOTHITELLE,Level,41
+Evolution = GOTHITELLE,Level,41
 #-------------------------------
 [GOTHITELLE]
 Name = Gothitelle
@@ -15012,7 +15031,7 @@ Shape = Head
 Category = Cell
 Pokedex = Because their bodies are enveloped in a special liquid, they can survive in any environment.
 Generation = 5
-Evolutions = DUOSION,Level,32
+Evolution = DUOSION,Level,32
 #-------------------------------
 [DUOSION]
 Name = Duosion
@@ -15037,7 +15056,7 @@ Shape = Head
 Category = Mitosis
 Pokedex = When their brains, now divided in two, are thinking the same thoughts, these Pokémon exhibit their maximum power.
 Generation = 5
-Evolutions = REUNICLUS,Level,41
+Evolution = REUNICLUS,Level,41
 #-------------------------------
 [REUNICLUS]
 Name = Reuniclus
@@ -15087,7 +15106,7 @@ Shape = Winged
 Category = Water Bird
 Pokedex = When attacked, it uses its feathers to splash water, escaping under cover of the spray.
 Generation = 5
-Evolutions = SWANNA,Level,35
+Evolution = SWANNA,Level,35
 #-------------------------------
 [SWANNA]
 Name = Swanna
@@ -15137,7 +15156,7 @@ Shape = HeadBase
 Category = Fresh Snow
 Pokedex = This Pokémon formed from icicles bathed in energy from the morning sun. It sleeps buried in snow.
 Generation = 5
-Evolutions = VANILLISH,Level,35
+Evolution = VANILLISH,Level,35
 #-------------------------------
 [VANILLISH]
 Name = Vanillish
@@ -15162,7 +15181,7 @@ Shape = HeadBase
 Category = Icy Snow
 Pokedex = It conceals itself from enemy eyes by creating many small ice particles and hiding among them.
 Generation = 5
-Evolutions = VANILLUXE,Level,47
+Evolution = VANILLUXE,Level,47
 #-------------------------------
 [VANILLUXE]
 Name = Vanilluxe
@@ -15213,7 +15232,7 @@ Shape = Quadruped
 Category = Season
 Pokedex = The turning of the seasons changes the color and scent of this Pokémon's fur. People use it to mark the seasons.
 Generation = 5
-Evolutions = SAWSBUCK,Level,34
+Evolution = SAWSBUCK,Level,34
 #-------------------------------
 [SAWSBUCK]
 Name = Sawsbuck
@@ -15289,7 +15308,7 @@ Shape = Bipedal
 Category = Clamping
 Pokedex = When they feel threatened, they spit an acidic liquid to drive attackers away. This Pokémon targets Shelmet.
 Generation = 5
-Evolutions = ESCAVALIER,TradeSpecies,SHELMET
+Evolution = ESCAVALIER,TradeSpecies,SHELMET
 #-------------------------------
 [ESCAVALIER]
 Name = Escavalier
@@ -15341,7 +15360,7 @@ Pokedex = For some reason, this Pokémon resembles a Poké Ball. They release po
 Generation = 5
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = AMOONGUSS,Level,39
+Evolution = AMOONGUSS,Level,39
 #-------------------------------
 [AMOONGUSS]
 Name = Amoonguss
@@ -15393,7 +15412,7 @@ Shape = Multiped
 Category = Floating
 Pokedex = They paralyze prey with poison, then drag them down to their lairs, five miles below the surface.
 Generation = 5
-Evolutions = JELLICENT,Level,40
+Evolution = JELLICENT,Level,40
 #-------------------------------
 [JELLICENT]
 Name = Jellicent
@@ -15468,7 +15487,7 @@ Shape = Insectoid
 Category = Attaching
 Pokedex = They attach themselves to large-bodied Pokémon and absorb static electricity, which they store in an electric pouch.
 Generation = 5
-Evolutions = GALVANTULA,Level,36
+Evolution = GALVANTULA,Level,36
 #-------------------------------
 [GALVANTULA]
 Name = Galvantula
@@ -15518,7 +15537,7 @@ Category = Thorn Seed
 Pokedex = They stick their spikes into cave walls and absorb the minerals they find in the rock.
 Generation = 5
 WildItemUncommon = STICKYBARB
-Evolutions = FERROTHORN,Level,40
+Evolution = FERROTHORN,Level,40
 #-------------------------------
 [FERROTHORN]
 Name = Ferrothorn
@@ -15568,7 +15587,7 @@ Shape = MultiBody
 Category = Gear
 Pokedex = Interlocking two bodies and spinning around generates the energy they need to live.
 Generation = 5
-Evolutions = KLANG,Level,38
+Evolution = KLANG,Level,38
 #-------------------------------
 [KLANG]
 Name = Klang
@@ -15593,7 +15612,7 @@ Shape = MultiBody
 Category = Gear
 Pokedex = Spinning minigears are rotated at high speed and repeatedly fired away. It is dangerous if the gears don't return.
 Generation = 5
-Evolutions = KLINKLANG,Level,49
+Evolution = KLINKLANG,Level,49
 #-------------------------------
 [KLINKLANG]
 Name = Klinklang
@@ -15641,7 +15660,7 @@ Shape = Finned
 Category = EleFish
 Pokedex = These Pokémon move in schools. They have an electricity-generating organ, so they discharge electricity if in danger.
 Generation = 5
-Evolutions = EELEKTRIK,Level,39
+Evolution = EELEKTRIK,Level,39
 #-------------------------------
 [EELEKTRIK]
 Name = Eelektrik
@@ -15665,7 +15684,7 @@ Shape = Finned
 Category = EleFish
 Pokedex = These Pokémon have a big appetite. When they spot their prey, they attack it and paralyze it with electricity.
 Generation = 5
-Evolutions = EELEKTROSS,Item,THUNDERSTONE
+Evolution = EELEKTROSS,Item,THUNDERSTONE
 #-------------------------------
 [EELEKTROSS]
 Name = Eelektross
@@ -15714,7 +15733,7 @@ Shape = BipedalTail
 Category = Cerebral
 Pokedex = This Pokémon had never been seen until it appeared from far in the desert 50 years ago.
 Generation = 5
-Evolutions = BEHEEYEM,Level,42
+Evolution = BEHEEYEM,Level,42
 #-------------------------------
 [BEHEEYEM]
 Name = Beheeyem
@@ -15764,7 +15783,7 @@ Shape = HeadBase
 Category = Candle
 Pokedex = While shining a light and pretending to be a guide, it leeches off the life force of any who follow it.
 Generation = 5
-Evolutions = LAMPENT,Level,41
+Evolution = LAMPENT,Level,41
 #-------------------------------
 [LAMPENT]
 Name = Lampent
@@ -15789,7 +15808,7 @@ Shape = HeadArms
 Category = Lamp
 Pokedex = It arrives near the moment of death and steals spirit from the body.
 Generation = 5
-Evolutions = CHANDELURE,Item,DUSKSTONE
+Evolution = CHANDELURE,Item,DUSKSTONE
 #-------------------------------
 [CHANDELURE]
 Name = Chandelure
@@ -15839,7 +15858,7 @@ Shape = BipedalTail
 Category = Tusk
 Pokedex = They mark their territory by leaving gashes in trees with their tusks. If a tusk breaks, a new one grows in quickly.
 Generation = 5
-Evolutions = FRAXURE,Level,38
+Evolution = FRAXURE,Level,38
 #-------------------------------
 [FRAXURE]
 Name = Fraxure
@@ -15864,7 +15883,7 @@ Shape = BipedalTail
 Category = Axe Jaw
 Pokedex = Their tusks can shatter rocks. Territory battles between Fraxure can be intensely violent.
 Generation = 5
-Evolutions = HAXORUS,Level,48
+Evolution = HAXORUS,Level,48
 #-------------------------------
 [HAXORUS]
 Name = Haxorus
@@ -15914,7 +15933,7 @@ Shape = BipedalTail
 Category = Chill
 Pokedex = Its nose is always running. It sniffs the snot back up because the mucus provides the raw material for its moves.
 Generation = 5
-Evolutions = BEARTIC,Level,37
+Evolution = BEARTIC,Level,37
 #-------------------------------
 [BEARTIC]
 Name = Beartic
@@ -15988,7 +16007,7 @@ Shape = Head
 Category = Snail
 Pokedex = It evolves when bathed in an electric-like energy along with Karrablast. The reason is still unknown.
 Generation = 5
-Evolutions = ACCELGOR,TradeSpecies,KARRABLAST
+Evolution = ACCELGOR,TradeSpecies,KARRABLAST
 #-------------------------------
 [ACCELGOR]
 Name = Accelgor
@@ -16064,7 +16083,7 @@ Shape = BipedalTail
 Category = Martial Arts
 Pokedex = They have mastered elegant combos. As they concentrate, their battle moves become swifter and more precise.
 Generation = 5
-Evolutions = MIENSHAO,Level,50
+Evolution = MIENSHAO,Level,50
 #-------------------------------
 [MIENSHAO]
 Name = Mienshao
@@ -16140,7 +16159,7 @@ Category = Automaton
 Pokedex = These Pokémon are thought to have been created by the science of an ancient and mysterious civilization.
 Generation = 5
 WildItemUncommon = LIGHTCLAY
-Evolutions = GOLURK,Level,43
+Evolution = GOLURK,Level,43
 #-------------------------------
 [GOLURK]
 Name = Golurk
@@ -16191,7 +16210,7 @@ Shape = Bipedal
 Category = Sharp Blade
 Pokedex = They fight at Bisharp's command. They cling to their prey and inflict damage by sinking their blades into it.
 Generation = 5
-Evolutions = BISHARP,Level,52
+Evolution = BISHARP,Level,52
 #-------------------------------
 [BISHARP]
 Name = Bisharp
@@ -16265,7 +16284,7 @@ Shape = Winged
 Category = Eaglet
 Pokedex = They will challenge anything, even strong opponents, without fear. Their frequent fights help them become stronger.
 Generation = 5
-Evolutions = BRAVIARY,Level,54
+Evolution = BRAVIARY,Level,54
 #-------------------------------
 [BRAVIARY]
 Name = Braviary
@@ -16315,7 +16334,7 @@ Shape = Winged
 Category = Diapered
 Pokedex = They tend to guard their posteriors with suitable bones they have found. They pursue weak Pokémon.
 Generation = 5
-Evolutions = MANDIBUZZ,Level,54
+Evolution = MANDIBUZZ,Level,54
 #-------------------------------
 [MANDIBUZZ]
 Name = Mandibuzz
@@ -16414,7 +16433,7 @@ Shape = Quadruped
 Category = Irate
 Pokedex = They cannot see, so they tackle and bite to learn about their surroundings. Their bodies are covered in wounds.
 Generation = 5
-Evolutions = ZWEILOUS,Level,50
+Evolution = ZWEILOUS,Level,50
 #-------------------------------
 [ZWEILOUS]
 Name = Zweilous
@@ -16438,7 +16457,7 @@ Shape = Quadruped
 Category = Hostile
 Pokedex = Since their two heads do not get along and compete with each other for food, they always eat too much.
 Generation = 5
-Evolutions = HYDREIGON,Level,64
+Evolution = HYDREIGON,Level,64
 #-------------------------------
 [HYDREIGON]
 Name = Hydreigon
@@ -16487,7 +16506,7 @@ Shape = Insectoid
 Category = Torch
 Pokedex = The base of volcanoes is where they make their homes. They shoot fire from their five horns to repel attacking enemies.
 Generation = 5
-Evolutions = VOLCARONA,Level,59
+Evolution = VOLCARONA,Level,59
 #-------------------------------
 [VOLCARONA]
 Name = Volcarona
@@ -16840,7 +16859,7 @@ Shape = BipedalTail
 Category = Spiny Nut
 Pokedex = The quills on its head are usually soft. When it flexes them, the points become so hard and sharp that they can pierce rock.
 Generation = 6
-Evolutions = QUILLADIN,Level,16
+Evolution = QUILLADIN,Level,16
 #-------------------------------
 [QUILLADIN]
 Name = Quilladin
@@ -16865,7 +16884,7 @@ Shape = BipedalTail
 Category = Spiny Armor
 Pokedex = They strengthen their lower bodies by running into one another. They are very kind and won't start fights.
 Generation = 6
-Evolutions = CHESNAUGHT,Level,36
+Evolution = CHESNAUGHT,Level,36
 #-------------------------------
 [CHESNAUGHT]
 Name = Chesnaught
@@ -16915,7 +16934,7 @@ Shape = Quadruped
 Category = Fox
 Pokedex = As it walks, it munches on a twig in place of a snack. It intimidates opponents by puffing hot air out of its ears.
 Generation = 6
-Evolutions = BRAIXEN,Level,16
+Evolution = BRAIXEN,Level,16
 #-------------------------------
 [BRAIXEN]
 Name = Braixen
@@ -16940,7 +16959,7 @@ Shape = BipedalTail
 Category = Fox
 Pokedex = When the twig is plucked from its tail, friction sets the twig alight. The flame is used to send signals to its allies.
 Generation = 6
-Evolutions = DELPHOX,Level,36
+Evolution = DELPHOX,Level,36
 #-------------------------------
 [DELPHOX]
 Name = Delphox
@@ -16990,7 +17009,7 @@ Shape = Quadruped
 Category = Bubble Frog
 Pokedex = It protects its skin by covering its body in delicate bubbles. Beneath its happy-go-lucky air, it keeps a watchful eye on its surroundings.
 Generation = 6
-Evolutions = FROGADIER,Level,16
+Evolution = FROGADIER,Level,16
 #-------------------------------
 [FROGADIER]
 Name = Frogadier
@@ -17015,7 +17034,7 @@ Shape = Bipedal
 Category = Bubble Frog
 Pokedex = It can throw bubble-covered pebbles with precise control, hitting empty cans up to a hundred feet away.
 Generation = 6
-Evolutions = GRENINJA,Level,36
+Evolution = GRENINJA,Level,36
 #-------------------------------
 [GRENINJA]
 Name = Greninja
@@ -17065,7 +17084,7 @@ Shape = BipedalTail
 Category = Digging
 Pokedex = It has ears like shovels. Digging holes strengthens its ears so much that they can sever thick roots effortlessly.
 Generation = 6
-Evolutions = DIGGERSBY,Level,20
+Evolution = DIGGERSBY,Level,20
 #-------------------------------
 [DIGGERSBY]
 Name = Diggersby
@@ -17115,7 +17134,7 @@ Shape = Winged
 Category = Tiny Robin
 Pokedex = These friendly Pokémon send signals to one another with beautiful chirps and tail-feather movements.
 Generation = 6
-Evolutions = FLETCHINDER,Level,17
+Evolution = FLETCHINDER,Level,17
 #-------------------------------
 [FLETCHINDER]
 Name = Fletchinder
@@ -17140,7 +17159,7 @@ Shape = Winged
 Category = Ember
 Pokedex = From its beak, it expels embers that set the tall grass on fire. Then it pounces on the bewildered prey that pop out of the grass.
 Generation = 6
-Evolutions = TALONFLAME,Level,35
+Evolution = TALONFLAME,Level,35
 #-------------------------------
 [TALONFLAME]
 Name = Talonflame
@@ -17190,7 +17209,7 @@ Shape = Insectoid
 Category = Scatterdust
 Pokedex = When under attack from bird Pokémon, it spews a poisonous black powder that causes paralysis on contact.
 Generation = 6
-Evolutions = SPEWPA,Level,9
+Evolution = SPEWPA,Level,9
 #-------------------------------
 [SPEWPA]
 Name = Spewpa
@@ -17215,7 +17234,7 @@ Shape = HeadBase
 Category = Scatterdust
 Pokedex = It lives hidden within thicket shadows. When predators attack, it quickly bristles the fur covering its body in an effort to threaten them.
 Generation = 6
-Evolutions = VIVILLON,Level,12
+Evolution = VIVILLON,Level,12
 #-------------------------------
 [VIVILLON]
 Name = Vivillon
@@ -17266,7 +17285,7 @@ Shape = Quadruped
 Category = Lion Cub
 Pokedex = They set off on their own from their pride and live by themselves to become stronger. These hot-blooded Pokémon are quick to fight.
 Generation = 6
-Evolutions = PYROAR,Level,35
+Evolution = PYROAR,Level,35
 #-------------------------------
 [PYROAR]
 Name = Pyroar
@@ -17318,7 +17337,7 @@ Category = Single Bloom
 Pokedex = When it finds a flower it likes, it dwells on that flower its whole life long. It floats in the wind's embrace with an untroubled heart.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = FLOETTE,Level,19
+Evolution = FLOETTE,Level,19
 #-------------------------------
 [FLOETTE]
 Name = Floette
@@ -17345,7 +17364,7 @@ Category = Single Bloom
 Pokedex = It flutters around fields of flowers and cares for flowers that are starting to wilt. It draws out the power of flowers to battle.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = FLORGES,Item,SHINYSTONE
+Evolution = FLORGES,Item,SHINYSTONE
 #-------------------------------
 [FLORGES]
 Name = Florges
@@ -17397,7 +17416,7 @@ Shape = Quadruped
 Category = Mount
 Pokedex = If it has sunshine and water, it doesn't need to eat, because it can generate energy from the leaves on its back.
 Generation = 6
-Evolutions = GOGOAT,Level,32
+Evolution = GOGOAT,Level,32
 #-------------------------------
 [GOGOAT]
 Name = Gogoat
@@ -17448,7 +17467,7 @@ Category = Playful
 Pokedex = It does its best to be taken seriously by its enemies, but its glare is not sufficiently intimidating. Chewing on a leaf is its trademark.
 Generation = 6
 WildItemUncommon = MENTALHERB
-Evolutions = PANGORO,LevelDarkInParty,32
+Evolution = PANGORO,LevelDarkInParty,32
 #-------------------------------
 [PANGORO]
 Name = Pangoro
@@ -17524,7 +17543,7 @@ Shape = BipedalTail
 Category = Restraint
 Pokedex = The organ that emits its intense psychic power is sheltered by its ears to keep power from leaking out.
 Generation = 6
-Evolutions = MEOWSTIC,Level,25
+Evolution = MEOWSTIC,Level,25
 #-------------------------------
 [MEOWSTIC]
 Name = Meowstic
@@ -17574,7 +17593,7 @@ Shape = HeadBase
 Category = Sword
 Pokedex = Apparently this Pokémon is born when a departed spirit inhabits a sword. It attaches itself to people and drinks their life force.
 Generation = 6
-Evolutions = DOUBLADE,Level,35
+Evolution = DOUBLADE,Level,35
 #-------------------------------
 [DOUBLADE]
 Name = Doublade
@@ -17598,7 +17617,7 @@ Shape = MultiBody
 Category = Sword
 Pokedex = The complex attack patterns of its two swords are unstoppable, even for an opponent greatly accomplished at swordplay.
 Generation = 6
-Evolutions = AEGISLASH,Item,DUSKSTONE
+Evolution = AEGISLASH,Item,DUSKSTONE
 #-------------------------------
 [AEGISLASH]
 Name = Aegislash
@@ -17648,7 +17667,7 @@ Shape = HeadArms
 Category = Perfume
 Pokedex = It emits a scent that enraptures those who smell it. This fragrance changes depending on what it has eaten.
 Generation = 6
-Evolutions = AROMATISSE,TradeItem,SACHET
+Evolution = AROMATISSE,TradeItem,SACHET
 #-------------------------------
 [AROMATISSE]
 Name = Aromatisse
@@ -17698,7 +17717,7 @@ Shape = HeadLegs
 Category = Cotton Candy
 Pokedex = To entangle its opponents in battle, it extrudes white threads as sweet and sticky as cotton candy.
 Generation = 6
-Evolutions = SLURPUFF,TradeItem,WHIPPEDDREAM
+Evolution = SLURPUFF,TradeItem,WHIPPEDDREAM
 #-------------------------------
 [SLURPUFF]
 Name = Slurpuff
@@ -17748,7 +17767,7 @@ Shape = Multiped
 Category = Revolving
 Pokedex = It flashes the light-emitting spots on its body, which drains its opponent's will to fight. It takes the opportunity to scuttle away and hide.
 Generation = 6
-Evolutions = MALAMAR,Level,30
+Evolution = MALAMAR,Level,30
 #-------------------------------
 [MALAMAR]
 Name = Malamar
@@ -17798,7 +17817,7 @@ Shape = MultiBody
 Category = Two-Handed
 Pokedex = They stretch and then contract, yanking their rocks along with them in bold hops. They eat seaweed that washes up on the shoreline.
 Generation = 6
-Evolutions = BARBARACLE,Level,39
+Evolution = BARBARACLE,Level,39
 #-------------------------------
 [BARBARACLE]
 Name = Barbaracle
@@ -17848,7 +17867,7 @@ Shape = HeadBase
 Category = Mock Kelp
 Pokedex = Camouflaged as rotten kelp, they spray liquid poison on prey that approaches unawares and then finish it off.
 Generation = 6
-Evolutions = DRAGALGE,Level,48
+Evolution = DRAGALGE,Level,48
 #-------------------------------
 [DRAGALGE]
 Name = Dragalge
@@ -17897,7 +17916,7 @@ Shape = Insectoid
 Category = Water Gun
 Pokedex = Through controlled expulsions of internal gas, it can expel water like a pistol shot. At close distances, it can shatter rock.
 Generation = 6
-Evolutions = CLAWITZER,Level,37
+Evolution = CLAWITZER,Level,37
 #-------------------------------
 [CLAWITZER]
 Name = Clawitzer
@@ -17946,7 +17965,7 @@ Shape = BipedalTail
 Category = Generator
 Pokedex = They make their home in deserts. They can generate their energy from basking in the sun, so eating food is not a requirement.
 Generation = 6
-Evolutions = HELIOLISK,Item,SUNSTONE
+Evolution = HELIOLISK,Item,SUNSTONE
 #-------------------------------
 [HELIOLISK]
 Name = Heliolisk
@@ -17996,7 +18015,7 @@ Shape = BipedalTail
 Category = Royal Heir
 Pokedex = Its immense jaws have enough destructive force that it can chew up an automobile. It lived 100 million years ago.
 Generation = 6
-Evolutions = TYRANTRUM,LevelDay,39
+Evolution = TYRANTRUM,LevelDay,39
 #-------------------------------
 [TYRANTRUM]
 Name = Tyrantrum
@@ -18046,7 +18065,7 @@ Shape = Quadruped
 Category = Tundra
 Pokedex = This ancient Pokémon was restored from part of its body that had been frozen in ice for over 100 million years.
 Generation = 6
-Evolutions = AURORUS,LevelNight,39
+Evolution = AURORUS,LevelNight,39
 #-------------------------------
 [AURORUS]
 Name = Aurorus
@@ -18195,7 +18214,7 @@ Shape = Serpentine
 Category = Soft Tissue
 Pokedex = Its source of protection is its slimy, germ-laden mucous membrane. Anyone who touches it needs some thorough hand-washing.
 Generation = 6
-Evolutions = SLIGGOO,Level,40
+Evolution = SLIGGOO,Level,40
 #-------------------------------
 [SLIGGOO]
 Name = Sliggoo
@@ -18220,7 +18239,7 @@ Shape = Serpentine
 Category = Soft Tissue
 Pokedex = This Pokémon's mucous can dissolve anything. Toothless, it sprays mucous on its prey. Once they're nicely dissolved, it slurps them up.
 Generation = 6
-Evolutions = GOODRA,LevelRain,50
+Evolution = GOODRA,LevelRain,50
 #-------------------------------
 [GOODRA]
 Name = Goodra
@@ -18295,7 +18314,7 @@ Shape = HeadArms
 Category = Stump
 Pokedex = These Pokémon are stumps possessed by the spirits of children who died in the forest. Their cries sound like eerie screams.
 Generation = 6
-Evolutions = TREVENANT,Trade,
+Evolution = TREVENANT,Trade
 #-------------------------------
 [TREVENANT]
 Name = Trevenant
@@ -18346,7 +18365,7 @@ Category = Pumpkin
 Pokedex = The pumpkin body is inhabited by a spirit trapped in this world. As the sun sets, it becomes restless and active.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = GOURGEIST,Trade,
+Evolution = GOURGEIST,Trade
 #-------------------------------
 [GOURGEIST]
 Name = Gourgeist
@@ -18397,7 +18416,7 @@ Shape = Quadruped
 Category = Ice Chunk
 Pokedex = It blocks opponents' attacks with the ice that shields its body. It uses cold air to repair any cracks with new ice.
 Generation = 6
-Evolutions = AVALUGG,Level,37
+Evolution = AVALUGG,Level,37
 #-------------------------------
 [AVALUGG]
 Name = Avalugg
@@ -18447,7 +18466,7 @@ Shape = Winged
 Category = Sound Wave
 Pokedex = Even a robust wrestler will become dizzy and unable to stand when exposed to its 200,000-hertz ultrasonic waves.
 Generation = 6
-Evolutions = NOIVERN,Level,48
+Evolution = NOIVERN,Level,48
 #-------------------------------
 [NOIVERN]
 Name = Noivern
diff --git a/PBS/Gen 6 backup/pokemon_forms.txt b/PBS/Gen 6 backup/pokemon_forms.txt
index f49dec13f..5959aa278 100644
--- a/PBS/Gen 6 backup/pokemon_forms.txt	
+++ b/PBS/Gen 6 backup/pokemon_forms.txt	
@@ -168,7 +168,7 @@ Generation = 6
 [PICHU,2]
 FormName = Spiky-Eared
 Generation = 4
-Evolutions = PIKACHU,None,
+Evolution = PIKACHU,None
 #-------------------------------
 [AMPHAROS,1]
 FormName = Mega Ampharos
@@ -1003,7 +1003,7 @@ BaseExp = 243
 Moves = 1,TACKLE,1,VINEWHIP,6,FAIRYWIND,10,LUCKYCHANT,15,RAZORLEAF,20,WISH,25,MAGICALLEAF,27,GRASSYTERRAIN,33,PETALBLIZZARD,38,AROMATHERAPY,43,MISTYTERRAIN,46,MOONBLAST,50,LIGHTOFRUIN,51,PETALDANCE,58,SOLARBEAM
 EggGroups = Undiscovered
 Pokedex = The flower it's holding can no longer be found blooming anywhere. It's also thought to contain terrifying power.
-Evolutions = FLORGES,None,
+Evolution = FLORGES,None
 #-------------------------------
 [FLORGES,1]
 FormName = Yellow Flower
diff --git a/PBS/Gen 7 backup/pokemon.txt b/PBS/Gen 7 backup/pokemon.txt
index ec7488714..7c350017c 100644
--- a/PBS/Gen 7 backup/pokemon.txt	
+++ b/PBS/Gen 7 backup/pokemon.txt	
@@ -25,7 +25,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = Bulbasaur can be seen napping in bright sunlight. There is a seed on its back. By soaking up the sun's rays, the seed grows progressively larger.
 Generation = 1
-Evolutions = IVYSAUR,Level,16
+Evolution = IVYSAUR,Level,16
 #-------------------------------
 [IVYSAUR]
 Name = Ivysaur
@@ -51,7 +51,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = To support its bulb, Ivysaur's legs grow sturdy. If it spends more time lying in the sunlight, the bud will soon bloom into a large flower.
 Generation = 1
-Evolutions = VENUSAUR,Level,32
+Evolution = VENUSAUR,Level,32
 #-------------------------------
 [VENUSAUR]
 Name = Venusaur
@@ -103,7 +103,7 @@ Habitat = Mountain
 Category = Lizard
 Pokedex = The flame that burns at the tip of its tail is an indication of its emotions. The flame wavers when Charmander is happy, and blazes when it is enraged.
 Generation = 1
-Evolutions = CHARMELEON,Level,16
+Evolution = CHARMELEON,Level,16
 #-------------------------------
 [CHARMELEON]
 Name = Charmeleon
@@ -129,7 +129,7 @@ Habitat = Mountain
 Category = Flame
 Pokedex = Without pity, its sharp claws destroy foes. If it encounters a strong enemy, it becomes agitated, and the flame on its tail flares with a bluish white color.
 Generation = 1
-Evolutions = CHARIZARD,Level,36
+Evolution = CHARIZARD,Level,36
 #-------------------------------
 [CHARIZARD]
 Name = Charizard
@@ -181,7 +181,7 @@ Habitat = WatersEdge
 Category = Tiny Turtle
 Pokedex = Its shell is not just for protection. Its rounded shape and the grooves on its surface minimize resistance in water, enabling Squirtle to swim at high speeds.
 Generation = 1
-Evolutions = WARTORTLE,Level,16
+Evolution = WARTORTLE,Level,16
 #-------------------------------
 [WARTORTLE]
 Name = Wartortle
@@ -207,7 +207,7 @@ Habitat = WatersEdge
 Category = Turtle
 Pokedex = Its large tail is covered with rich, thick fur that deepens in color with age. The scratches on its shell are evidence of this Pokémon's toughness in battle.
 Generation = 1
-Evolutions = BLASTOISE,Level,36
+Evolution = BLASTOISE,Level,36
 #-------------------------------
 [BLASTOISE]
 Name = Blastoise
@@ -258,7 +258,7 @@ Habitat = Forest
 Category = Worm
 Pokedex = Its voracious appetite compels it to devour leaves bigger than itself without hesitation. It releases a terribly strong odor from its antennae.
 Generation = 1
-Evolutions = METAPOD,Level,7
+Evolution = METAPOD,Level,7
 #-------------------------------
 [METAPOD]
 Name = Metapod
@@ -283,7 +283,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = Its shell is as hard as an iron slab. A Metapod does not move very much because it is preparing its soft innards for evolution inside the shell.
 Generation = 1
-Evolutions = BUTTERFREE,Level,10
+Evolution = BUTTERFREE,Level,10
 #-------------------------------
 [BUTTERFREE]
 Name = Butterfree
@@ -335,7 +335,7 @@ Habitat = Forest
 Category = Hairy Bug
 Pokedex = A Weedle has an extremely acute sense of smell. It distinguishes its favorite kinds of leaves from those it dislikes by sniffing with its big red proboscis (nose).
 Generation = 1
-Evolutions = KAKUNA,Level,7
+Evolution = KAKUNA,Level,7
 #-------------------------------
 [KAKUNA]
 Name = Kakuna
@@ -360,7 +360,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = It remains virtually immobile while it clings to a tree. However, on the inside, it busily prepares for evolution. This is evident from how hot its shell becomes.
 Generation = 1
-Evolutions = BEEDRILL,Level,10
+Evolution = BEEDRILL,Level,10
 #-------------------------------
 [BEEDRILL]
 Name = Beedrill
@@ -413,7 +413,7 @@ Habitat = Forest
 Category = Tiny Bird
 Pokedex = It has an extremely sharp sense of direction. It can unerringly return home to its nest, however far it may be removed from its familiar surroundings.
 Generation = 1
-Evolutions = PIDGEOTTO,Level,18
+Evolution = PIDGEOTTO,Level,18
 #-------------------------------
 [PIDGEOTTO]
 Name = Pidgeotto
@@ -439,7 +439,7 @@ Habitat = Forest
 Category = Bird
 Pokedex = This Pokémon flies around, patrolling its large territory. If its living space is violated, it shows no mercy in thoroughly punishing the foe with its sharp claws.
 Generation = 1
-Evolutions = PIDGEOT,Level,36
+Evolution = PIDGEOT,Level,36
 #-------------------------------
 [PIDGEOT]
 Name = Pidgeot
@@ -492,7 +492,7 @@ Category = Mouse
 Pokedex = A Rattata is cautious in the extreme. Even while it is asleep, it constantly moves its ears and listens for danger. It will make its nest anywhere.
 Generation = 1
 WildItemUncommon = CHILANBERRY
-Evolutions = RATICATE,Level,20
+Evolution = RATICATE,Level,20
 #-------------------------------
 [RATICATE]
 Name = Raticate
@@ -546,7 +546,7 @@ Category = Tiny Bird
 Pokedex = Its loud cry can be heard over half a mile away. If its high, keening cry is heard echoing all around, it is a sign that they are warning each other of danger.
 Generation = 1
 WildItemUncommon = SHARPBEAK
-Evolutions = FEAROW,Level,20
+Evolution = FEAROW,Level,20
 #-------------------------------
 [FEAROW]
 Name = Fearow
@@ -599,7 +599,7 @@ Habitat = Grassland
 Category = Snake
 Pokedex = An Ekans curls itself up in a spiral while it rests. This position allows it to quickly respond to an enemy from any direction with a threat from its upraised head.
 Generation = 1
-Evolutions = ARBOK,Level,22
+Evolution = ARBOK,Level,22
 #-------------------------------
 [ARBOK]
 Name = Arbok
@@ -651,7 +651,7 @@ Category = Mouse
 Pokedex = It stores electricity in the electric sacs on its cheeks. When it releases pent-up energy in a burst, the electric power is equal to a lightning bolt.
 Generation = 1
 WildItemUncommon = LIGHTBALL
-Evolutions = RAICHU,Item,THUNDERSTONE
+Evolution = RAICHU,Item,THUNDERSTONE
 #-------------------------------
 [RAICHU]
 Name = Raichu
@@ -704,7 +704,7 @@ Category = Mouse
 Pokedex = When it curls up in a ball, it can make any attack bounce off harmlessly. Its hide has turned tough and solid as a result of living in the desert.
 Generation = 1
 WildItemUncommon = GRIPCLAW
-Evolutions = SANDSLASH,Level,22
+Evolution = SANDSLASH,Level,22
 #-------------------------------
 [SANDSLASH]
 Name = Sandslash
@@ -758,7 +758,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = Its highly toxic barbs are thought to have developed as protection for this small-bodied Pokémon. When enraged, it releases a horrible toxin from its horn.
 Generation = 1
-Evolutions = NIDORINA,Level,16
+Evolution = NIDORINA,Level,16
 #-------------------------------
 [NIDORINA]
 Name = Nidorina
@@ -784,7 +784,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = When it is with its friends or family, its barbs are tucked away to prevent injury. It appears to become nervous if separated from the others.
 Generation = 1
-Evolutions = NIDOQUEEN,Item,MOONSTONE
+Evolution = NIDOQUEEN,Item,MOONSTONE
 #-------------------------------
 [NIDOQUEEN]
 Name = Nidoqueen
@@ -837,7 +837,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = The male Nidoran has developed muscles that freely move its ears in any direction. Even the slightest sound does not escape this Pokémon's notice.
 Generation = 1
-Evolutions = NIDORINO,Level,16
+Evolution = NIDORINO,Level,16
 #-------------------------------
 [NIDORINO]
 Name = Nidorino
@@ -863,7 +863,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = Its horn is harder than a diamond. If it senses a hostile presence, all the barbs on its back bristle up at once, and it challenges the foe with all its might.
 Generation = 1
-Evolutions = NIDOKING,Item,MOONSTONE
+Evolution = NIDOKING,Item,MOONSTONE
 #-------------------------------
 [NIDOKING]
 Name = Nidoking
@@ -915,7 +915,7 @@ Category = Fairy
 Pokedex = On every night of a full moon, they come out to play. When dawn arrives, the tired Clefairy go to sleep nestled up against each other in deep and quiet mountains.
 Generation = 1
 WildItemUncommon = MOONSTONE
-Evolutions = CLEFABLE,Item,MOONSTONE
+Evolution = CLEFABLE,Item,MOONSTONE
 #-------------------------------
 [CLEFABLE]
 Name = Clefable
@@ -969,7 +969,7 @@ Category = Fox
 Pokedex = It can freely control fire, making fiery orbs fly like will-o'-the-wisps. Just before evolution, its six tails grow hot as if on fire.
 Generation = 1
 WildItemUncommon = CHARCOAL
-Evolutions = NINETALES,Item,FIRESTONE
+Evolution = NINETALES,Item,FIRESTONE
 #-------------------------------
 [NINETALES]
 Name = Ninetales
@@ -1022,7 +1022,7 @@ Category = Balloon
 Pokedex = Nothing can avoid falling asleep hearing a Jigglypuff's song. The sound waves of its singing voice match the brain waves of someone in a deep sleep.
 Generation = 1
 WildItemUncommon = MOONSTONE
-Evolutions = WIGGLYTUFF,Item,MOONSTONE
+Evolution = WIGGLYTUFF,Item,MOONSTONE
 #-------------------------------
 [WIGGLYTUFF]
 Name = Wigglytuff
@@ -1075,7 +1075,7 @@ Habitat = Cave
 Category = Bat
 Pokedex = While living in pitch-black caverns, their eyes gradually grew shut and deprived them of vision. They use ultrasonic waves to detect obstacles.
 Generation = 1
-Evolutions = GOLBAT,Level,22
+Evolution = GOLBAT,Level,22
 #-------------------------------
 [GOLBAT]
 Name = Golbat
@@ -1101,7 +1101,7 @@ Habitat = Cave
 Category = Bat
 Pokedex = Its fangs easily puncture even thick animal hide. It loves to feast on the blood of people and Pokémon. It flits about in darkness and strikes from behind.
 Generation = 1
-Evolutions = CROBAT,Happiness,
+Evolution = CROBAT,Happiness
 #-------------------------------
 [ODDISH]
 Name = Oddish
@@ -1129,7 +1129,7 @@ Category = Weed
 Pokedex = It grows by absorbing moonlight. During the daytime, it buries itself in the ground, leaving only its leaves exposed to avoid detection by its enemies.
 Generation = 1
 WildItemUncommon = ABSORBBULB
-Evolutions = GLOOM,Level,21
+Evolution = GLOOM,Level,21
 #-------------------------------
 [GLOOM]
 Name = Gloom
@@ -1156,7 +1156,8 @@ Category = Weed
 Pokedex = A horribly noxious honey drools from its mouth. One whiff of the honey can result in memory loss. Some fans are said to enjoy this overwhelming stink, however.
 Generation = 1
 WildItemUncommon = ABSORBBULB
-Evolutions = VILEPLUME,Item,LEAFSTONE,BELLOSSOM,Item,SUNSTONE
+Evolution = VILEPLUME,Item,LEAFSTONE
+Evolution = BELLOSSOM,Item,SUNSTONE
 #-------------------------------
 [VILEPLUME]
 Name = Vileplume
@@ -1211,7 +1212,7 @@ Pokedex = A Paras has parasitic tochukaso mushrooms growing on its back. They gr
 Generation = 1
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = PARASECT,Level,24
+Evolution = PARASECT,Level,24
 #-------------------------------
 [PARASECT]
 Name = Parasect
@@ -1265,7 +1266,7 @@ Habitat = Forest
 Category = Insect
 Pokedex = Its coat of thin, stiff hair that covers its entire body is said to have evolved for protection. Its large eyes never fail to spot even miniscule prey.
 Generation = 1
-Evolutions = VENOMOTH,Level,31
+Evolution = VENOMOTH,Level,31
 #-------------------------------
 [VENOMOTH]
 Name = Venomoth
@@ -1319,7 +1320,7 @@ Category = Mole
 Pokedex = Diglett are raised in most farms. The reason is simple--wherever they burrow, the soil is left perfectly tilled for growing delicious crops.
 Generation = 1
 WildItemUncommon = SOFTSAND
-Evolutions = DUGTRIO,Level,26
+Evolution = DUGTRIO,Level,26
 #-------------------------------
 [DUGTRIO]
 Name = Dugtrio
@@ -1373,7 +1374,7 @@ Category = Scratch Cat
 Pokedex = Meowth withdraw their sharp claws into their paws to silently sneak about. For some reason, this Pokémon loves shiny coins that glitter with light.
 Generation = 1
 WildItemUncommon = QUICKCLAW
-Evolutions = PERSIAN,Level,28
+Evolution = PERSIAN,Level,28
 #-------------------------------
 [PERSIAN]
 Name = Persian
@@ -1426,7 +1427,7 @@ Habitat = WatersEdge
 Category = Duck
 Pokedex = When its headache intensifies, it starts using strange powers. However, it has no recollection of its powers, so it always looks befuddled and bewildered.
 Generation = 1
-Evolutions = GOLDUCK,Level,33
+Evolution = GOLDUCK,Level,33
 #-------------------------------
 [GOLDUCK]
 Name = Golduck
@@ -1478,7 +1479,7 @@ Habitat = Mountain
 Category = Pig Monkey
 Pokedex = When it starts shaking and its nasal breathing turns rough, it's a sure sign of anger. However, since this happens instantly, there is no time to flee.
 Generation = 1
-Evolutions = PRIMEAPE,Level,28
+Evolution = PRIMEAPE,Level,28
 #-------------------------------
 [PRIMEAPE]
 Name = Primeape
@@ -1530,7 +1531,7 @@ Habitat = Grassland
 Category = Puppy
 Pokedex = Its superb sense of smell ensures that this Pokémon won't forget any scent, no matter what. It uses its sense of smell to detect the emotions of others.
 Generation = 1
-Evolutions = ARCANINE,Item,FIRESTONE
+Evolution = ARCANINE,Item,FIRESTONE
 #-------------------------------
 [ARCANINE]
 Name = Arcanine
@@ -1582,7 +1583,7 @@ Habitat = WatersEdge
 Category = Tadpole
 Pokedex = It is possible to see this Pokémon's spiral innards right through its thin skin. However, the skin is also very flexible. Even sharp fangs bounce right off it.
 Generation = 1
-Evolutions = POLIWHIRL,Level,25
+Evolution = POLIWHIRL,Level,25
 #-------------------------------
 [POLIWHIRL]
 Name = Poliwhirl
@@ -1609,7 +1610,8 @@ Category = Tadpole
 Pokedex = Its body surface is always wet and slick with an oily fluid. Because of this greasy covering, it can easily slip and slide out of the clutches of any enemy in battle.
 Generation = 1
 WildItemUncommon = KINGSROCK
-Evolutions = POLIWRATH,Item,WATERSTONE,POLITOED,TradeItem,KINGSROCK
+Evolution = POLIWRATH,Item,WATERSTONE
+Evolution = POLITOED,TradeItem,KINGSROCK
 #-------------------------------
 [POLIWRATH]
 Name = Poliwrath
@@ -1663,7 +1665,7 @@ Category = Psi
 Pokedex = A Pokémon that sleeps 18 hours a day. Observation revealed that it uses Teleport to change its location once every hour.
 Generation = 1
 WildItemUncommon = TWISTEDSPOON
-Evolutions = KADABRA,Level,16
+Evolution = KADABRA,Level,16
 #-------------------------------
 [KADABRA]
 Name = Kadabra
@@ -1690,7 +1692,7 @@ Category = Psi
 Pokedex = It is rumored that a boy with psychic abilities suddenly transformed into Kadabra while he was assisting research into extrasensory powers.
 Generation = 1
 WildItemUncommon = TWISTEDSPOON
-Evolutions = ALAKAZAM,Trade,
+Evolution = ALAKAZAM,Trade
 #-------------------------------
 [ALAKAZAM]
 Name = Alakazam
@@ -1744,7 +1746,7 @@ Category = Superpower
 Pokedex = It continually undertakes strenuous training to master all forms of martial arts. Its strength lets it easily hoist a sumo wrestler onto its shoulders.
 Generation = 1
 WildItemUncommon = FOCUSBAND
-Evolutions = MACHOKE,Level,28
+Evolution = MACHOKE,Level,28
 #-------------------------------
 [MACHOKE]
 Name = Machoke
@@ -1771,7 +1773,7 @@ Category = Superpower
 Pokedex = A belt is worn by a Machoke to keep its overwhelming power under control. Because it is so dangerous, no one has ever removed the belt.
 Generation = 1
 WildItemUncommon = FOCUSBAND
-Evolutions = MACHAMP,Trade,
+Evolution = MACHAMP,Trade
 #-------------------------------
 [MACHAMP]
 Name = Machamp
@@ -1824,7 +1826,7 @@ Habitat = Forest
 Category = Flower
 Pokedex = A Bellsprout's thin and flexible body lets it bend and sway to avoid any attack, however strong it may be. From its mouth, it leaks a fluid that melts even iron.
 Generation = 1
-Evolutions = WEEPINBELL,Level,21
+Evolution = WEEPINBELL,Level,21
 #-------------------------------
 [WEEPINBELL]
 Name = Weepinbell
@@ -1850,7 +1852,7 @@ Habitat = Forest
 Category = Flycatcher
 Pokedex = At night, a Weepinbell hangs on to a tree branch with its hooked rear and sleeps. If it moves around in its sleep, it may wake up to find itself on the ground.
 Generation = 1
-Evolutions = VICTREEBEL,Item,LEAFSTONE
+Evolution = VICTREEBEL,Item,LEAFSTONE
 #-------------------------------
 [VICTREEBEL]
 Name = Victreebel
@@ -1903,7 +1905,7 @@ Category = Jellyfish
 Pokedex = Its body is almost entirely composed of water. It ensnares its foe with its two long tentacles, then stabs with the poison stingers at their tips.
 Generation = 1
 WildItemUncommon = POISONBARB
-Evolutions = TENTACRUEL,Level,30
+Evolution = TENTACRUEL,Level,30
 #-------------------------------
 [TENTACRUEL]
 Name = Tentacruel
@@ -1957,7 +1959,7 @@ Category = Rock
 Pokedex = It climbs mountain paths using only the power of its arms. Because they look just like boulders lining paths, hikers may step on them without noticing.
 Generation = 1
 WildItemUncommon = EVERSTONE
-Evolutions = GRAVELER,Level,25
+Evolution = GRAVELER,Level,25
 #-------------------------------
 [GRAVELER]
 Name = Graveler
@@ -1984,7 +1986,7 @@ Category = Rock
 Pokedex = They descend from mountains by tumbling down steep slopes. They are so brutal, they smash aside obstructing trees and huge boulders with thunderous tackles.
 Generation = 1
 WildItemUncommon = EVERSTONE
-Evolutions = GOLEM,Trade,
+Evolution = GOLEM,Trade
 #-------------------------------
 [GOLEM]
 Name = Golem
@@ -2037,7 +2039,7 @@ Habitat = Grassland
 Category = Fire Horse
 Pokedex = A Ponyta is very weak at birth. It can barely stand up. Its legs become stronger as it stumbles and falls while trying to keep up with its parent.
 Generation = 1
-Evolutions = RAPIDASH,Level,40
+Evolution = RAPIDASH,Level,40
 #-------------------------------
 [RAPIDASH]
 Name = Rapidash
@@ -2090,7 +2092,8 @@ Category = Dopey
 Pokedex = It catches prey by dipping its tail in water at the side of a river. But it often forgets what it is doing and spends whole days just loafing at the water's edge.
 Generation = 1
 WildItemUncommon = LAGGINGTAIL
-Evolutions = SLOWBRO,Level,37,SLOWKING,TradeItem,KINGSROCK
+Evolution = SLOWBRO,Level,37
+Evolution = SLOWKING,TradeItem,KINGSROCK
 #-------------------------------
 [SLOWBRO]
 Name = Slowbro
@@ -2143,7 +2146,7 @@ Category = Magnet
 Pokedex = The units at its sides are extremely powerful magnets. They generate enough magnetism to draw in iron objects from over 300 feet away.
 Generation = 1
 WildItemUncommon = METALCOAT
-Evolutions = MAGNETON,Level,30
+Evolution = MAGNETON,Level,30
 #-------------------------------
 [MAGNETON]
 Name = Magneton
@@ -2170,7 +2173,7 @@ Category = Magnet
 Pokedex = It is actually three Magnemite linked by magnetism. It generates powerful radio waves that raise temperatures by 3.6 degrees F within a 3,300-foot radius.
 Generation = 1
 WildItemUncommon = METALCOAT
-Evolutions = MAGNEZONE,LocationFlag,Magnetic
+Evolution = MAGNEZONE,LocationFlag,Magnetic
 #-------------------------------
 [FARFETCHD]
 Name = Farfetch'd
@@ -2225,7 +2228,7 @@ Category = Twin Bird
 Pokedex = Even while eating or sleeping, one of the heads remains always vigilant for any sign of danger. When threatened, it flees at over 60 miles per hour.
 Generation = 1
 WildItemUncommon = SHARPBEAK
-Evolutions = DODRIO,Level,31
+Evolution = DODRIO,Level,31
 #-------------------------------
 [DODRIO]
 Name = Dodrio
@@ -2278,7 +2281,7 @@ Habitat = Sea
 Category = Sea Lion
 Pokedex = Seel hunt for prey in frigid, ice-covered seas. When it needs to breathe, it punches a hole through the ice with the sharply protruding section of its head.
 Generation = 1
-Evolutions = DEWGONG,Level,34
+Evolution = DEWGONG,Level,34
 #-------------------------------
 [DEWGONG]
 Name = Dewgong
@@ -2331,7 +2334,7 @@ Category = Sludge
 Pokedex = Born from polluted sludge in the sea, Grimer's favorite food is anything filthy. They feed on wastewater pumped out from factories.
 Generation = 1
 WildItemUncommon = BLACKSLUDGE
-Evolutions = MUK,Level,38
+Evolution = MUK,Level,38
 #-------------------------------
 [MUK]
 Name = Muk
@@ -2386,7 +2389,7 @@ Pokedex = At night, it burrows a hole in the seafloor with its broad tongue to m
 Generation = 1
 WildItemCommon = PEARL
 WildItemUncommon = BIGPEARL
-Evolutions = CLOYSTER,Item,WATERSTONE
+Evolution = CLOYSTER,Item,WATERSTONE
 #-------------------------------
 [CLOYSTER]
 Name = Cloyster
@@ -2439,7 +2442,7 @@ Habitat = Cave
 Category = Gas
 Pokedex = When exposed to a strong wind, a Gastly's gaseous body quickly dwindles away. They cluster under the eaves of houses to escape the ravages of wind.
 Generation = 1
-Evolutions = HAUNTER,Level,25
+Evolution = HAUNTER,Level,25
 #-------------------------------
 [HAUNTER]
 Name = Haunter
@@ -2464,7 +2467,7 @@ Habitat = Cave
 Category = Gas
 Pokedex = If a Haunter beckons you while it is floating in darkness, don't approach it. This Pokémon will try to lick you with its tongue and steal your life away.
 Generation = 1
-Evolutions = GENGAR,Trade,
+Evolution = GENGAR,Trade
 #-------------------------------
 [GENGAR]
 Name = Gengar
@@ -2515,7 +2518,7 @@ Habitat = Cave
 Category = Rock Snake
 Pokedex = There is a magnet in its brain that prevents an Onix from losing direction while tunneling. As it grows older, its body becomes steadily rounder and smoother.
 Generation = 1
-Evolutions = STEELIX,TradeItem,METALCOAT
+Evolution = STEELIX,TradeItem,METALCOAT
 #-------------------------------
 [DROWZEE]
 Name = Drowzee
@@ -2542,7 +2545,7 @@ Habitat = Grassland
 Category = Hypnosis
 Pokedex = If your nose becomes itchy while you are sleeping, it's a sure sign that a Drowzee is standing above your pillow and trying to eat your dream through your nostrils.
 Generation = 1
-Evolutions = HYPNO,Level,26
+Evolution = HYPNO,Level,26
 #-------------------------------
 [HYPNO]
 Name = Hypno
@@ -2594,7 +2597,7 @@ Habitat = WatersEdge
 Category = River Crab
 Pokedex = Krabby live in holes dug into beaches. On sandy shores with little in the way of food, they can be seen squabbling with each other over territory.
 Generation = 1
-Evolutions = KINGLER,Level,28
+Evolution = KINGLER,Level,28
 #-------------------------------
 [KINGLER]
 Name = Kingler
@@ -2645,7 +2648,7 @@ Habitat = Urban
 Category = Ball
 Pokedex = It bears an uncanny and unexplained resemblance to a Poké Ball. Because it explodes at the slightest shock, even veteran trainers treat it with caution.
 Generation = 1
-Evolutions = ELECTRODE,Level,30
+Evolution = ELECTRODE,Level,30
 #-------------------------------
 [ELECTRODE]
 Name = Electrode
@@ -2698,7 +2701,7 @@ Category = Egg
 Pokedex = It consists of six eggs that care for each other. The eggs attract each other and spin around. When cracks increasingly appear, it is close to evolution.
 Generation = 1
 WildItemUncommon = PSYCHICSEED
-Evolutions = EXEGGUTOR,Item,LEAFSTONE
+Evolution = EXEGGUTOR,Item,LEAFSTONE
 #-------------------------------
 [EXEGGUTOR]
 Name = Exeggutor
@@ -2751,7 +2754,7 @@ Category = Lonely
 Pokedex = It pines for the mother it will never see again. Seeing a likeness of its mother in the full moon, it cries. The stains on the skull it wears are from its tears.
 Generation = 1
 WildItemUncommon = THICKCLUB
-Evolutions = MAROWAK,Level,28
+Evolution = MAROWAK,Level,28
 #-------------------------------
 [MAROWAK]
 Name = Marowak
@@ -2855,7 +2858,7 @@ Category = Licking
 Pokedex = Whenever it sees something unfamiliar, it always licks the object because it memorizes things by texture and taste. It is somewhat put off by sour things.
 Generation = 1
 WildItemUncommon = LAGGINGTAIL
-Evolutions = LICKILICKY,HasMove,ROLLOUT
+Evolution = LICKILICKY,HasMove,ROLLOUT
 #-------------------------------
 [KOFFING]
 Name = Koffing
@@ -2882,7 +2885,7 @@ Category = Poison Gas
 Pokedex = Getting up close to a Koffing will give you a chance to observe, through its thin skin, the toxic gases swirling inside. It blows up at the slightest stimulation.
 Generation = 1
 WildItemUncommon = SMOKEBALL
-Evolutions = WEEZING,Level,35
+Evolution = WEEZING,Level,35
 #-------------------------------
 [WEEZING]
 Name = Weezing
@@ -2934,7 +2937,7 @@ Habitat = RoughTerrain
 Category = Spikes
 Pokedex = Once it starts running, it doesn't stop. Its tiny brain makes it so stupid that it can't remember why it started running in the first place.
 Generation = 1
-Evolutions = RHYDON,Level,42
+Evolution = RHYDON,Level,42
 #-------------------------------
 [RHYDON]
 Name = Rhydon
@@ -2960,7 +2963,7 @@ Habitat = RoughTerrain
 Category = Drill
 Pokedex = Its horn, which rotates like a drill, destroys tall buildings with one strike. It stands on its hind legs, and its brain is well developed.
 Generation = 1
-Evolutions = RHYPERIOR,TradeItem,PROTECTOR
+Evolution = RHYPERIOR,TradeItem,PROTECTOR
 #-------------------------------
 [CHANSEY]
 Name = Chansey
@@ -2988,7 +2991,7 @@ Category = Egg
 Pokedex = Chansey lay nutritionally excellent eggs every day. The eggs are so delicious, they are eagerly devoured by even those who have lost their appetite.
 Generation = 1
 WildItemCommon = LUCKYPUNCH
-Evolutions = BLISSEY,Happiness,
+Evolution = BLISSEY,Happiness
 #-------------------------------
 [TANGELA]
 Name = Tangela
@@ -3015,7 +3018,7 @@ Habitat = Grassland
 Category = Vine
 Pokedex = Its vines snap off easily and painlessly if they are grabbed, allowing it to make a quick getaway. The lost vines are replaced by new growth the very next day.
 Generation = 1
-Evolutions = TANGROWTH,HasMove,ANCIENTPOWER
+Evolution = TANGROWTH,HasMove,ANCIENTPOWER
 #-------------------------------
 [KANGASKHAN]
 Name = Kangaskhan
@@ -3069,7 +3072,7 @@ Category = Dragon
 Pokedex = By cleverly flicking the fins on its back side to side, it moves in any direction while facing forward. It spits ink to escape if it senses danger.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = SEADRA,Level,32
+Evolution = SEADRA,Level,32
 #-------------------------------
 [SEADRA]
 Name = Seadra
@@ -3096,7 +3099,7 @@ Category = Dragon
 Pokedex = The poisonous barbs all over its body are highly valued as ingredients for making traditional herbal medicine. It shows no mercy to anything approaching its nest.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = KINGDRA,TradeItem,DRAGONSCALE
+Evolution = KINGDRA,TradeItem,DRAGONSCALE
 #-------------------------------
 [GOLDEEN]
 Name = Goldeen
@@ -3124,7 +3127,7 @@ Category = Goldfish
 Pokedex = In the springtime, schools of Goldeen can be seen swimming up falls and rivers. It metes out staggering damage with its single horn.
 Generation = 1
 WildItemUncommon = MYSTICWATER
-Evolutions = SEAKING,Level,33
+Evolution = SEAKING,Level,33
 #-------------------------------
 [SEAKING]
 Name = Seaking
@@ -3178,7 +3181,7 @@ Pokedex = It gathers with others in the night and makes its red core glow on and
 Generation = 1
 WildItemCommon = STARDUST
 WildItemUncommon = STARPIECE
-Evolutions = STARMIE,Item,WATERSTONE
+Evolution = STARMIE,Item,WATERSTONE
 #-------------------------------
 [STARMIE]
 Name = Starmie
@@ -3258,7 +3261,7 @@ Habitat = Grassland
 Category = Mantis
 Pokedex = Its blindingly fast speed adds to the sharpness of its twin forearm scythes. The scythes can slice through thick logs in one wicked stroke.
 Generation = 1
-Evolutions = SCIZOR,TradeItem,METALCOAT
+Evolution = SCIZOR,TradeItem,METALCOAT
 #-------------------------------
 [JYNX]
 Name = Jynx
@@ -3310,7 +3313,7 @@ Category = Electric
 Pokedex = When a storm approaches, it competes with others to scale heights that are likely to be stricken by lightning. Some towns use Electabuzz as lightning rods.
 Generation = 1
 WildItemUncommon = ELECTIRIZER
-Evolutions = ELECTIVIRE,TradeItem,ELECTIRIZER
+Evolution = ELECTIVIRE,TradeItem,ELECTIRIZER
 #-------------------------------
 [MAGMAR]
 Name = Magmar
@@ -3337,7 +3340,7 @@ Category = Spitfire
 Pokedex = In battle, it blows out intense flames from all over its body to intimidate its foe. These fiery bursts create heat waves that ignite grass and trees.
 Generation = 1
 WildItemUncommon = MAGMARIZER
-Evolutions = MAGMORTAR,TradeItem,MAGMARIZER
+Evolution = MAGMORTAR,TradeItem,MAGMARIZER
 #-------------------------------
 [PINSIR]
 Name = Pinsir
@@ -3414,7 +3417,7 @@ Habitat = WatersEdge
 Category = Fish
 Pokedex = Its swimming muscles are weak, so it is easily washed away by currents. In places where water pools, you can see many Magikarp deposited there by the flow.
 Generation = 1
-Evolutions = GYARADOS,Level,20
+Evolution = GYARADOS,Level,20
 #-------------------------------
 [GYARADOS]
 Name = Gyarados
@@ -3521,7 +3524,14 @@ Habitat = Urban
 Category = Evolution
 Pokedex = An Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokémon to evolve.
 Generation = 1
-Evolutions = VAPOREON,Item,WATERSTONE,JOLTEON,Item,THUNDERSTONE,FLAREON,Item,FIRESTONE,LEAFEON,LocationFlag,MossRock,GLACEON,LocationFlag,IceRock,SYLVEON,HappinessMoveType,FAIRY,ESPEON,HappinessDay,,UMBREON,HappinessNight,
+Evolution = VAPOREON,Item,WATERSTONE
+Evolution = JOLTEON,Item,THUNDERSTONE
+Evolution = FLAREON,Item,FIRESTONE
+Evolution = LEAFEON,LocationFlag,MossRock
+Evolution = GLACEON,LocationFlag,IceRock
+Evolution = SYLVEON,HappinessMoveType,FAIRY
+Evolution = ESPEON,HappinessDay
+Evolution = UMBREON,HappinessNight
 #-------------------------------
 [VAPOREON]
 Name = Vaporeon
@@ -3622,7 +3632,7 @@ Habitat = Urban
 Category = Virtual
 Pokedex = It is capable of reverting itself entirely back to program data in order to enter cyberspace. A Porygon is copy-protected so it cannot be duplicated.
 Generation = 1
-Evolutions = PORYGON2,TradeItem,UPGRADE
+Evolution = PORYGON2,TradeItem,UPGRADE
 #-------------------------------
 [OMANYTE]
 Name = Omanyte
@@ -3649,7 +3659,7 @@ Habitat = Sea
 Category = Spiral
 Pokedex = One of the ancient and long-since-extinct Pokémon that have been regenerated from fossils by humans. If attacked, it withdraws into its hard shell.
 Generation = 1
-Evolutions = OMASTAR,Level,40
+Evolution = OMASTAR,Level,40
 #-------------------------------
 [OMASTAR]
 Name = Omastar
@@ -3701,7 +3711,7 @@ Habitat = Sea
 Category = Shellfish
 Pokedex = This Pokémon has been regenerated from a fossil. However, in rare cases, living examples have been discovered. Kabuto have not changed for 300 million years.
 Generation = 1
-Evolutions = KABUTOPS,Level,40
+Evolution = KABUTOPS,Level,40
 #-------------------------------
 [KABUTOPS]
 Name = Kabutops
@@ -3887,7 +3897,7 @@ Category = Dragon
 Pokedex = A Dratini continually molts and sloughs off its old skin. It does so because the life energy within its body steadily builds to reach uncontrollable levels.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = DRAGONAIR,Level,30
+Evolution = DRAGONAIR,Level,30
 #-------------------------------
 [DRAGONAIR]
 Name = Dragonair
@@ -3914,7 +3924,7 @@ Category = Dragon
 Pokedex = A Dragonair stores an enormous amount of energy inside its body. It is said to alter the weather around it by loosing energy from the crystals on its neck and tail.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = DRAGONITE,Level,55
+Evolution = DRAGONITE,Level,55
 #-------------------------------
 [DRAGONITE]
 Name = Dragonite
@@ -4021,7 +4031,7 @@ Habitat = Grassland
 Category = Leaf
 Pokedex = It waves its leaf around to keep foes at bay. However, a sweet fragrance also wafts from the leaf, creating a friendly atmosphere that becalms the battlers.
 Generation = 2
-Evolutions = BAYLEEF,Level,16
+Evolution = BAYLEEF,Level,16
 #-------------------------------
 [BAYLEEF]
 Name = Bayleef
@@ -4047,7 +4057,7 @@ Habitat = Grassland
 Category = Leaf
 Pokedex = A Bayleef's neck is ringed by curled-up leaves. Inside each leaf is a small tree shoot. The fragrance of this shoot makes people peppy.
 Generation = 2
-Evolutions = MEGANIUM,Level,32
+Evolution = MEGANIUM,Level,32
 #-------------------------------
 [MEGANIUM]
 Name = Meganium
@@ -4099,7 +4109,7 @@ Habitat = Grassland
 Category = Fire Mouse
 Pokedex = It flares flames from its back to protect itself. The fire burns vigorously if the Pokémon is angry. When it is tired, it sputters with incomplete combustion.
 Generation = 2
-Evolutions = QUILAVA,Level,14
+Evolution = QUILAVA,Level,14
 #-------------------------------
 [QUILAVA]
 Name = Quilava
@@ -4125,7 +4135,7 @@ Habitat = Grassland
 Category = Volcano
 Pokedex = It intimidates foes with intense gusts of flames and superheated air. Its quick nimbleness lets it dodge attacks even while scorching an enemy.
 Generation = 2
-Evolutions = TYPHLOSION,Level,36
+Evolution = TYPHLOSION,Level,36
 #-------------------------------
 [TYPHLOSION]
 Name = Typhlosion
@@ -4177,7 +4187,7 @@ Habitat = WatersEdge
 Category = Big Jaw
 Pokedex = Despite its small body, Totodile's jaws are very powerful. While it may think it is just playfully nipping, its bite has enough strength to cause serious injury.
 Generation = 2
-Evolutions = CROCONAW,Level,18
+Evolution = CROCONAW,Level,18
 #-------------------------------
 [CROCONAW]
 Name = Croconaw
@@ -4203,7 +4213,7 @@ Habitat = WatersEdge
 Category = Big Jaw
 Pokedex = Once its jaws clamp down on its foe, it will absolutely not let go. Because the tips of its fangs are forked back like fishhooks, they become irremovably embedded.
 Generation = 2
-Evolutions = FERALIGATR,Level,30
+Evolution = FERALIGATR,Level,30
 #-------------------------------
 [FERALIGATR]
 Name = Feraligatr
@@ -4255,7 +4265,7 @@ Habitat = Grassland
 Category = Scout
 Pokedex = They take turns standing guard when it is time to sleep. The sentry awakens the others if it senses danger. If one gets separated, it turns sleepless with fear.
 Generation = 2
-Evolutions = FURRET,Level,15
+Evolution = FURRET,Level,15
 #-------------------------------
 [FURRET]
 Name = Furret
@@ -4307,7 +4317,7 @@ Habitat = Forest
 Category = Owl
 Pokedex = It has an internal organ that senses the earth's rotation. Using this special organ, a Hoothoot begins hooting at precisely the same time every day.
 Generation = 2
-Evolutions = NOCTOWL,Level,20
+Evolution = NOCTOWL,Level,20
 #-------------------------------
 [NOCTOWL]
 Name = Noctowl
@@ -4359,7 +4369,7 @@ Habitat = Forest
 Category = Five Star
 Pokedex = Ledyba communicate using a fluid that they secrete from where the legs join the body. They are said to convey feelings to others by altering the fluid's scent.
 Generation = 2
-Evolutions = LEDIAN,Level,18
+Evolution = LEDIAN,Level,18
 #-------------------------------
 [LEDIAN]
 Name = Ledian
@@ -4411,7 +4421,7 @@ Habitat = Forest
 Category = String Spit
 Pokedex = The web it spins can be considered its second nervous system. It is said that a Spinarak determines its prey by the tiny vibrations it feels through the web.
 Generation = 2
-Evolutions = ARIADOS,Level,22
+Evolution = ARIADOS,Level,22
 #-------------------------------
 [ARIADOS]
 Name = Ariados
@@ -4489,7 +4499,7 @@ Category = Angler
 Pokedex = When it senses danger, it discharges positive and negative electricity from its two antennae. It lives in depths beyond sunlight's reach.
 Generation = 2
 WildItemUncommon = DEEPSEASCALE
-Evolutions = LANTURN,Level,27
+Evolution = LANTURN,Level,27
 #-------------------------------
 [LANTURN]
 Name = Lanturn
@@ -4542,7 +4552,7 @@ Habitat = Forest
 Category = Tiny Mouse
 Pokedex = It is still inept at retaining electricity. When it is startled, it discharges power accidentally. It gets better at holding power as it grows older.
 Generation = 2
-Evolutions = PIKACHU,Happiness,
+Evolution = PIKACHU,Happiness
 #-------------------------------
 [CLEFFA]
 Name = Cleffa
@@ -4570,7 +4580,7 @@ Category = Star Shape
 Pokedex = On nights with many shooting stars, Cleffa can be seen dancing in a ring. They dance until daybreak, when they quench their thirst with the morning dew.
 Generation = 2
 WildItemUncommon = MOONSTONE
-Evolutions = CLEFAIRY,Happiness,
+Evolution = CLEFAIRY,Happiness
 #-------------------------------
 [IGGLYBUFF]
 Name = Igglybuff
@@ -4597,7 +4607,7 @@ Habitat = Grassland
 Category = Balloon
 Pokedex = Its soft and pliable body is very bouncy. When it sings continuously with all its might, its body steadily turns a deepening pink color.
 Generation = 2
-Evolutions = JIGGLYPUFF,Happiness,
+Evolution = JIGGLYPUFF,Happiness
 #-------------------------------
 [TOGEPI]
 Name = Togepi
@@ -4624,7 +4634,7 @@ Habitat = Forest
 Category = Spike Ball
 Pokedex = As its energy, it uses the feelings of compassion and pleasure exuded by people and Pokémon. It stores up happy feelings in its shell, then shares them out.
 Generation = 2
-Evolutions = TOGETIC,Happiness,
+Evolution = TOGETIC,Happiness
 #-------------------------------
 [TOGETIC]
 Name = Togetic
@@ -4650,7 +4660,7 @@ Habitat = Forest
 Category = Happiness
 Pokedex = It is said to be a Pokémon that brings good fortune. When it spots someone who is pure of heart, a Togetic appears and shares its happiness with that person.
 Generation = 2
-Evolutions = TOGEKISS,Item,SHINYSTONE
+Evolution = TOGEKISS,Item,SHINYSTONE
 #-------------------------------
 [NATU]
 Name = Natu
@@ -4677,7 +4687,7 @@ Habitat = Forest
 Category = Tiny Bird
 Pokedex = It runs up short trees that grow on the savanna to peck at new shoots. A Natu's eyes look as if they are always observing something.
 Generation = 2
-Evolutions = XATU,Level,25
+Evolution = XATU,Level,25
 #-------------------------------
 [XATU]
 Name = Xatu
@@ -4729,7 +4739,7 @@ Habitat = Grassland
 Category = Wool
 Pokedex = Its fluffy wool rubs together and builds a static charge. The more energy is charged, the more brightly the lightbulb at the tip of its tail glows.
 Generation = 2
-Evolutions = FLAAFFY,Level,15
+Evolution = FLAAFFY,Level,15
 #-------------------------------
 [FLAAFFY]
 Name = Flaaffy
@@ -4755,7 +4765,7 @@ Habitat = Grassland
 Category = Wool
 Pokedex = Its fleece quality changes to generate strong static electricity with a small amount of wool. The bare, slick parts of its hide are shielded against electricity.
 Generation = 2
-Evolutions = AMPHAROS,Level,30
+Evolution = AMPHAROS,Level,30
 #-------------------------------
 [AMPHAROS]
 Name = Ampharos
@@ -4833,7 +4843,7 @@ Habitat = WatersEdge
 Category = Aqua Mouse
 Pokedex = Its body is covered with water-repellent fur. Because of the fur, it can swim through water at high speed without being slowed by the water's resistance.
 Generation = 2
-Evolutions = AZUMARILL,Level,18
+Evolution = AZUMARILL,Level,18
 #-------------------------------
 [AZUMARILL]
 Name = Azumarill
@@ -4937,7 +4947,7 @@ Habitat = Grassland
 Category = Cottonweed
 Pokedex = This Pokémon drifts and floats with the wind. If it senses the approach of strong winds, a Hoppip links leaves with others to prepare against being blown away.
 Generation = 2
-Evolutions = SKIPLOOM,Level,18
+Evolution = SKIPLOOM,Level,18
 #-------------------------------
 [SKIPLOOM]
 Name = Skiploom
@@ -4963,7 +4973,7 @@ Habitat = Grassland
 Category = Cottonweed
 Pokedex = It blossoms when the temperature rises above 64 degrees F. Because its flower's blooming changes with the temperature, it is sometimes used as a thermometer.
 Generation = 2
-Evolutions = JUMPLUFF,Level,27
+Evolution = JUMPLUFF,Level,27
 #-------------------------------
 [JUMPLUFF]
 Name = Jumpluff
@@ -5015,7 +5025,7 @@ Habitat = Forest
 Category = Long Tail
 Pokedex = Its tail ends with a dexterous, handlike appendage. However, because it uses the tail so much, Aipom's real hands have become rather clumsy.
 Generation = 2
-Evolutions = AMBIPOM,HasMove,DOUBLEHIT
+Evolution = AMBIPOM,HasMove,DOUBLEHIT
 #-------------------------------
 [SUNKERN]
 Name = Sunkern
@@ -5042,7 +5052,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = Sunkern try to minimize movement to conserve the nutrients they have stored in their bodies for evolution. They will not eat, subsisting only on morning dew.
 Generation = 2
-Evolutions = SUNFLORA,Item,SUNSTONE
+Evolution = SUNFLORA,Item,SUNSTONE
 #-------------------------------
 [SUNFLORA]
 Name = Sunflora
@@ -5095,7 +5105,7 @@ Category = Clear Wing
 Pokedex = It can see 360 degrees without moving its eyes. It is a great flier capable of making sudden stops and turning midair to quickly chase down targeted prey.
 Generation = 2
 WildItemUncommon = WIDELENS
-Evolutions = YANMEGA,HasMove,ANCIENTPOWER
+Evolution = YANMEGA,HasMove,ANCIENTPOWER
 #-------------------------------
 [WOOPER]
 Name = Wooper
@@ -5122,7 +5132,7 @@ Habitat = WatersEdge
 Category = Water Fish
 Pokedex = Wooper usually live in water but come out onto land seeking food occasionally. On land, they coat their bodies with a gooey, toxic film.
 Generation = 2
-Evolutions = QUAGSIRE,Level,20
+Evolution = QUAGSIRE,Level,20
 #-------------------------------
 [QUAGSIRE]
 Name = Quagsire
@@ -5224,7 +5234,7 @@ Habitat = Forest
 Category = Darkness
 Pokedex = Murkrow were feared as the alleged bearers of ill fortune. It shows strong interest in anything that sparkles. It will even try to steal rings from women.
 Generation = 2
-Evolutions = HONCHKROW,Item,DUSKSTONE
+Evolution = HONCHKROW,Item,DUSKSTONE
 #-------------------------------
 [SLOWKING]
 Name = Slowking
@@ -5276,7 +5286,7 @@ Habitat = Cave
 Category = Screech
 Pokedex = A Misdreavus frightens people with a creepy, sobbing cry. It apparently uses its red spheres to absorb the fear of foes as its nutrition.
 Generation = 2
-Evolutions = MISMAGIUS,Item,DUSKSTONE
+Evolution = MISMAGIUS,Item,DUSKSTONE
 #-------------------------------
 [UNOWN]
 Name = Unown
@@ -5379,7 +5389,7 @@ Habitat = Forest
 Category = Bagworm
 Pokedex = A Pineco hangs from a tree branch and waits for prey. While eating, if it is disturbed by someone shaking its tree, it falls on the ground and explodes.
 Generation = 2
-Evolutions = FORRETRESS,Level,31
+Evolution = FORRETRESS,Level,31
 #-------------------------------
 [FORRETRESS]
 Name = Forretress
@@ -5457,7 +5467,7 @@ Habitat = Mountain
 Category = Fly Scorpion
 Pokedex = It glides without making a single sound. It grasps the face of its foe using its hind and large front claws, then stabs with its poison barb.
 Generation = 2
-Evolutions = GLISCOR,NightHoldItem,RAZORFANG
+Evolution = GLISCOR,NightHoldItem,RAZORFANG
 #-------------------------------
 [STEELIX]
 Name = Steelix
@@ -5510,7 +5520,7 @@ Habitat = Urban
 Category = Fairy
 Pokedex = By baring its fangs and making a scary face, it sends smaller Pokémon scurrying in terror. The Snubbull does seem a little sad at making its foes flee.
 Generation = 2
-Evolutions = GRANBULL,Level,23
+Evolution = GRANBULL,Level,23
 #-------------------------------
 [GRANBULL]
 Name = Granbull
@@ -5670,7 +5680,7 @@ Category = Sharp Claw
 Pokedex = A Sneasel scales trees by punching its hooked claws into the bark. It seeks out unguarded nests and steals eggs for food while the parents are away.
 Generation = 2
 WildItemUncommon = QUICKCLAW
-Evolutions = WEAVILE,NightHoldItem,RAZORCLAW
+Evolution = WEAVILE,NightHoldItem,RAZORCLAW
 #-------------------------------
 [TEDDIURSA]
 Name = Teddiursa
@@ -5697,7 +5707,7 @@ Habitat = Mountain
 Category = Little Bear
 Pokedex = It licks its palms that are sweetened by being soaked in honey. A Teddiursa makes its own honey by blending fruits and pollen collected by Beedrill.
 Generation = 2
-Evolutions = URSARING,Level,30
+Evolution = URSARING,Level,30
 #-------------------------------
 [URSARING]
 Name = Ursaring
@@ -5749,7 +5759,7 @@ Habitat = Mountain
 Category = Lava
 Pokedex = It is a species of Pokémon that lives in volcanic areas. If its body cools, its skin hardens and immobilizes it. To avoid that, it sleeps near magma.
 Generation = 2
-Evolutions = MAGCARGO,Level,38
+Evolution = MAGCARGO,Level,38
 #-------------------------------
 [MAGCARGO]
 Name = Magcargo
@@ -5801,7 +5811,7 @@ Habitat = Cave
 Category = Pig
 Pokedex = It roots for food by rubbing its snout against the ground. Its favorite food is a mushroom that grows under dried grass. It occasionally roots out hot springs.
 Generation = 2
-Evolutions = PILOSWINE,Level,33
+Evolution = PILOSWINE,Level,33
 #-------------------------------
 [PILOSWINE]
 Name = Piloswine
@@ -5827,7 +5837,7 @@ Habitat = Cave
 Category = Swine
 Pokedex = A Piloswine is covered by a thick coat of long hair for enduring freezing cold. It uses its tusks to dig up food that has been buried under ice.
 Generation = 2
-Evolutions = MAMOSWINE,HasMove,ANCIENTPOWER
+Evolution = MAMOSWINE,HasMove,ANCIENTPOWER
 #-------------------------------
 [CORSOLA]
 Name = Corsola
@@ -5881,7 +5891,7 @@ Habitat = Sea
 Category = Jet
 Pokedex = A Remoraid uses its abdominal muscles to forcefully expel swallowed water, then shoot down flying prey. When evolution approaches, it travels down rivers.
 Generation = 2
-Evolutions = OCTILLERY,Level,25
+Evolution = OCTILLERY,Level,25
 #-------------------------------
 [OCTILLERY]
 Name = Octillery
@@ -6012,7 +6022,7 @@ Habitat = RoughTerrain
 Category = Dark
 Pokedex = Houndour communicate with each other using a variety of cries to corner their prey. This Pokémon's remarkable teamwork is simply unparalleled.
 Generation = 2
-Evolutions = HOUNDOOM,Level,24
+Evolution = HOUNDOOM,Level,24
 #-------------------------------
 [HOUNDOOM]
 Name = Houndoom
@@ -6090,7 +6100,7 @@ Habitat = RoughTerrain
 Category = Long Nose
 Pokedex = Phanpy's big ears serve as broad fans. When it becomes hot, it flaps the ears busily to cool down. Even the young are very strong.
 Generation = 2
-Evolutions = DONPHAN,Level,25
+Evolution = DONPHAN,Level,25
 #-------------------------------
 [DONPHAN]
 Name = Donphan
@@ -6141,7 +6151,7 @@ Habitat = Urban
 Category = Virtual
 Pokedex = It was created by humans using the power of science. It has been given artificial intelligence that enables it to learn new gestures and emotions on its own.
 Generation = 2
-Evolutions = PORYGONZ,TradeItem,DUBIOUSDISC
+Evolution = PORYGONZ,TradeItem,DUBIOUSDISC
 #-------------------------------
 [STANTLER]
 Name = Stantler
@@ -6218,7 +6228,9 @@ Habitat = Urban
 Category = Scuffle
 Pokedex = Tyrogue become stressed out if they do not get to train every day. When raising this Pokémon, the trainer must establish a regular training schedule.
 Generation = 2
-Evolutions = HITMONLEE,AttackGreater,20,HITMONCHAN,DefenseGreater,20,HITMONTOP,AtkDefEqual,20
+Evolution = HITMONLEE,AttackGreater,20
+Evolution = HITMONCHAN,DefenseGreater,20
+Evolution = HITMONTOP,AtkDefEqual,20
 #-------------------------------
 [HITMONTOP]
 Name = Hitmontop
@@ -6270,7 +6282,7 @@ Habitat = Urban
 Category = Kiss
 Pokedex = It actively runs about, but also falls often. Whenever it falls, it will check its reflection on a lake's surface to make sure its face hasn't become dirty.
 Generation = 2
-Evolutions = JYNX,Level,30
+Evolution = JYNX,Level,30
 #-------------------------------
 [ELEKID]
 Name = Elekid
@@ -6298,7 +6310,7 @@ Category = Electric
 Pokedex = If it touches metal and discharges the electricity it has stored in its body, an Elekid begins swinging its arms in circles to recharge itself.
 Generation = 2
 WildItemUncommon = ELECTIRIZER
-Evolutions = ELECTABUZZ,Level,30
+Evolution = ELECTABUZZ,Level,30
 #-------------------------------
 [MAGBY]
 Name = Magby
@@ -6326,7 +6338,7 @@ Category = Live Coal
 Pokedex = If a Magby is spouting yellow flames from its mouth, it is in good health. When it is fatigued, black smoke will be mixed in with the flames.
 Generation = 2
 WildItemUncommon = MAGMARIZER
-Evolutions = MAGMAR,Level,30
+Evolution = MAGMAR,Level,30
 #-------------------------------
 [MILTANK]
 Name = Miltank
@@ -6488,7 +6500,7 @@ Habitat = Mountain
 Category = Rock Skin
 Pokedex = A Larvitar is born deep under the ground. It must eat its way through the soil above and reach the surface for it to see its parents' faces.
 Generation = 2
-Evolutions = PUPITAR,Level,30
+Evolution = PUPITAR,Level,30
 #-------------------------------
 [PUPITAR]
 Name = Pupitar
@@ -6513,7 +6525,7 @@ Habitat = Mountain
 Category = Hard Shell
 Pokedex = A Pupitar creates a gas inside its body that it ejects under compression to propel itself like a jet. Its body can withstand a collision with solid steel.
 Generation = 2
-Evolutions = TYRANITAR,Level,55
+Evolution = TYRANITAR,Level,55
 #-------------------------------
 [TYRANITAR]
 Name = Tyranitar
@@ -6648,7 +6660,7 @@ Habitat = Forest
 Category = Wood Gecko
 Pokedex = It makes its nest in a giant tree in the forest. It ferociously guards against anything nearing its territory. It is said to be the protector of the trees.
 Generation = 3
-Evolutions = GROVYLE,Level,16
+Evolution = GROVYLE,Level,16
 #-------------------------------
 [GROVYLE]
 Name = Grovyle
@@ -6674,7 +6686,7 @@ Habitat = Forest
 Category = Wood Gecko
 Pokedex = Leaves grow out of this Pokémon's body. They help obscure a Grovyle from the eyes of its enemies while it is in a thickly overgrown forest.
 Generation = 3
-Evolutions = SCEPTILE,Level,36
+Evolution = SCEPTILE,Level,36
 #-------------------------------
 [SCEPTILE]
 Name = Sceptile
@@ -6726,7 +6738,7 @@ Habitat = Grassland
 Category = Chick
 Pokedex = If attacked, it strikes back by spitting balls of fire it forms in its stomach. A Torchic dislikes darkness because it can't see its surroundings.
 Generation = 3
-Evolutions = COMBUSKEN,Level,16
+Evolution = COMBUSKEN,Level,16
 #-------------------------------
 [COMBUSKEN]
 Name = Combusken
@@ -6752,7 +6764,7 @@ Habitat = Grassland
 Category = Young Fowl
 Pokedex = It lashes out with 10 kicks per second. Its strong fighting instinct compels it to keep up its offensive until the opponent gives up.
 Generation = 3
-Evolutions = BLAZIKEN,Level,36
+Evolution = BLAZIKEN,Level,36
 #-------------------------------
 [BLAZIKEN]
 Name = Blaziken
@@ -6804,7 +6816,7 @@ Habitat = WatersEdge
 Category = Mud Fish
 Pokedex = On land, it can powerfully lift large boulders by planting its four feet and heaving. It sleeps by burying itself in soil at the water's edge.
 Generation = 3
-Evolutions = MARSHTOMP,Level,16
+Evolution = MARSHTOMP,Level,16
 #-------------------------------
 [MARSHTOMP]
 Name = Marshtomp
@@ -6830,7 +6842,7 @@ Habitat = WatersEdge
 Category = Mud Fish
 Pokedex = Its toughened hind legs enable it to stand upright. Because it weakens if its skin dries out, it replenishes fluids by playing in mud.
 Generation = 3
-Evolutions = SWAMPERT,Level,36
+Evolution = SWAMPERT,Level,36
 #-------------------------------
 [SWAMPERT]
 Name = Swampert
@@ -6882,7 +6894,7 @@ Habitat = Grassland
 Category = Bite
 Pokedex = It savagely threatens foes with bared fangs. It chases after fleeing targets tenaciously. It turns tail and runs, however, if the foe strikes back.
 Generation = 3
-Evolutions = MIGHTYENA,Level,18
+Evolution = MIGHTYENA,Level,18
 #-------------------------------
 [MIGHTYENA]
 Name = Mightyena
@@ -6936,7 +6948,7 @@ Pokedex = Rubbing its nose against the ground, it always wanders about back and
 Generation = 3
 WildItemCommon = POTION
 WildItemUncommon = REVIVE
-Evolutions = LINOONE,Level,20
+Evolution = LINOONE,Level,20
 #-------------------------------
 [LINOONE]
 Name = Linoone
@@ -6991,7 +7003,8 @@ Pokedex = It sticks to tree branches and eats leaves. The thread it spits from i
 Generation = 3
 WildItemCommon = PECHABERRY
 WildItemUncommon = BRIGHTPOWDER
-Evolutions = SILCOON,Silcoon,7,CASCOON,Cascoon,7
+Evolution = SILCOON,Silcoon,7
+Evolution = CASCOON,Cascoon,7
 #-------------------------------
 [SILCOON]
 Name = Silcoon
@@ -7016,7 +7029,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = It prepares for evolution using the energy it stored while it was a Wurmple. It keeps watch over the surroundings with its two eyes.
 Generation = 3
-Evolutions = BEAUTIFLY,Level,10
+Evolution = BEAUTIFLY,Level,10
 #-------------------------------
 [BEAUTIFLY]
 Name = Beautifly
@@ -7067,7 +7080,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = To avoid detection by its enemies, it hides motionlessly beneath large leaves and in the gaps of branches. It also attaches dead leaves to its body for camouflage.
 Generation = 3
-Evolutions = DUSTOX,Level,10
+Evolution = DUSTOX,Level,10
 #-------------------------------
 [DUSTOX]
 Name = Dustox
@@ -7121,7 +7134,7 @@ Category = Water Weed
 Pokedex = This Pokémon lives in ponds with clean water. It is known to ferry small Pokémon across ponds by carrying them on the broad leaf on its head.
 Generation = 3
 WildItemUncommon = MENTALHERB
-Evolutions = LOMBRE,Level,14
+Evolution = LOMBRE,Level,14
 #-------------------------------
 [LOMBRE]
 Name = Lombre
@@ -7148,7 +7161,7 @@ Category = Jolly
 Pokedex = In the evening, it takes great delight in popping out of rivers and startling people. It feeds on aquatic moss that grows on rocks in the riverbed.
 Generation = 3
 WildItemUncommon = MENTALHERB
-Evolutions = LUDICOLO,Item,WATERSTONE
+Evolution = LUDICOLO,Item,WATERSTONE
 #-------------------------------
 [LUDICOLO]
 Name = Ludicolo
@@ -7202,7 +7215,7 @@ Category = Acorn
 Pokedex = It hangs off branches and absorbs nutrients. When it finishes eating, its body becomes so heavy that it drops to the ground with a thump.
 Generation = 3
 WildItemUncommon = POWERHERB
-Evolutions = NUZLEAF,Level,14
+Evolution = NUZLEAF,Level,14
 #-------------------------------
 [NUZLEAF]
 Name = Nuzleaf
@@ -7229,7 +7242,7 @@ Category = Wily
 Pokedex = A forest-dwelling Pokémon that is skilled at climbing trees. Its long and pointed nose is its weak point. It loses power if the nose is gripped.
 Generation = 3
 WildItemUncommon = POWERHERB
-Evolutions = SHIFTRY,Item,LEAFSTONE
+Evolution = SHIFTRY,Item,LEAFSTONE
 #-------------------------------
 [SHIFTRY]
 Name = Shiftry
@@ -7282,7 +7295,7 @@ Habitat = Grassland
 Category = Tiny Swallow
 Pokedex = Although it is small, it is very courageous. It will take on a larger Skarmory on an equal footing. However, its will weakens if it becomes hungry.
 Generation = 3
-Evolutions = SWELLOW,Level,22
+Evolution = SWELLOW,Level,22
 #-------------------------------
 [SWELLOW]
 Name = Swellow
@@ -7335,7 +7348,7 @@ Category = Seagull
 Pokedex = It makes its nest on a sheer cliff at the edge of the sea. It has trouble keeping its wings flapping in flight. Instead, it soars on updrafts.
 Generation = 3
 WildItemCommon = PRETTYWING
-Evolutions = PELIPPER,Level,25
+Evolution = PELIPPER,Level,25
 #-------------------------------
 [PELIPPER]
 Name = Pelipper
@@ -7388,7 +7401,7 @@ Habitat = Urban
 Category = Feeling
 Pokedex = A Ralts has the power to sense the emotions of people and Pokémon with the horns on its head. It takes cover if it senses any hostility.
 Generation = 3
-Evolutions = KIRLIA,Level,20
+Evolution = KIRLIA,Level,20
 #-------------------------------
 [KIRLIA]
 Name = Kirlia
@@ -7414,7 +7427,8 @@ Habitat = Urban
 Category = Emotion
 Pokedex = A Kirlia has the psychic power to create a rip in the dimensions and see into the future. It is said to dance with pleasure on sunny mornings.
 Generation = 3
-Evolutions = GARDEVOIR,Level,30,GALLADE,ItemMale,DAWNSTONE
+Evolution = GARDEVOIR,Level,30
+Evolution = GALLADE,ItemMale,DAWNSTONE
 #-------------------------------
 [GARDEVOIR]
 Name = Gardevoir
@@ -7467,7 +7481,7 @@ Category = Pond Skater
 Pokedex = They gather on puddles after evening downpours, gliding across the surface of water as if sliding. It secretes honey with a sweet aroma from its head.
 Generation = 3
 WildItemCommon = HONEY
-Evolutions = MASQUERAIN,Level,22
+Evolution = MASQUERAIN,Level,22
 #-------------------------------
 [MASQUERAIN]
 Name = Masquerain
@@ -7522,7 +7536,7 @@ Pokedex = It loves to eat damp, composted soil in forests. If you enter a forest
 Generation = 3
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = BRELOOM,Level,23
+Evolution = BRELOOM,Level,23
 #-------------------------------
 [BRELOOM]
 Name = Breloom
@@ -7575,7 +7589,7 @@ Habitat = Forest
 Category = Slacker
 Pokedex = It sleeps virtually all day and night long. It doesn't change its nest its entire life, but it sometimes travels great distances by swimming in rivers.
 Generation = 3
-Evolutions = VIGOROTH,Level,18
+Evolution = VIGOROTH,Level,18
 #-------------------------------
 [VIGOROTH]
 Name = Vigoroth
@@ -7600,7 +7614,7 @@ Habitat = Forest
 Category = Wild Monkey
 Pokedex = It can't keep still because its blood boils with energy. It runs through the fields and mountains all day to calm itself. If it doesn't, it can't sleep at night.
 Generation = 3
-Evolutions = SLAKING,Level,36
+Evolution = SLAKING,Level,36
 #-------------------------------
 [SLAKING]
 Name = Slaking
@@ -7652,7 +7666,8 @@ Category = Trainee
 Pokedex = It makes its nest at the roots of a mighty tree. Using its whiskerlike antennae, it probes its surroundings in the pitch-black darkness of soil.
 Generation = 3
 WildItemUncommon = SOFTSAND
-Evolutions = NINJASK,Ninjask,20,SHEDINJA,Shedinja,20
+Evolution = NINJASK,Ninjask,20
+Evolution = SHEDINJA,Shedinja,20
 #-------------------------------
 [NINJASK]
 Name = Ninjask
@@ -7728,7 +7743,7 @@ Habitat = Cave
 Category = Whisper
 Pokedex = Its cries equal a jet plane in volume. It inhales through its ear canals. Because of this system, it can cry continually without having to catch its breath.
 Generation = 3
-Evolutions = LOUDRED,Level,20
+Evolution = LOUDRED,Level,20
 #-------------------------------
 [LOUDRED]
 Name = Loudred
@@ -7754,7 +7769,7 @@ Habitat = Cave
 Category = Big Voice
 Pokedex = It positions the round speakers on its head to assail foes with ultrasonic waves at massive volume. It builds power by stomping the ground.
 Generation = 3
-Evolutions = EXPLOUD,Level,40
+Evolution = EXPLOUD,Level,40
 #-------------------------------
 [EXPLOUD]
 Name = Exploud
@@ -7807,7 +7822,7 @@ Category = Guts
 Pokedex = It loves to toughen up its body above all else. If you hear quaking rumbles in a cave, it is the sound of Makuhita undertaking strenuous training.
 Generation = 3
 WildItemUncommon = BLACKBELT
-Evolutions = HARIYAMA,Level,24
+Evolution = HARIYAMA,Level,24
 #-------------------------------
 [HARIYAMA]
 Name = Hariyama
@@ -7861,7 +7876,7 @@ Habitat = WatersEdge
 Category = Polka Dot
 Pokedex = Its tail, which is packed with nutrition, is very bouncy like a rubber ball. On sunny days they gather at the edge of water and splash about for fun.
 Generation = 3
-Evolutions = MARILL,Happiness,
+Evolution = MARILL,Happiness
 #-------------------------------
 [NOSEPASS]
 Name = Nosepass
@@ -7889,7 +7904,7 @@ Category = Compass
 Pokedex = Its body emits a powerful magnetism. It feeds on prey that is pulled in by the force. Its magnetism is stronger in cold seasons.
 Generation = 3
 WildItemUncommon = MAGNET
-Evolutions = PROBOPASS,LocationFlag,Magnetic
+Evolution = PROBOPASS,LocationFlag,Magnetic
 #-------------------------------
 [SKITTY]
 Name = Skitty
@@ -7916,7 +7931,7 @@ Habitat = Forest
 Category = Kitten
 Pokedex = A Skitty's adorably cute behavior makes it highly popular. In battle, it makes its tail puff out. It threatens foes with a sharp growl.
 Generation = 3
-Evolutions = DELCATTY,Item,MOONSTONE
+Evolution = DELCATTY,Item,MOONSTONE
 #-------------------------------
 [DELCATTY]
 Name = Delcatty
@@ -8023,7 +8038,7 @@ Category = Iron Armor
 Pokedex = A Pokémon that is clad in steel armor. A new suit of armor is made when it evolves. The old, discarded armor is salvaged as metal for making iron products.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = LAIRON,Level,32
+Evolution = LAIRON,Level,32
 #-------------------------------
 [LAIRON]
 Name = Lairon
@@ -8050,7 +8065,7 @@ Category = Iron Armor
 Pokedex = When two Lairon meet in the wild, they fight for territory by bashing into each other with their steel bodies. The sound of their collision carries for miles.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = AGGRON,Level,42
+Evolution = AGGRON,Level,42
 #-------------------------------
 [AGGRON]
 Name = Aggron
@@ -8103,7 +8118,7 @@ Habitat = Mountain
 Category = Meditate
 Pokedex = It continually meditates for hours every day. As a result of rigorous and dedicated yoga training, it has tempered its spiritual power so much it can fly.
 Generation = 3
-Evolutions = MEDICHAM,Level,37
+Evolution = MEDICHAM,Level,37
 #-------------------------------
 [MEDICHAM]
 Name = Medicham
@@ -8155,7 +8170,7 @@ Habitat = Grassland
 Category = Lightning
 Pokedex = It generates electricity using friction from the atmosphere. In seasons with especially arid air, its entire body blazes with violent showers of sparks.
 Generation = 3
-Evolutions = MANECTRIC,Level,26
+Evolution = MANECTRIC,Level,26
 #-------------------------------
 [MANECTRIC]
 Name = Manectric
@@ -8318,7 +8333,7 @@ Category = Thorn
 Pokedex = A Roselia that drinks nutritionally rich springwater blooms with lovely flowers. The fragrance of its flowers has the effect of making its foes careless.
 Generation = 3
 WildItemUncommon = POISONBARB
-Evolutions = ROSERADE,Item,SHINYSTONE
+Evolution = ROSERADE,Item,SHINYSTONE
 #-------------------------------
 [GULPIN]
 Name = Gulpin
@@ -8347,7 +8362,7 @@ Pokedex = This Pokémon's stomach fluid can even digest scrap iron. In one gulp,
 Generation = 3
 WildItemCommon = ORANBERRY
 WildItemUncommon = SITRUSBERRY
-Evolutions = SWALOT,Level,26
+Evolution = SWALOT,Level,26
 #-------------------------------
 [SWALOT]
 Name = Swalot
@@ -8402,7 +8417,7 @@ Category = Savage
 Pokedex = Carvanha attack ships in swarms, making them sink. Although it is said to be a very vicious Pokémon, it timidly flees as soon as it finds itself alone.
 Generation = 3
 WildItemUncommon = DEEPSEATOOTH
-Evolutions = SHARPEDO,Level,30
+Evolution = SHARPEDO,Level,30
 #-------------------------------
 [SHARPEDO]
 Name = Sharpedo
@@ -8455,7 +8470,7 @@ Habitat = Sea
 Category = Ball Whale
 Pokedex = While this Pokémon usually lives in the sea, it can survive on land, although not too long. It loses vitality if its body becomes dried out.
 Generation = 3
-Evolutions = WAILORD,Level,40
+Evolution = WAILORD,Level,40
 #-------------------------------
 [WAILORD]
 Name = Wailord
@@ -8507,7 +8522,7 @@ Habitat = Mountain
 Category = Numb
 Pokedex = A Numel stores boiling magma in the hump on its back. It is a hardy Pokémon that can transport a 220-pound load. It has served humans at work since long ago.
 Generation = 3
-Evolutions = CAMERUPT,Level,33
+Evolution = CAMERUPT,Level,33
 #-------------------------------
 [CAMERUPT]
 Name = Camerupt
@@ -8586,7 +8601,7 @@ Habitat = Mountain
 Category = Bounce
 Pokedex = A Pokémon that manipulates psychic power at will. It doesn't stop bouncing even when it is asleep. It loves eating mushrooms that grow underground.
 Generation = 3
-Evolutions = GRUMPIG,Level,32
+Evolution = GRUMPIG,Level,32
 #-------------------------------
 [GRUMPIG]
 Name = Grumpig
@@ -8665,7 +8680,7 @@ Category = Ant Pit
 Pokedex = Its big jaws crunch through boulders. Because its head is so big, it has a hard time getting back upright if it tips over onto its back.
 Generation = 3
 WildItemUncommon = SOFTSAND
-Evolutions = VIBRAVA,Level,35
+Evolution = VIBRAVA,Level,35
 #-------------------------------
 [VIBRAVA]
 Name = Vibrava
@@ -8690,7 +8705,7 @@ Habitat = RoughTerrain
 Category = Vibration
 Pokedex = It looses ultrasonic waves by rubbing its wings together. Since a Vibrava's wings are still in the process of growing, it can only fly short distances.
 Generation = 3
-Evolutions = FLYGON,Level,45
+Evolution = FLYGON,Level,45
 #-------------------------------
 [FLYGON]
 Name = Flygon
@@ -8742,7 +8757,7 @@ Category = Cactus
 Pokedex = Cacnea live in deserts with virtually no rainfall. It battles by swinging its thick, spiked arms. Once a year, a yellow flower blooms.
 Generation = 3
 WildItemUncommon = STICKYBARB
-Evolutions = CACTURNE,Level,32
+Evolution = CACTURNE,Level,32
 #-------------------------------
 [CACTURNE]
 Name = Cacturne
@@ -8795,7 +8810,7 @@ Habitat = Forest
 Category = Cotton Bird
 Pokedex = A Pokémon that has wings like cottony clouds. After enduring winter, in which little food is available, Swablu flocks move closer to towns in the spring.
 Generation = 3
-Evolutions = ALTARIA,Level,35
+Evolution = ALTARIA,Level,35
 #-------------------------------
 [ALTARIA]
 Name = Altaria
@@ -8953,7 +8968,7 @@ Habitat = WatersEdge
 Category = Whiskers
 Pokedex = Its body is covered with a slimy film. The film acts as a barrier to prevent germs in muddy water from entering the Barboach's body.
 Generation = 3
-Evolutions = WHISCASH,Level,30
+Evolution = WHISCASH,Level,30
 #-------------------------------
 [WHISCASH]
 Name = Whiscash
@@ -9005,7 +9020,7 @@ Habitat = WatersEdge
 Category = Ruffian
 Pokedex = Once it grips prey with its large pincers, it will never let go, no matter what. It is a hardy Pokémon that can thrive in any environment.
 Generation = 3
-Evolutions = CRAWDAUNT,Level,30
+Evolution = CRAWDAUNT,Level,30
 #-------------------------------
 [CRAWDAUNT]
 Name = Crawdaunt
@@ -9056,7 +9071,7 @@ Category = Clay Doll
 Pokedex = A Baltoy moves by spinning on its single foot. It has been depicted in murals adorning the walls of a once-bustling city in an ancient age.
 Generation = 3
 WildItemUncommon = LIGHTCLAY
-Evolutions = CLAYDOL,Level,36
+Evolution = CLAYDOL,Level,36
 #-------------------------------
 [CLAYDOL]
 Name = Claydol
@@ -9109,7 +9124,7 @@ Category = Sea Lily
 Pokedex = It disguises itself as seaweed by making its tentacles sway. Unsuspecting prey that come too close are swallowed whole. It became extinct 100 million years ago.
 Generation = 3
 WildItemUncommon = BIGROOT
-Evolutions = CRADILY,Level,40
+Evolution = CRADILY,Level,40
 #-------------------------------
 [CRADILY]
 Name = Cradily
@@ -9162,7 +9177,7 @@ Habitat = WatersEdge
 Category = Old Shrimp
 Pokedex = It was resurrected from a fossil using the power of science. It swims by undulating the wings at its sides. They were feet that adapted to life in the sea.
 Generation = 3
-Evolutions = ARMALDO,Level,40
+Evolution = ARMALDO,Level,40
 #-------------------------------
 [ARMALDO]
 Name = Armaldo
@@ -9214,7 +9229,8 @@ Habitat = WatersEdge
 Category = Fish
 Pokedex = Feebas live in ponds that are heavily infested with weeds. Because of its hopelessly shabby appearance, it seems as if few trainers raise it.
 Generation = 3
-Evolutions = MILOTIC,TradeItem,PRISMSCALE,MILOTIC,Beauty,170
+Evolution = MILOTIC,TradeItem,PRISMSCALE
+Evolution = MILOTIC,Beauty,170
 #-------------------------------
 [MILOTIC]
 Name = Milotic
@@ -9322,7 +9338,7 @@ Category = Puppet
 Pokedex = This Pokémon roams about deep in the night seeking such negative emotions as grudges and envy. It retreats to its nest when the sun begins to rise.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = BANETTE,Level,37
+Evolution = BANETTE,Level,37
 #-------------------------------
 [BANETTE]
 Name = Banette
@@ -9376,7 +9392,7 @@ Category = Requiem
 Pokedex = A glare from its single scarlet eye makes even burly grown-ups freeze in utter fear. It is a nocturnal Pokémon that roams about under the cloak of darkness.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = DUSCLOPS,Level,37
+Evolution = DUSCLOPS,Level,37
 #-------------------------------
 [DUSCLOPS]
 Name = Dusclops
@@ -9403,7 +9419,7 @@ Category = Beckon
 Pokedex = It is thought that its body is hollow with only a spectral ball of fire burning inside. However, no one has been able to confirm this theory as fact.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = DUSKNOIR,TradeItem,REAPERCLOTH
+Evolution = DUSKNOIR,TradeItem,REAPERCLOTH
 #-------------------------------
 [TROPIUS]
 Name = Tropius
@@ -9508,7 +9524,7 @@ Habitat = Cave
 Category = Bright
 Pokedex = A Wynaut loves to eat sweet fruits. It cleverly picks fruits using its earlike arms. They gather in fruit gardens, drawn by the fragrance.
 Generation = 3
-Evolutions = WOBBUFFET,Level,15
+Evolution = WOBBUFFET,Level,15
 #-------------------------------
 [SNORUNT]
 Name = Snorunt
@@ -9536,7 +9552,8 @@ Category = Snow Hat
 Pokedex = They tend to move about in groups of around five Snorunt. In snowy regions, it is said that when they are seen late at night, snowfall will arrive by morning.
 Generation = 3
 WildItemUncommon = SNOWBALL
-Evolutions = GLALIE,Level,42,FROSLASS,ItemFemale,DAWNSTONE
+Evolution = GLALIE,Level,42
+Evolution = FROSLASS,ItemFemale,DAWNSTONE
 #-------------------------------
 [GLALIE]
 Name = Glalie
@@ -9588,7 +9605,7 @@ Habitat = Sea
 Category = Clap
 Pokedex = It is completely covered with plushy fur. As a result, it never feels the cold even when it is rolling about on ice floes or diving in the sea.
 Generation = 3
-Evolutions = SEALEO,Level,32
+Evolution = SEALEO,Level,32
 #-------------------------------
 [SEALEO]
 Name = Sealeo
@@ -9614,7 +9631,7 @@ Habitat = Sea
 Category = Ball Roll
 Pokedex = Sealeo live in herds on ice floes. Using its powerful flippers, it shatters ice. It dives into the sea to hunt prey five times a day.
 Generation = 3
-Evolutions = WALREIN,Level,44
+Evolution = WALREIN,Level,44
 #-------------------------------
 [WALREIN]
 Name = Walrein
@@ -9668,7 +9685,8 @@ Pokedex = A Clamperl slams its shell closed on prey to prevent escape. The pearl
 Generation = 3
 WildItemCommon = PEARL
 WildItemUncommon = BIGPEARL
-Evolutions = HUNTAIL,TradeItem,DEEPSEATOOTH,GOREBYSS,TradeItem,DEEPSEASCALE
+Evolution = HUNTAIL,TradeItem,DEEPSEATOOTH
+Evolution = GOREBYSS,TradeItem,DEEPSEASCALE
 #-------------------------------
 [HUNTAIL]
 Name = Huntail
@@ -9802,7 +9820,7 @@ Category = Rock Head
 Pokedex = Although it is small, this Pokémon is very powerful because its body is a bundle of muscles. It launches head-butts with its ironlike skull.
 Generation = 3
 WildItemUncommon = DRAGONFANG
-Evolutions = SHELGON,Level,30
+Evolution = SHELGON,Level,30
 #-------------------------------
 [SHELGON]
 Name = Shelgon
@@ -9829,7 +9847,7 @@ Category = Endurance
 Pokedex = It hardly eats while it awaits evolution. It becomes hardier by enduring hunger. Its shell peels off the instant it begins to evolve.
 Generation = 3
 WildItemUncommon = DRAGONFANG
-Evolutions = SALAMENCE,Level,50
+Evolution = SALAMENCE,Level,50
 #-------------------------------
 [SALAMENCE]
 Name = Salamence
@@ -9882,7 +9900,7 @@ Category = Iron Ball
 Pokedex = When Beldum gather in a swarm, they move in perfect unison as if they were but one Pokémon. They communicate with each other using brain waves.
 Generation = 3
 WildItemUncommon = METALCOAT
-Evolutions = METANG,Level,20
+Evolution = METANG,Level,20
 #-------------------------------
 [METANG]
 Name = Metang
@@ -9909,7 +9927,7 @@ Category = Iron Claw
 Pokedex = The claws tipping its arms pack the destructive power to tear through thick iron sheets as if they were silk. It flies at over 60 miles per hour.
 Generation = 3
 WildItemUncommon = METALCOAT
-Evolutions = METAGROSS,Level,45
+Evolution = METAGROSS,Level,45
 #-------------------------------
 [METAGROSS]
 Name = Metagross
@@ -10218,7 +10236,7 @@ Shape = Quadruped
 Category = Tiny Leaf
 Pokedex = Made from soil, the shell on its back hardens when it drinks water. It lives along lakes.
 Generation = 4
-Evolutions = GROTLE,Level,18
+Evolution = GROTLE,Level,18
 #-------------------------------
 [GROTLE]
 Name = Grotle
@@ -10243,7 +10261,7 @@ Shape = Quadruped
 Category = Grove
 Pokedex = It lives along water in forests. In the daytime, it leaves the forest to sunbathe its treed shell.
 Generation = 4
-Evolutions = TORTERRA,Level,32
+Evolution = TORTERRA,Level,32
 #-------------------------------
 [TORTERRA]
 Name = Torterra
@@ -10293,7 +10311,7 @@ Shape = BipedalTail
 Category = Chimp
 Pokedex = It agilely scales sheer cliffs to live atop craggy mountains. Its fire is put out when it sleeps.
 Generation = 4
-Evolutions = MONFERNO,Level,14
+Evolution = MONFERNO,Level,14
 #-------------------------------
 [MONFERNO]
 Name = Monferno
@@ -10318,7 +10336,7 @@ Shape = BipedalTail
 Category = Playful
 Pokedex = To intimidate attackers, it stretches the fire on its tail to make itself appear bigger.
 Generation = 4
-Evolutions = INFERNAPE,Level,36
+Evolution = INFERNAPE,Level,36
 #-------------------------------
 [INFERNAPE]
 Name = Infernape
@@ -10368,7 +10386,7 @@ Shape = Bipedal
 Category = Penguin
 Pokedex = Because it is very proud, it hates accepting food from people. Its thick down guards it from cold.
 Generation = 4
-Evolutions = PRINPLUP,Level,16
+Evolution = PRINPLUP,Level,16
 #-------------------------------
 [PRINPLUP]
 Name = Prinplup
@@ -10393,7 +10411,7 @@ Shape = BipedalTail
 Category = Penguin
 Pokedex = It lives alone, away from others. Apparently, every one of them believes it is the most important.
 Generation = 4
-Evolutions = EMPOLEON,Level,36
+Evolution = EMPOLEON,Level,36
 #-------------------------------
 [EMPOLEON]
 Name = Empoleon
@@ -10443,7 +10461,7 @@ Shape = Winged
 Category = Starling
 Pokedex = They flock in great numbers. Though small, they flap their wings with great power.
 Generation = 4
-Evolutions = STARAVIA,Level,14
+Evolution = STARAVIA,Level,14
 #-------------------------------
 [STARAVIA]
 Name = Staravia
@@ -10468,7 +10486,7 @@ Shape = Winged
 Category = Starling
 Pokedex = It flies around forests and fields in search of bug Pokémon. It stays within a huge flock.
 Generation = 4
-Evolutions = STARAPTOR,Level,34
+Evolution = STARAPTOR,Level,34
 #-------------------------------
 [STARAPTOR]
 Name = Staraptor
@@ -10518,7 +10536,7 @@ Shape = Quadruped
 Category = Plump Mouse
 Pokedex = With nerves of steel, nothing can perturb it. It is more agile and active than it appears.
 Generation = 4
-Evolutions = BIBAREL,Level,15
+Evolution = BIBAREL,Level,15
 #-------------------------------
 [BIBAREL]
 Name = Bibarel
@@ -10568,7 +10586,7 @@ Category = Cricket
 Pokedex = It shakes its head back to front, causing its antennae to hit each other and sound like a xylophone.
 Generation = 4
 WildItemUncommon = METRONOME
-Evolutions = KRICKETUNE,Level,10
+Evolution = KRICKETUNE,Level,10
 #-------------------------------
 [KRICKETUNE]
 Name = Kricketune
@@ -10619,7 +10637,7 @@ Shape = Quadruped
 Category = Flash
 Pokedex = All of its fur dazzles if danger is sensed. It flees while the foe is momentarily blinded.
 Generation = 4
-Evolutions = LUXIO,Level,15
+Evolution = LUXIO,Level,15
 #-------------------------------
 [LUXIO]
 Name = Luxio
@@ -10644,7 +10662,7 @@ Shape = Quadruped
 Category = Spark
 Pokedex = Its claws loose electricity with enough amperage to cause fainting. They live in small groups.
 Generation = 4
-Evolutions = LUXRAY,Level,30
+Evolution = LUXRAY,Level,30
 #-------------------------------
 [LUXRAY]
 Name = Luxray
@@ -10696,7 +10714,7 @@ Category = Bud
 Pokedex = Over the winter, it closes its bud and endures the cold. In spring, the bud opens and releases pollen.
 Generation = 4
 WildItemUncommon = POISONBARB
-Evolutions = ROSELIA,HappinessDay,
+Evolution = ROSELIA,HappinessDay
 #-------------------------------
 [ROSERADE]
 Name = Roserade
@@ -10747,7 +10765,7 @@ Shape = BipedalTail
 Category = Head Butt
 Pokedex = It lived in jungles around 100 million years ago. Its skull is as hard as iron.
 Generation = 4
-Evolutions = RAMPARDOS,Level,30
+Evolution = RAMPARDOS,Level,30
 #-------------------------------
 [RAMPARDOS]
 Name = Rampardos
@@ -10797,7 +10815,7 @@ Shape = Quadruped
 Category = Shield
 Pokedex = A Pokémon that lived in jungles around 100 million years ago. Its facial hide is extremely hard.
 Generation = 4
-Evolutions = BASTIODON,Level,30
+Evolution = BASTIODON,Level,30
 #-------------------------------
 [BASTIODON]
 Name = Bastiodon
@@ -10848,7 +10866,8 @@ Category = Bagworm
 Pokedex = To shelter itself from cold, wintry winds, it covers itself with a cloak made of twigs and leaves.
 Generation = 4
 Flags = InheritFormFromMother
-Evolutions = WORMADAM,LevelFemale,20,MOTHIM,LevelMale,20
+Evolution = WORMADAM,LevelFemale,20
+Evolution = MOTHIM,LevelMale,20
 #-------------------------------
 [WORMADAM]
 Name = Wormadam
@@ -10927,7 +10946,7 @@ Category = Tiny Bee
 Pokedex = A Pokémon formed by three others. It busily carries sweet floral honey to Vespiquen.
 Generation = 4
 WildItemUncommon = HONEY
-Evolutions = VESPIQUEN,LevelFemale,21
+Evolution = VESPIQUEN,LevelFemale,21
 #-------------------------------
 [VESPIQUEN]
 Name = Vespiquen
@@ -11003,7 +11022,7 @@ Shape = Quadruped
 Category = Sea Weasel
 Pokedex = It has a flotation sac that is like an inflatable collar. It floats on water with its head out.
 Generation = 4
-Evolutions = FLOATZEL,Level,26
+Evolution = FLOATZEL,Level,26
 #-------------------------------
 [FLOATZEL]
 Name = Floatzel
@@ -11053,7 +11072,7 @@ Category = Cherry
 Pokedex = The small ball holds the nutrients needed for evolution. Apparently, it is very sweet and tasty.
 Generation = 4
 WildItemUncommon = MIRACLESEED
-Evolutions = CHERRIM,Level,25
+Evolution = CHERRIM,Level,25
 #-------------------------------
 [CHERRIM]
 Name = Cherrim
@@ -11106,7 +11125,7 @@ Category = Sea Slug
 Pokedex = Its colors and shapes differ from region to region. In the Sinnoh region, two types are confirmed.
 Generation = 4
 Flags = InheritFormFromMother
-Evolutions = GASTRODON,Level,30
+Evolution = GASTRODON,Level,30
 #-------------------------------
 [GASTRODON]
 Name = Gastrodon
@@ -11182,7 +11201,7 @@ Shape = HeadArms
 Category = Balloon
 Pokedex = A Pokémon formed by the spirits of people and Pokémon. It loves damp, humid seasons.
 Generation = 4
-Evolutions = DRIFBLIM,Level,28
+Evolution = DRIFBLIM,Level,28
 #-------------------------------
 [DRIFBLIM]
 Name = Drifblim
@@ -11232,7 +11251,7 @@ Shape = BipedalTail
 Category = Rabbit
 Pokedex = It slams foes by sharply uncoiling its rolled ears. It stings enough to make a grown-up cry in pain.
 Generation = 4
-Evolutions = LOPUNNY,Happiness,
+Evolution = LOPUNNY,Happiness
 #-------------------------------
 [LOPUNNY]
 Name = Lopunny
@@ -11329,7 +11348,7 @@ Shape = Quadruped
 Category = Catty
 Pokedex = It claws if displeased and purrs when affectionate. Its fickleness is very popular among some.
 Generation = 4
-Evolutions = PURUGLY,Level,38
+Evolution = PURUGLY,Level,38
 #-------------------------------
 [PURUGLY]
 Name = Purugly
@@ -11380,7 +11399,7 @@ Category = Bell
 Pokedex = It emits cries by agitating an orb at the back of its throat. It moves with flouncing hops.
 Generation = 4
 WildItemUncommon = CLEANSETAG
-Evolutions = CHIMECHO,HappinessNight,
+Evolution = CHIMECHO,HappinessNight
 #-------------------------------
 [STUNKY]
 Name = Stunky
@@ -11406,7 +11425,7 @@ Shape = Quadruped
 Category = Skunk
 Pokedex = It protects itself by spraying a noxious fluid from its rear. The stench lingers for 24 hours.
 Generation = 4
-Evolutions = SKUNTANK,Level,34
+Evolution = SKUNTANK,Level,34
 #-------------------------------
 [SKUNTANK]
 Name = Skuntank
@@ -11456,7 +11475,7 @@ Category = Bronze
 Pokedex = Implements shaped like it were discovered in ancient tombs. It is unknown if they are related.
 Generation = 4
 WildItemUncommon = METALCOAT
-Evolutions = BRONZONG,Level,33
+Evolution = BRONZONG,Level,33
 #-------------------------------
 [BRONZONG]
 Name = Bronzong
@@ -11508,7 +11527,7 @@ Shape = HeadLegs
 Category = Bonsai
 Pokedex = It looks as if it is always crying. It is actually adjusting its body's fluid levels by eliminating excess.
 Generation = 4
-Evolutions = SUDOWOODO,HasMove,MIMIC
+Evolution = SUDOWOODO,HasMove,MIMIC
 #-------------------------------
 [MIMEJR]
 Name = Mime Jr.
@@ -11535,7 +11554,7 @@ Shape = Bipedal
 Category = Mime
 Pokedex = It habitually mimics foes. Once mimicked, the foe cannot take its eyes off this Pokémon.
 Generation = 4
-Evolutions = MRMIME,HasMove,MIMIC
+Evolution = MRMIME,HasMove,MIMIC
 #-------------------------------
 [HAPPINY]
 Name = Happiny
@@ -11563,7 +11582,7 @@ Category = Playhouse
 Pokedex = It loves round white things. It carries an egg-shaped rock in imitation of Chansey.
 Generation = 4
 WildItemCommon = OVALSTONE
-Evolutions = CHANSEY,DayHoldItem,OVALSTONE
+Evolution = CHANSEY,DayHoldItem,OVALSTONE
 #-------------------------------
 [CHATOT]
 Name = Chatot
@@ -11640,7 +11659,7 @@ Shape = BipedalTail
 Category = Land Shark
 Pokedex = It nests in small, horizontal holes in cave walls. It pounces to catch prey that stray too close.
 Generation = 4
-Evolutions = GABITE,Level,24
+Evolution = GABITE,Level,24
 #-------------------------------
 [GABITE]
 Name = Gabite
@@ -11665,7 +11684,7 @@ Shape = BipedalTail
 Category = Cave
 Pokedex = There is a long-held belief that medicine made from its scales will heal even incurable illnesses.
 Generation = 4
-Evolutions = GARCHOMP,Level,48
+Evolution = GARCHOMP,Level,48
 #-------------------------------
 [GARCHOMP]
 Name = Garchomp
@@ -11719,7 +11738,7 @@ Generation = 4
 WildItemCommon = LEFTOVERS
 WildItemUncommon = LEFTOVERS
 WildItemRare = LEFTOVERS
-Evolutions = SNORLAX,Happiness,
+Evolution = SNORLAX,Happiness
 #-------------------------------
 [RIOLU]
 Name = Riolu
@@ -11745,7 +11764,7 @@ Shape = BipedalTail
 Category = Emanation
 Pokedex = The aura that emanates from its body intensifies to alert others if it is afraid or sad.
 Generation = 4
-Evolutions = LUCARIO,HappinessDay,
+Evolution = LUCARIO,HappinessDay
 #-------------------------------
 [LUCARIO]
 Name = Lucario
@@ -11795,7 +11814,7 @@ Shape = Quadruped
 Category = Hippo
 Pokedex = It lives in arid places. Instead of perspiration, it expels grainy sand from its body.
 Generation = 4
-Evolutions = HIPPOWDON,Level,34
+Evolution = HIPPOWDON,Level,34
 #-------------------------------
 [HIPPOWDON]
 Name = Hippowdon
@@ -11846,7 +11865,7 @@ Category = Scorpion
 Pokedex = It grips prey with its tail claws and injects poison. It tenaciously hangs on until the poison takes.
 Generation = 4
 WildItemUncommon = POISONBARB
-Evolutions = DRAPION,Level,40
+Evolution = DRAPION,Level,40
 #-------------------------------
 [DRAPION]
 Name = Drapion
@@ -11898,7 +11917,7 @@ Category = Toxic Mouth
 Pokedex = Its cheeks hold poison sacs. It tries to catch foes off guard to jab them with toxic fingers.
 Generation = 4
 WildItemUncommon = BLACKSLUDGE
-Evolutions = TOXICROAK,Level,37
+Evolution = TOXICROAK,Level,37
 #-------------------------------
 [TOXICROAK]
 Name = Toxicroak
@@ -11973,7 +11992,7 @@ Shape = Finned
 Category = Wing Fish
 Pokedex = After long exposure to sunlight, the patterns on its tail fins shine vividly when darkness arrives.
 Generation = 4
-Evolutions = LUMINEON,Level,31
+Evolution = LUMINEON,Level,31
 #-------------------------------
 [LUMINEON]
 Name = Lumineon
@@ -12024,7 +12043,7 @@ Shape = Winged
 Category = Kite
 Pokedex = A friendly Pokémon that captures the subtle flows of seawater using its two antennae.
 Generation = 4
-Evolutions = MANTINE,HasInParty,REMORAID
+Evolution = MANTINE,HasInParty,REMORAID
 #-------------------------------
 [SNOVER]
 Name = Snover
@@ -12051,7 +12070,7 @@ Category = Frost Tree
 Pokedex = It lives on snowy mountains. Having had little contact with humans, it is boldly inquisitive.
 Generation = 4
 WildItemUncommon = NEVERMELTICE
-Evolutions = ABOMASNOW,Level,40
+Evolution = ABOMASNOW,Level,40
 #-------------------------------
 [ABOMASNOW]
 Name = Abomasnow
@@ -12937,7 +12956,7 @@ Shape = BipedalTail
 Category = Grass Snake
 Pokedex = They photosynthesize by bathing their tails in sunlight. When they are not feeling well, their tails droop.
 Generation = 5
-Evolutions = SERVINE,Level,17
+Evolution = SERVINE,Level,17
 #-------------------------------
 [SERVINE]
 Name = Servine
@@ -12962,7 +12981,7 @@ Shape = BipedalTail
 Category = Grass Snake
 Pokedex = They avoid attacks by sinking into the shadows of thick foliage. They retaliate with masterful whipping techniques.
 Generation = 5
-Evolutions = SERPERIOR,Level,36
+Evolution = SERPERIOR,Level,36
 #-------------------------------
 [SERPERIOR]
 Name = Serperior
@@ -13012,7 +13031,7 @@ Shape = Quadruped
 Category = Fire Pig
 Pokedex = It blows fire through its nose. When it catches a cold, the fire becomes pitch-black smoke instead.
 Generation = 5
-Evolutions = PIGNITE,Level,17
+Evolution = PIGNITE,Level,17
 #-------------------------------
 [PIGNITE]
 Name = Pignite
@@ -13037,7 +13056,7 @@ Shape = BipedalTail
 Category = Fire Pig
 Pokedex = Whatever it eats becomes fuel for the flame in its stomach. When it is angered, the intensity of the flame increases.
 Generation = 5
-Evolutions = EMBOAR,Level,36
+Evolution = EMBOAR,Level,36
 #-------------------------------
 [EMBOAR]
 Name = Emboar
@@ -13087,7 +13106,7 @@ Shape = BipedalTail
 Category = Sea Otter
 Pokedex = The scalchop on its stomach is made from the same elements as claws. It detaches the scalchop for use as a blade.
 Generation = 5
-Evolutions = DEWOTT,Level,17
+Evolution = DEWOTT,Level,17
 #-------------------------------
 [DEWOTT]
 Name = Dewott
@@ -13112,7 +13131,7 @@ Shape = BipedalTail
 Category = Discipline
 Pokedex = Scalchop techniques differ from one Dewott to another. It never neglects maintaining its scalchops.
 Generation = 5
-Evolutions = SAMUROTT,Level,36
+Evolution = SAMUROTT,Level,36
 #-------------------------------
 [SAMUROTT]
 Name = Samurott
@@ -13162,7 +13181,7 @@ Shape = Quadruped
 Category = Scout
 Pokedex = Extremely cautious, they take shifts to maintain a constant watch of their nest. They feel insecure without a lookout.
 Generation = 5
-Evolutions = WATCHOG,Level,20
+Evolution = WATCHOG,Level,20
 #-------------------------------
 [WATCHOG]
 Name = Watchog
@@ -13212,7 +13231,7 @@ Shape = Quadruped
 Category = Puppy
 Pokedex = The long hair around its face provides an amazing radar that lets it sense subtle changes in its surroundings.
 Generation = 5
-Evolutions = HERDIER,Level,16
+Evolution = HERDIER,Level,16
 #-------------------------------
 [HERDIER]
 Name = Herdier
@@ -13237,7 +13256,7 @@ Shape = Quadruped
 Category = Loyal Dog
 Pokedex = It loyally follows its Trainer's orders. For ages, they have helped Trainers raise Pokémon.
 Generation = 5
-Evolutions = STOUTLAND,Level,32
+Evolution = STOUTLAND,Level,32
 #-------------------------------
 [STOUTLAND]
 Name = Stoutland
@@ -13287,7 +13306,7 @@ Shape = Quadruped
 Category = Devious
 Pokedex = Its cute act is a ruse. When victims let down their guard, they find their items taken. It attacks with sharp claws.
 Generation = 5
-Evolutions = LIEPARD,Level,20
+Evolution = LIEPARD,Level,20
 #-------------------------------
 [LIEPARD]
 Name = Liepard
@@ -13337,7 +13356,7 @@ Shape = BipedalTail
 Category = Grass Monkey
 Pokedex = It shares the leaf on its head with weary-looking Pokémon. These leaves are known to relieve stress.
 Generation = 5
-Evolutions = SIMISAGE,Item,LEAFSTONE
+Evolution = SIMISAGE,Item,LEAFSTONE
 #-------------------------------
 [SIMISAGE]
 Name = Simisage
@@ -13387,7 +13406,7 @@ Shape = BipedalTail
 Category = High Temp
 Pokedex = This Pokémon lives in caves in volcanoes. The fire within the tuft on its head can reach 600º F.
 Generation = 5
-Evolutions = SIMISEAR,Item,FIRESTONE
+Evolution = SIMISEAR,Item,FIRESTONE
 #-------------------------------
 [SIMISEAR]
 Name = Simisear
@@ -13437,7 +13456,7 @@ Shape = BipedalTail
 Category = Spray
 Pokedex = It does not thrive in dry environments. It keeps itself damp by shooting water stored in its head tuft from its tail.
 Generation = 5
-Evolutions = SIMIPOUR,Item,WATERSTONE
+Evolution = SIMIPOUR,Item,WATERSTONE
 #-------------------------------
 [SIMIPOUR]
 Name = Simipour
@@ -13487,7 +13506,7 @@ Shape = Quadruped
 Category = Dream Eater
 Pokedex = It eats the dreams of people and Pokémon. When it eats a pleasant dreams, it expels pink-colored mist.
 Generation = 5
-Evolutions = MUSHARNA,Item,MOONSTONE
+Evolution = MUSHARNA,Item,MOONSTONE
 #-------------------------------
 [MUSHARNA]
 Name = Musharna
@@ -13537,7 +13556,7 @@ Shape = Winged
 Category = Tiny Pigeon
 Pokedex = These Pokémon live in cities. They are accustomed to people. Flocks often gather in parks and plazas.
 Generation = 5
-Evolutions = TRANQUILL,Level,21
+Evolution = TRANQUILL,Level,21
 #-------------------------------
 [TRANQUILL]
 Name = Tranquill
@@ -13562,7 +13581,7 @@ Shape = Winged
 Category = Wild Pigeon
 Pokedex = Many people believe that, deep in the forest where Tranquill live, there is a peaceful place where there is no war.
 Generation = 5
-Evolutions = UNFEZANT,Level,32
+Evolution = UNFEZANT,Level,32
 #-------------------------------
 [UNFEZANT]
 Name = Unfezant
@@ -13612,7 +13631,7 @@ Shape = Quadruped
 Category = Electrified
 Pokedex = When thunderclouds cover the sky, it will appear. It can catch lightning with its mane and store the electricity.
 Generation = 5
-Evolutions = ZEBSTRIKA,Level,27
+Evolution = ZEBSTRIKA,Level,27
 #-------------------------------
 [ZEBSTRIKA]
 Name = Zebstrika
@@ -13664,7 +13683,7 @@ Pokedex = They were discovered a hundred years ago in an earthquake fissure. Ins
 Generation = 5
 WildItemCommon = EVERSTONE
 WildItemUncommon = HARDSTONE
-Evolutions = BOLDORE,Level,25
+Evolution = BOLDORE,Level,25
 #-------------------------------
 [BOLDORE]
 Name = Boldore
@@ -13691,7 +13710,7 @@ Pokedex = Because its energy was too great to be contained, the energy leaked an
 Generation = 5
 WildItemCommon = EVERSTONE
 WildItemUncommon = HARDSTONE
-Evolutions = GIGALITH,Trade,
+Evolution = GIGALITH,Trade
 #-------------------------------
 [GIGALITH]
 Name = Gigalith
@@ -13743,7 +13762,7 @@ Shape = Winged
 Category = Bat
 Pokedex = Suction from its nostrils enables it to stick to cave walls during sleep. It leaves a heart-shaped mark behind.
 Generation = 5
-Evolutions = SWOOBAT,Happiness,
+Evolution = SWOOBAT,Happiness
 #-------------------------------
 [SWOOBAT]
 Name = Swoobat
@@ -13793,7 +13812,7 @@ Shape = BipedalTail
 Category = Mole
 Pokedex = It makes its way swiftly through the soil by putting both claws together and rotating at high speed.
 Generation = 5
-Evolutions = EXCADRILL,Level,31
+Evolution = EXCADRILL,Level,31
 #-------------------------------
 [EXCADRILL]
 Name = Excadrill
@@ -13870,7 +13889,7 @@ Shape = Bipedal
 Category = Muscular
 Pokedex = These Pokémon appear at building sites and help out with construction. They always carry squared logs.
 Generation = 5
-Evolutions = GURDURR,Level,25
+Evolution = GURDURR,Level,25
 #-------------------------------
 [GURDURR]
 Name = Gurdurr
@@ -13895,7 +13914,7 @@ Shape = Bipedal
 Category = Muscular
 Pokedex = They strengthen their bodies by carrying steel beams. They show off their big muscles to their friends.
 Generation = 5
-Evolutions = CONKELDURR,Trade,
+Evolution = CONKELDURR,Trade
 #-------------------------------
 [CONKELDURR]
 Name = Conkeldurr
@@ -13945,7 +13964,7 @@ Shape = Finned
 Category = Tadpole
 Pokedex = By vibrating its cheeks, it emits sound waves imperceptible to humans. It uses the rhythm of these sounds to talk.
 Generation = 5
-Evolutions = PALPITOAD,Level,25
+Evolution = PALPITOAD,Level,25
 #-------------------------------
 [PALPITOAD]
 Name = Palpitoad
@@ -13970,7 +13989,7 @@ Shape = BipedalTail
 Category = Vibration
 Pokedex = It lives in the water and on land. It uses its long, sticky tongue to capture prey.
 Generation = 5
-Evolutions = SEISMITOAD,Level,36
+Evolution = SEISMITOAD,Level,36
 #-------------------------------
 [SEISMITOAD]
 Name = Seismitoad
@@ -14071,7 +14090,7 @@ Category = Sewing
 Pokedex = This Pokémon makes clothes for itself. It chews up leaves and sews them with sticky thread extruded from its mouth.
 Generation = 5
 WildItemUncommon = MENTALHERB
-Evolutions = SWADLOON,Level,20
+Evolution = SWADLOON,Level,20
 #-------------------------------
 [SWADLOON]
 Name = Swadloon
@@ -14097,7 +14116,7 @@ Category = Leaf-Wrapped
 Pokedex = It protects itself from the cold by wrapping up in leaves. It stays on the move, eating leaves in forests.
 Generation = 5
 WildItemUncommon = MENTALHERB
-Evolutions = LEAVANNY,Happiness,
+Evolution = LEAVANNY,Happiness
 #-------------------------------
 [LEAVANNY]
 Name = Leavanny
@@ -14149,7 +14168,7 @@ Category = Centipede
 Pokedex = It discovers what is going on around it by using the feelers on its head and tail. It is brutally aggresive.
 Generation = 5
 WildItemUncommon = POISONBARB
-Evolutions = WHIRLIPEDE,Level,22
+Evolution = WHIRLIPEDE,Level,22
 #-------------------------------
 [WHIRLIPEDE]
 Name = Whirlipede
@@ -14175,7 +14194,7 @@ Category = Curlipede
 Pokedex = It is usually motionless, but when attacked, it rotates at high speed and then crashes into its opponent.
 Generation = 5
 WildItemUncommon = POISONBARB
-Evolutions = SCOLIPEDE,Level,30
+Evolution = SCOLIPEDE,Level,30
 #-------------------------------
 [SCOLIPEDE]
 Name = Scolipede
@@ -14227,7 +14246,7 @@ Category = Cotton Puff
 Pokedex = They go wherever the wind takes them. On rainy days, their bodies are heavier, so they take shelter beneath big trees.
 Generation = 5
 WildItemUncommon = ABSORBBULB
-Evolutions = WHIMSICOTT,Item,SUNSTONE
+Evolution = WHIMSICOTT,Item,SUNSTONE
 #-------------------------------
 [WHIMSICOTT]
 Name = Whimsicott
@@ -14279,7 +14298,7 @@ Category = Bulb
 Pokedex = Since they prefer moist, nutrient-rich soil, the areas where Petilil live are known to be good for growing plants.
 Generation = 5
 WildItemUncommon = ABSORBBULB
-Evolutions = LILLIGANT,Item,SUNSTONE
+Evolution = LILLIGANT,Item,SUNSTONE
 #-------------------------------
 [LILLIGANT]
 Name = Lilligant
@@ -14359,7 +14378,7 @@ Category = Desert Croc
 Pokedex = It moves along below the sand's surface, except for its nose and eyes. A dark membrane shields its eyes from the sun.
 Generation = 5
 WildItemUncommon = BLACKGLASSES
-Evolutions = KROKOROK,Level,29
+Evolution = KROKOROK,Level,29
 #-------------------------------
 [KROKOROK]
 Name = Krokorok
@@ -14385,7 +14404,7 @@ Category = Desert Croc
 Pokedex = The special membrane covering its eyes can sense the heat of objects, so it can see its surroundings, even in darkness.
 Generation = 5
 WildItemUncommon = BLACKGLASSES
-Evolutions = KROOKODILE,Level,40
+Evolution = KROOKODILE,Level,40
 #-------------------------------
 [KROOKODILE]
 Name = Krookodile
@@ -14436,7 +14455,7 @@ Shape = Bipedal
 Category = Zen Charm
 Pokedex = Darumaka's droppings are hot, so people used to put them in their clothes to keep themselves warm.
 Generation = 5
-Evolutions = DARMANITAN,Level,35
+Evolution = DARMANITAN,Level,35
 #-------------------------------
 [DARMANITAN]
 Name = Darmanitan
@@ -14514,7 +14533,7 @@ Category = Rock Inn
 Pokedex = It makes a hole in a suitable rock. If that rock breaks, the Pokémon remains agitated until it locates a replacement.
 Generation = 5
 WildItemUncommon = HARDSTONE
-Evolutions = CRUSTLE,Level,34
+Evolution = CRUSTLE,Level,34
 #-------------------------------
 [CRUSTLE]
 Name = Crustle
@@ -14566,7 +14585,7 @@ Category = Shedding
 Pokedex = It immediately headbutts anyone that makes eye contact with it. Its skull is massively thick.
 Generation = 5
 WildItemUncommon = SHEDSHELL
-Evolutions = SCRAFTY,Level,39
+Evolution = SCRAFTY,Level,39
 #-------------------------------
 [SCRAFTY]
 Name = Scrafty
@@ -14642,7 +14661,7 @@ Category = Spirit
 Pokedex = These Pokémon arose from the spirits of people interred in graves in past ages. Each retains memories of its former life.
 Generation = 5
 WildItemUncommon = SPELLTAG
-Evolutions = COFAGRIGUS,Level,34
+Evolution = COFAGRIGUS,Level,34
 #-------------------------------
 [COFAGRIGUS]
 Name = Cofagrigus
@@ -14692,7 +14711,7 @@ Shape = Quadruped
 Category = Prototurtle
 Pokedex = About 100 million years ago, these Pokémon swam in oceans. It is thought they also went on land to attack prey.
 Generation = 5
-Evolutions = CARRACOSTA,Level,37
+Evolution = CARRACOSTA,Level,37
 #-------------------------------
 [CARRACOSTA]
 Name = Carracosta
@@ -14741,7 +14760,7 @@ Shape = Winged
 Category = First Bird
 Pokedex = Revived from a fossil, this Pokémon is thought to be the ancestor of all bird Pokémon.
 Generation = 5
-Evolutions = ARCHEOPS,Level,37
+Evolution = ARCHEOPS,Level,37
 #-------------------------------
 [ARCHEOPS]
 Name = Archeops
@@ -14791,7 +14810,7 @@ Category = Trash Bag
 Pokedex = The combination of garbage bags and industrial waste caused the chemical reaction that crated this Pokémon.
 Generation = 5
 WildItemUncommon = SILKSCARF
-Evolutions = GARBODOR,Level,36
+Evolution = GARBODOR,Level,36
 #-------------------------------
 [GARBODOR]
 Name = Garbodor
@@ -14842,7 +14861,7 @@ Shape = Quadruped
 Category = Tricky Fox
 Pokedex = To protect themselves from danger, they hide their true identities by transforming into people and Pokémon.
 Generation = 5
-Evolutions = ZOROARK,Level,30
+Evolution = ZOROARK,Level,30
 #-------------------------------
 [ZOROARK]
 Name = Zoroark
@@ -14891,7 +14910,7 @@ Shape = Quadruped
 Category = Chinchilla
 Pokedex = These Pokémon prefer a tidy habitat. They are always sweeping and dusting, using their tails as brooms.
 Generation = 5
-Evolutions = CINCCINO,Item,SHINYSTONE
+Evolution = CINCCINO,Item,SHINYSTONE
 #-------------------------------
 [CINCCINO]
 Name = Cinccino
@@ -14941,7 +14960,7 @@ Shape = Bipedal
 Category = Fixation
 Pokedex = They intently observe both Trainers and Pokémon. Apparently, they are looking at something that only Gothita can see.
 Generation = 5
-Evolutions = GOTHORITA,Level,32
+Evolution = GOTHORITA,Level,32
 #-------------------------------
 [GOTHORITA]
 Name = Gothorita
@@ -14966,7 +14985,7 @@ Shape = Bipedal
 Category = Manipulate
 Pokedex = Starlight is the source of their power. At night, they mark star positions by using psychic power to float stones.
 Generation = 5
-Evolutions = GOTHITELLE,Level,41
+Evolution = GOTHITELLE,Level,41
 #-------------------------------
 [GOTHITELLE]
 Name = Gothitelle
@@ -15016,7 +15035,7 @@ Shape = Head
 Category = Cell
 Pokedex = Because their bodies are enveloped in a special liquid, they can survive in any environment.
 Generation = 5
-Evolutions = DUOSION,Level,32
+Evolution = DUOSION,Level,32
 #-------------------------------
 [DUOSION]
 Name = Duosion
@@ -15041,7 +15060,7 @@ Shape = Head
 Category = Mitosis
 Pokedex = When their brains, now divided in two, are thinking the same thoughts, these Pokémon exhibit their maximum power.
 Generation = 5
-Evolutions = REUNICLUS,Level,41
+Evolution = REUNICLUS,Level,41
 #-------------------------------
 [REUNICLUS]
 Name = Reuniclus
@@ -15091,7 +15110,7 @@ Shape = Winged
 Category = Water Bird
 Pokedex = When attacked, it uses its feathers to splash water, escaping under cover of the spray.
 Generation = 5
-Evolutions = SWANNA,Level,35
+Evolution = SWANNA,Level,35
 #-------------------------------
 [SWANNA]
 Name = Swanna
@@ -15142,7 +15161,7 @@ Category = Fresh Snow
 Pokedex = This Pokémon formed from icicles bathed in energy from the morning sun. It sleeps buried in snow.
 Generation = 5
 WildItemUncommon = NEVERMELTICE
-Evolutions = VANILLISH,Level,35
+Evolution = VANILLISH,Level,35
 #-------------------------------
 [VANILLISH]
 Name = Vanillish
@@ -15168,7 +15187,7 @@ Category = Icy Snow
 Pokedex = It conceals itself from enemy eyes by creating many small ice particles and hiding among them.
 Generation = 5
 WildItemUncommon = NEVERMELTICE
-Evolutions = VANILLUXE,Level,47
+Evolution = VANILLUXE,Level,47
 #-------------------------------
 [VANILLUXE]
 Name = Vanilluxe
@@ -15220,7 +15239,7 @@ Shape = Quadruped
 Category = Season
 Pokedex = The turning of the seasons changes the color and scent of this Pokémon's fur. People use it to mark the seasons.
 Generation = 5
-Evolutions = SAWSBUCK,Level,34
+Evolution = SAWSBUCK,Level,34
 #-------------------------------
 [SAWSBUCK]
 Name = Sawsbuck
@@ -15296,7 +15315,7 @@ Shape = Bipedal
 Category = Clamping
 Pokedex = When they feel threatened, they spit an acidic liquid to drive attackers away. This Pokémon targets Shelmet.
 Generation = 5
-Evolutions = ESCAVALIER,TradeSpecies,SHELMET
+Evolution = ESCAVALIER,TradeSpecies,SHELMET
 #-------------------------------
 [ESCAVALIER]
 Name = Escavalier
@@ -15348,7 +15367,7 @@ Pokedex = For some reason, this Pokémon resembles a Poké Ball. They release po
 Generation = 5
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = AMOONGUSS,Level,39
+Evolution = AMOONGUSS,Level,39
 #-------------------------------
 [AMOONGUSS]
 Name = Amoonguss
@@ -15400,7 +15419,7 @@ Shape = Multiped
 Category = Floating
 Pokedex = They paralyze prey with poison, then drag them down to their lairs, five miles below the surface.
 Generation = 5
-Evolutions = JELLICENT,Level,40
+Evolution = JELLICENT,Level,40
 #-------------------------------
 [JELLICENT]
 Name = Jellicent
@@ -15475,7 +15494,7 @@ Shape = Insectoid
 Category = Attaching
 Pokedex = They attach themselves to large-bodied Pokémon and absorb static electricity, which they store in an electric pouch.
 Generation = 5
-Evolutions = GALVANTULA,Level,36
+Evolution = GALVANTULA,Level,36
 #-------------------------------
 [GALVANTULA]
 Name = Galvantula
@@ -15525,7 +15544,7 @@ Category = Thorn Seed
 Pokedex = They stick their spikes into cave walls and absorb the minerals they find in the rock.
 Generation = 5
 WildItemUncommon = STICKYBARB
-Evolutions = FERROTHORN,Level,40
+Evolution = FERROTHORN,Level,40
 #-------------------------------
 [FERROTHORN]
 Name = Ferrothorn
@@ -15575,7 +15594,7 @@ Shape = MultiBody
 Category = Gear
 Pokedex = Interlocking two bodies and spinning around generates the energy they need to live.
 Generation = 5
-Evolutions = KLANG,Level,38
+Evolution = KLANG,Level,38
 #-------------------------------
 [KLANG]
 Name = Klang
@@ -15600,7 +15619,7 @@ Shape = MultiBody
 Category = Gear
 Pokedex = Spinning minigears are rotated at high speed and repeatedly fired away. It is dangerous if the gears don't return.
 Generation = 5
-Evolutions = KLINKLANG,Level,49
+Evolution = KLINKLANG,Level,49
 #-------------------------------
 [KLINKLANG]
 Name = Klinklang
@@ -15648,7 +15667,7 @@ Shape = Finned
 Category = EleFish
 Pokedex = These Pokémon move in schools. They have an electricity-generating organ, so they discharge electricity if in danger.
 Generation = 5
-Evolutions = EELEKTRIK,Level,39
+Evolution = EELEKTRIK,Level,39
 #-------------------------------
 [EELEKTRIK]
 Name = Eelektrik
@@ -15672,7 +15691,7 @@ Shape = Finned
 Category = EleFish
 Pokedex = These Pokémon have a big appetite. When they spot their prey, they attack it and paralyze it with electricity.
 Generation = 5
-Evolutions = EELEKTROSS,Item,THUNDERSTONE
+Evolution = EELEKTROSS,Item,THUNDERSTONE
 #-------------------------------
 [EELEKTROSS]
 Name = Eelektross
@@ -15721,7 +15740,7 @@ Shape = BipedalTail
 Category = Cerebral
 Pokedex = This Pokémon had never been seen until it appeared from far in the desert 50 years ago.
 Generation = 5
-Evolutions = BEHEEYEM,Level,42
+Evolution = BEHEEYEM,Level,42
 #-------------------------------
 [BEHEEYEM]
 Name = Beheeyem
@@ -15771,7 +15790,7 @@ Shape = HeadBase
 Category = Candle
 Pokedex = While shining a light and pretending to be a guide, it leeches off the life force of any who follow it.
 Generation = 5
-Evolutions = LAMPENT,Level,41
+Evolution = LAMPENT,Level,41
 #-------------------------------
 [LAMPENT]
 Name = Lampent
@@ -15796,7 +15815,7 @@ Shape = HeadArms
 Category = Lamp
 Pokedex = It arrives near the moment of death and steals spirit from the body.
 Generation = 5
-Evolutions = CHANDELURE,Item,DUSKSTONE
+Evolution = CHANDELURE,Item,DUSKSTONE
 #-------------------------------
 [CHANDELURE]
 Name = Chandelure
@@ -15846,7 +15865,7 @@ Shape = BipedalTail
 Category = Tusk
 Pokedex = They mark their territory by leaving gashes in trees with their tusks. If a tusk breaks, a new one grows in quickly.
 Generation = 5
-Evolutions = FRAXURE,Level,38
+Evolution = FRAXURE,Level,38
 #-------------------------------
 [FRAXURE]
 Name = Fraxure
@@ -15871,7 +15890,7 @@ Shape = BipedalTail
 Category = Axe Jaw
 Pokedex = Their tusks can shatter rocks. Territory battles between Fraxure can be intensely violent.
 Generation = 5
-Evolutions = HAXORUS,Level,48
+Evolution = HAXORUS,Level,48
 #-------------------------------
 [HAXORUS]
 Name = Haxorus
@@ -15921,7 +15940,7 @@ Shape = BipedalTail
 Category = Chill
 Pokedex = Its nose is always running. It sniffs the snot back up because the mucus provides the raw material for its moves.
 Generation = 5
-Evolutions = BEARTIC,Level,37
+Evolution = BEARTIC,Level,37
 #-------------------------------
 [BEARTIC]
 Name = Beartic
@@ -15995,7 +16014,7 @@ Shape = Head
 Category = Snail
 Pokedex = It evolves when bathed in an electric-like energy along with Karrablast. The reason is still unknown.
 Generation = 5
-Evolutions = ACCELGOR,TradeSpecies,KARRABLAST
+Evolution = ACCELGOR,TradeSpecies,KARRABLAST
 #-------------------------------
 [ACCELGOR]
 Name = Accelgor
@@ -16071,7 +16090,7 @@ Shape = BipedalTail
 Category = Martial Arts
 Pokedex = They have mastered elegant combos. As they concentrate, their battle moves become swifter and more precise.
 Generation = 5
-Evolutions = MIENSHAO,Level,50
+Evolution = MIENSHAO,Level,50
 #-------------------------------
 [MIENSHAO]
 Name = Mienshao
@@ -16147,7 +16166,7 @@ Category = Automaton
 Pokedex = These Pokémon are thought to have been created by the science of an ancient and mysterious civilization.
 Generation = 5
 WildItemUncommon = LIGHTCLAY
-Evolutions = GOLURK,Level,43
+Evolution = GOLURK,Level,43
 #-------------------------------
 [GOLURK]
 Name = Golurk
@@ -16198,7 +16217,7 @@ Shape = Bipedal
 Category = Sharp Blade
 Pokedex = They fight at Bisharp's command. They cling to their prey and inflict damage by sinking their blades into it.
 Generation = 5
-Evolutions = BISHARP,Level,52
+Evolution = BISHARP,Level,52
 #-------------------------------
 [BISHARP]
 Name = Bisharp
@@ -16272,7 +16291,7 @@ Shape = Winged
 Category = Eaglet
 Pokedex = They will challenge anything, even strong opponents, without fear. Their frequent fights help them become stronger.
 Generation = 5
-Evolutions = BRAVIARY,Level,54
+Evolution = BRAVIARY,Level,54
 #-------------------------------
 [BRAVIARY]
 Name = Braviary
@@ -16322,7 +16341,7 @@ Shape = Winged
 Category = Diapered
 Pokedex = They tend to guard their posteriors with suitable bones they have found. They pursue weak Pokémon.
 Generation = 5
-Evolutions = MANDIBUZZ,Level,54
+Evolution = MANDIBUZZ,Level,54
 #-------------------------------
 [MANDIBUZZ]
 Name = Mandibuzz
@@ -16421,7 +16440,7 @@ Shape = Quadruped
 Category = Irate
 Pokedex = They cannot see, so they tackle and bite to learn about their surroundings. Their bodies are covered in wounds.
 Generation = 5
-Evolutions = ZWEILOUS,Level,50
+Evolution = ZWEILOUS,Level,50
 #-------------------------------
 [ZWEILOUS]
 Name = Zweilous
@@ -16445,7 +16464,7 @@ Shape = Quadruped
 Category = Hostile
 Pokedex = Since their two heads do not get along and compete with each other for food, they always eat too much.
 Generation = 5
-Evolutions = HYDREIGON,Level,64
+Evolution = HYDREIGON,Level,64
 #-------------------------------
 [HYDREIGON]
 Name = Hydreigon
@@ -16494,7 +16513,7 @@ Shape = Insectoid
 Category = Torch
 Pokedex = The base of volcanoes is where they make their homes. They shoot fire from their five horns to repel attacking enemies.
 Generation = 5
-Evolutions = VOLCARONA,Level,59
+Evolution = VOLCARONA,Level,59
 #-------------------------------
 [VOLCARONA]
 Name = Volcarona
@@ -16847,7 +16866,7 @@ Shape = BipedalTail
 Category = Spiny Nut
 Pokedex = The quills on its head are usually soft. When it flexes them, the points become so hard and sharp that they can pierce rock.
 Generation = 6
-Evolutions = QUILLADIN,Level,16
+Evolution = QUILLADIN,Level,16
 #-------------------------------
 [QUILLADIN]
 Name = Quilladin
@@ -16872,7 +16891,7 @@ Shape = BipedalTail
 Category = Spiny Armor
 Pokedex = They strengthen their lower bodies by running into one another. They are very kind and won't start fights.
 Generation = 6
-Evolutions = CHESNAUGHT,Level,36
+Evolution = CHESNAUGHT,Level,36
 #-------------------------------
 [CHESNAUGHT]
 Name = Chesnaught
@@ -16922,7 +16941,7 @@ Shape = Quadruped
 Category = Fox
 Pokedex = As it walks, it munches on a twig in place of a snack. It intimidates opponents by puffing hot air out of its ears.
 Generation = 6
-Evolutions = BRAIXEN,Level,16
+Evolution = BRAIXEN,Level,16
 #-------------------------------
 [BRAIXEN]
 Name = Braixen
@@ -16947,7 +16966,7 @@ Shape = BipedalTail
 Category = Fox
 Pokedex = When the twig is plucked from its tail, friction sets the twig alight. The flame is used to send signals to its allies.
 Generation = 6
-Evolutions = DELPHOX,Level,36
+Evolution = DELPHOX,Level,36
 #-------------------------------
 [DELPHOX]
 Name = Delphox
@@ -16997,7 +17016,7 @@ Shape = Quadruped
 Category = Bubble Frog
 Pokedex = It protects its skin by covering its body in delicate bubbles. Beneath its happy-go-lucky air, it keeps a watchful eye on its surroundings.
 Generation = 6
-Evolutions = FROGADIER,Level,16
+Evolution = FROGADIER,Level,16
 #-------------------------------
 [FROGADIER]
 Name = Frogadier
@@ -17022,7 +17041,7 @@ Shape = Bipedal
 Category = Bubble Frog
 Pokedex = It can throw bubble-covered pebbles with precise control, hitting empty cans up to a hundred feet away.
 Generation = 6
-Evolutions = GRENINJA,Level,36
+Evolution = GRENINJA,Level,36
 #-------------------------------
 [GRENINJA]
 Name = Greninja
@@ -17072,7 +17091,7 @@ Shape = BipedalTail
 Category = Digging
 Pokedex = It has ears like shovels. Digging holes strengthens its ears so much that they can sever thick roots effortlessly.
 Generation = 6
-Evolutions = DIGGERSBY,Level,20
+Evolution = DIGGERSBY,Level,20
 #-------------------------------
 [DIGGERSBY]
 Name = Diggersby
@@ -17122,7 +17141,7 @@ Shape = Winged
 Category = Tiny Robin
 Pokedex = These friendly Pokémon send signals to one another with beautiful chirps and tail-feather movements.
 Generation = 6
-Evolutions = FLETCHINDER,Level,17
+Evolution = FLETCHINDER,Level,17
 #-------------------------------
 [FLETCHINDER]
 Name = Fletchinder
@@ -17147,7 +17166,7 @@ Shape = Winged
 Category = Ember
 Pokedex = From its beak, it expels embers that set the tall grass on fire. Then it pounces on the bewildered prey that pop out of the grass.
 Generation = 6
-Evolutions = TALONFLAME,Level,35
+Evolution = TALONFLAME,Level,35
 #-------------------------------
 [TALONFLAME]
 Name = Talonflame
@@ -17197,7 +17216,7 @@ Shape = Insectoid
 Category = Scatterdust
 Pokedex = When under attack from bird Pokémon, it spews a poisonous black powder that causes paralysis on contact.
 Generation = 6
-Evolutions = SPEWPA,Level,9
+Evolution = SPEWPA,Level,9
 #-------------------------------
 [SPEWPA]
 Name = Spewpa
@@ -17222,7 +17241,7 @@ Shape = HeadBase
 Category = Scatterdust
 Pokedex = It lives hidden within thicket shadows. When predators attack, it quickly bristles the fur covering its body in an effort to threaten them.
 Generation = 6
-Evolutions = VIVILLON,Level,12
+Evolution = VIVILLON,Level,12
 #-------------------------------
 [VIVILLON]
 Name = Vivillon
@@ -17273,7 +17292,7 @@ Shape = Quadruped
 Category = Lion Cub
 Pokedex = They set off on their own from their pride and live by themselves to become stronger. These hot-blooded Pokémon are quick to fight.
 Generation = 6
-Evolutions = PYROAR,Level,35
+Evolution = PYROAR,Level,35
 #-------------------------------
 [PYROAR]
 Name = Pyroar
@@ -17325,7 +17344,7 @@ Category = Single Bloom
 Pokedex = When it finds a flower it likes, it dwells on that flower its whole life long. It floats in the wind's embrace with an untroubled heart.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = FLOETTE,Level,19
+Evolution = FLOETTE,Level,19
 #-------------------------------
 [FLOETTE]
 Name = Floette
@@ -17352,7 +17371,7 @@ Category = Single Bloom
 Pokedex = It flutters around fields of flowers and cares for flowers that are starting to wilt. It draws out the power of flowers to battle.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = FLORGES,Item,SHINYSTONE
+Evolution = FLORGES,Item,SHINYSTONE
 #-------------------------------
 [FLORGES]
 Name = Florges
@@ -17404,7 +17423,7 @@ Shape = Quadruped
 Category = Mount
 Pokedex = If it has sunshine and water, it doesn't need to eat, because it can generate energy from the leaves on its back.
 Generation = 6
-Evolutions = GOGOAT,Level,32
+Evolution = GOGOAT,Level,32
 #-------------------------------
 [GOGOAT]
 Name = Gogoat
@@ -17455,7 +17474,7 @@ Category = Playful
 Pokedex = It does its best to be taken seriously by its enemies, but its glare is not sufficiently intimidating. Chewing on a leaf is its trademark.
 Generation = 6
 WildItemUncommon = MENTALHERB
-Evolutions = PANGORO,LevelDarkInParty,32
+Evolution = PANGORO,LevelDarkInParty,32
 #-------------------------------
 [PANGORO]
 Name = Pangoro
@@ -17531,7 +17550,7 @@ Shape = BipedalTail
 Category = Restraint
 Pokedex = The organ that emits its intense psychic power is sheltered by its ears to keep power from leaking out.
 Generation = 6
-Evolutions = MEOWSTIC,Level,25
+Evolution = MEOWSTIC,Level,25
 #-------------------------------
 [MEOWSTIC]
 Name = Meowstic
@@ -17581,7 +17600,7 @@ Shape = HeadBase
 Category = Sword
 Pokedex = Apparently this Pokémon is born when a departed spirit inhabits a sword. It attaches itself to people and drinks their life force.
 Generation = 6
-Evolutions = DOUBLADE,Level,35
+Evolution = DOUBLADE,Level,35
 #-------------------------------
 [DOUBLADE]
 Name = Doublade
@@ -17605,7 +17624,7 @@ Shape = MultiBody
 Category = Sword
 Pokedex = The complex attack patterns of its two swords are unstoppable, even for an opponent greatly accomplished at swordplay.
 Generation = 6
-Evolutions = AEGISLASH,Item,DUSKSTONE
+Evolution = AEGISLASH,Item,DUSKSTONE
 #-------------------------------
 [AEGISLASH]
 Name = Aegislash
@@ -17655,7 +17674,7 @@ Shape = HeadArms
 Category = Perfume
 Pokedex = It emits a scent that enraptures those who smell it. This fragrance changes depending on what it has eaten.
 Generation = 6
-Evolutions = AROMATISSE,TradeItem,SACHET
+Evolution = AROMATISSE,TradeItem,SACHET
 #-------------------------------
 [AROMATISSE]
 Name = Aromatisse
@@ -17705,7 +17724,7 @@ Shape = HeadLegs
 Category = Cotton Candy
 Pokedex = To entangle its opponents in battle, it extrudes white threads as sweet and sticky as cotton candy.
 Generation = 6
-Evolutions = SLURPUFF,TradeItem,WHIPPEDDREAM
+Evolution = SLURPUFF,TradeItem,WHIPPEDDREAM
 #-------------------------------
 [SLURPUFF]
 Name = Slurpuff
@@ -17755,7 +17774,7 @@ Shape = Multiped
 Category = Revolving
 Pokedex = It flashes the light-emitting spots on its body, which drains its opponent's will to fight. It takes the opportunity to scuttle away and hide.
 Generation = 6
-Evolutions = MALAMAR,Level,30
+Evolution = MALAMAR,Level,30
 #-------------------------------
 [MALAMAR]
 Name = Malamar
@@ -17805,7 +17824,7 @@ Shape = MultiBody
 Category = Two-Handed
 Pokedex = They stretch and then contract, yanking their rocks along with them in bold hops. They eat seaweed that washes up on the shoreline.
 Generation = 6
-Evolutions = BARBARACLE,Level,39
+Evolution = BARBARACLE,Level,39
 #-------------------------------
 [BARBARACLE]
 Name = Barbaracle
@@ -17855,7 +17874,7 @@ Shape = HeadBase
 Category = Mock Kelp
 Pokedex = Camouflaged as rotten kelp, they spray liquid poison on prey that approaches unawares and then finish it off.
 Generation = 6
-Evolutions = DRAGALGE,Level,48
+Evolution = DRAGALGE,Level,48
 #-------------------------------
 [DRAGALGE]
 Name = Dragalge
@@ -17904,7 +17923,7 @@ Shape = Insectoid
 Category = Water Gun
 Pokedex = Through controlled expulsions of internal gas, it can expel water like a pistol shot. At close distances, it can shatter rock.
 Generation = 6
-Evolutions = CLAWITZER,Level,37
+Evolution = CLAWITZER,Level,37
 #-------------------------------
 [CLAWITZER]
 Name = Clawitzer
@@ -17953,7 +17972,7 @@ Shape = BipedalTail
 Category = Generator
 Pokedex = They make their home in deserts. They can generate their energy from basking in the sun, so eating food is not a requirement.
 Generation = 6
-Evolutions = HELIOLISK,Item,SUNSTONE
+Evolution = HELIOLISK,Item,SUNSTONE
 #-------------------------------
 [HELIOLISK]
 Name = Heliolisk
@@ -18003,7 +18022,7 @@ Shape = BipedalTail
 Category = Royal Heir
 Pokedex = Its immense jaws have enough destructive force that it can chew up an automobile. It lived 100 million years ago.
 Generation = 6
-Evolutions = TYRANTRUM,LevelDay,39
+Evolution = TYRANTRUM,LevelDay,39
 #-------------------------------
 [TYRANTRUM]
 Name = Tyrantrum
@@ -18053,7 +18072,7 @@ Shape = Quadruped
 Category = Tundra
 Pokedex = This ancient Pokémon was restored from part of its body that had been frozen in ice for over 100 million years.
 Generation = 6
-Evolutions = AURORUS,LevelNight,39
+Evolution = AURORUS,LevelNight,39
 #-------------------------------
 [AURORUS]
 Name = Aurorus
@@ -18203,7 +18222,7 @@ Category = Soft Tissue
 Pokedex = Its source of protection is its slimy, germ-laden mucous membrane. Anyone who touches it needs some thorough hand-washing.
 Generation = 6
 WildItemUncommon = SHEDSHELL
-Evolutions = SLIGGOO,Level,40
+Evolution = SLIGGOO,Level,40
 #-------------------------------
 [SLIGGOO]
 Name = Sliggoo
@@ -18229,7 +18248,7 @@ Category = Soft Tissue
 Pokedex = This Pokémon's mucous can dissolve anything. Toothless, it sprays mucous on its prey. Once they're nicely dissolved, it slurps them up.
 Generation = 6
 WildItemUncommon = SHEDSHELL
-Evolutions = GOODRA,LevelRain,50
+Evolution = GOODRA,LevelRain,50
 #-------------------------------
 [GOODRA]
 Name = Goodra
@@ -18304,7 +18323,7 @@ Shape = HeadArms
 Category = Stump
 Pokedex = These Pokémon are stumps possessed by the spirits of children who died in the forest. Their cries sound like eerie screams.
 Generation = 6
-Evolutions = TREVENANT,Trade,
+Evolution = TREVENANT,Trade
 #-------------------------------
 [TREVENANT]
 Name = Trevenant
@@ -18355,7 +18374,7 @@ Category = Pumpkin
 Pokedex = The pumpkin body is inhabited by a spirit trapped in this world. As the sun sets, it becomes restless and active.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = GOURGEIST,Trade,
+Evolution = GOURGEIST,Trade
 #-------------------------------
 [GOURGEIST]
 Name = Gourgeist
@@ -18406,7 +18425,7 @@ Shape = Quadruped
 Category = Ice Chunk
 Pokedex = It blocks opponents' attacks with the ice that shields its body. It uses cold air to repair any cracks with new ice.
 Generation = 6
-Evolutions = AVALUGG,Level,37
+Evolution = AVALUGG,Level,37
 #-------------------------------
 [AVALUGG]
 Name = Avalugg
@@ -18456,7 +18475,7 @@ Shape = Winged
 Category = Sound Wave
 Pokedex = Even a robust wrestler will become dizzy and unable to stand when exposed to its 200,000-hertz ultrasonic waves.
 Generation = 6
-Evolutions = NOIVERN,Level,48
+Evolution = NOIVERN,Level,48
 #-------------------------------
 [NOIVERN]
 Name = Noivern
@@ -18653,7 +18672,7 @@ Shape = Winged
 Category = Grass Quill
 Pokedex = It sends its feathers, which are as sharp as blades, flying in attack. Its legs are strong, so its kicks are also formidable.
 Generation = 7
-Evolutions = DARTRIX,Level,17
+Evolution = DARTRIX,Level,17
 #-------------------------------
 [DARTRIX]
 Name = Dartrix
@@ -18678,7 +18697,7 @@ Shape = Winged
 Category = Blade Quill
 Pokedex = A bit of a dandy, it spends its free time preening its wings. Its preoccupation with any dirt on its plumage can leave it unable to battle.
 Generation = 7
-Evolutions = DECIDUEYE,Level,34
+Evolution = DECIDUEYE,Level,34
 #-------------------------------
 [DECIDUEYE]
 Name = Decidueye
@@ -18728,7 +18747,7 @@ Shape = Quadruped
 Category = Fire Cat
 Pokedex = Its coat regrows twice a year. When the time comes, Litten sets its own body on fire and burns away the old fur.
 Generation = 7
-Evolutions = TORRACAT,Level,17
+Evolution = TORRACAT,Level,17
 #-------------------------------
 [TORRACAT]
 Name = Torracat
@@ -18753,7 +18772,7 @@ Shape = Quadruped
 Category = Fire Cat
 Pokedex = It can act spoiled if it grows close to its Trainer. A powerful Pokémon, its sharp claws can leave its Trainer's whole body covered in scratches.
 Generation = 7
-Evolutions = INCINEROAR,Level,34
+Evolution = INCINEROAR,Level,34
 #-------------------------------
 [INCINEROAR]
 Name = Incineroar
@@ -18803,7 +18822,7 @@ Shape = Finned
 Category = Sea Lion
 Pokedex = This Pokémon snorts body fluids from its nose, blowing balloons to smash into its foes. It's famous for being a hard worker.
 Generation = 7
-Evolutions = BRIONNE,Level,17
+Evolution = BRIONNE,Level,17
 #-------------------------------
 [BRIONNE]
 Name = Brionne
@@ -18828,7 +18847,7 @@ Shape = Finned
 Category = Pop Star
 Pokedex = It gets excited when it sees a dance it doesn't know. This hard worker practices diligently until it can learn that dance.
 Generation = 7
-Evolutions = PRIMARINA,Level,34
+Evolution = PRIMARINA,Level,34
 #-------------------------------
 [PRIMARINA]
 Name = Primarina
@@ -18879,7 +18898,7 @@ Category = Woodpecker
 Pokedex = It pecks at trees with its hard beak. You can get some idea of its mood or condition from the rhythm of its pecking.
 Generation = 7
 WildItemUncommon = ORANBERRY
-Evolutions = TRUMBEAK,Level,14
+Evolution = TRUMBEAK,Level,14
 #-------------------------------
 [TRUMBEAK]
 Name = Trumbeak
@@ -18905,7 +18924,7 @@ Category = Bugle Beak
 Pokedex = It eats berries and stores their seeds in its beak. When it encounters enemies or prey, it fires off all the seeds in a burst.
 Generation = 7
 WildItemUncommon = SITRUSBERRY
-Evolutions = TOUCANNON,Level,28
+Evolution = TOUCANNON,Level,28
 #-------------------------------
 [TOUCANNON]
 Name = Toucannon
@@ -18957,7 +18976,7 @@ Category = Loitering
 Pokedex = Its stomach takes up most of its long torso. It's a big eater, so the amount Trainers have to spend on its food is no laughing matter.
 Generation = 7
 WildItemUncommon = PECHABERRY
-Evolutions = GUMSHOOS,LevelDay,20
+Evolution = GUMSHOOS,LevelDay,20
 #-------------------------------
 [GUMSHOOS]
 Name = Gumshoos
@@ -19007,7 +19026,7 @@ Shape = Insectoid
 Category = Larva
 Pokedex = It spits a sticky thread to stop opponents in their tracks, and then it grabs them in its sharp, sturdy mandibles to take them down.
 Generation = 7
-Evolutions = CHARJABUG,Level,20
+Evolution = CHARJABUG,Level,20
 #-------------------------------
 [CHARJABUG]
 Name = Charjabug
@@ -19032,7 +19051,7 @@ Category = Battery
 Pokedex = It buries itself in fallen leaves and barely moves, munching away on humus. If you accidentally step on one, you'll get a shock!
 Generation = 7
 WildItemUncommon = CELLBATTERY
-Evolutions = VIKAVOLT,LocationFlag,Magnetic
+Evolution = VIKAVOLT,LocationFlag,Magnetic
 #-------------------------------
 [VIKAVOLT]
 Name = Vikavolt
@@ -19082,7 +19101,7 @@ Category = Boxing
 Pokedex = It punches so much, its pincers often come off from overuse, but they grow back quickly. What little meat they contain is rich and delicious.
 Generation = 7
 WildItemUncommon = ASPEARBERRY
-Evolutions = CRABOMINABLE,LocationFlag,IceRock
+Evolution = CRABOMINABLE,LocationFlag,IceRock
 #-------------------------------
 [CRABOMINABLE]
 Name = Crabominable
@@ -19161,7 +19180,7 @@ Category = Bee Fly
 Pokedex = It feeds on the nectar and pollen of flowers. Because it's able to sense auras, it can identify which flowers are about to bloom.
 Generation = 7
 WildItemUncommon = HONEY
-Evolutions = RIBOMBEE,Level,25
+Evolution = RIBOMBEE,Level,25
 #-------------------------------
 [RIBOMBEE]
 Name = Ribombee
@@ -19212,7 +19231,7 @@ Shape = Quadruped
 Category = Puppy
 Pokedex = This Pokémon has lived with people since times long ago. It can sense when its Trainer is in the dumps and will stick close by its Trainer's side.
 Generation = 7
-Evolutions = LYCANROC,Level,25
+Evolution = LYCANROC,Level,25
 #-------------------------------
 [LYCANROC]
 Name = Lycanroc
@@ -19289,7 +19308,7 @@ Category = Brutal Star
 Pokedex = It plunges the poison spike on its head into its prey. When the prey has weakened, Mareanie deals the finishing blow with its 10 tentacles.
 Generation = 7
 WildItemUncommon = POISONBARB
-Evolutions = TOXAPEX,Level,38
+Evolution = TOXAPEX,Level,38
 #-------------------------------
 [TOXAPEX]
 Name = Toxapex
@@ -19341,7 +19360,7 @@ Category = Donkey
 Pokedex = It loves playing in the mud. If it isn't showered with mud on a daily basis, it gets stressed out and stops listening to its Trainer.
 Generation = 7
 WildItemUncommon = LIGHTCLAY
-Evolutions = MUDSDALE,Level,30
+Evolution = MUDSDALE,Level,30
 #-------------------------------
 [MUDSDALE]
 Name = Mudsdale
@@ -19393,7 +19412,7 @@ Category = Water Bubble
 Pokedex = When two Dewpider meet, they display their water bubbles to each other. Then the one with the smaller bubble gets out of the other's way.
 Generation = 7
 WildItemUncommon = MYSTICWATER
-Evolutions = ARAQUANID,Level,22
+Evolution = ARAQUANID,Level,22
 #-------------------------------
 [ARAQUANID]
 Name = Araquanid
@@ -19445,7 +19464,7 @@ Category = Sickle Grass
 Pokedex = When the sun rises, Fomantis spreads its four leaves and bathes in the sunlight. The tip of its head has a pleasant aroma.
 Generation = 7
 WildItemUncommon = MIRACLESEED
-Evolutions = LURANTIS,LevelDay,34
+Evolution = LURANTIS,LevelDay,34
 #-------------------------------
 [LURANTIS]
 Name = Lurantis
@@ -19498,7 +19517,7 @@ Pokedex = It scatters its shining spores around itself. Even though they're dang
 Generation = 7
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = SHIINOTIC,Level,24
+Evolution = SHIINOTIC,Level,24
 #-------------------------------
 [SHIINOTIC]
 Name = Shiinotic
@@ -19551,7 +19570,7 @@ Category = Toxic Lizard
 Pokedex = It burns its bodily fluids to create a poisonous gas. When its enemies become disoriented from inhaling the gas, it attacks them.
 Generation = 7
 WildItemUncommon = SMOKEBALL
-Evolutions = SALAZZLE,LevelFemale,33
+Evolution = SALAZZLE,LevelFemale,33
 #-------------------------------
 [SALAZZLE]
 Name = Salazzle
@@ -19602,7 +19621,7 @@ Shape = Quadruped
 Category = Flailing
 Pokedex = Despite its adorable appearance, when it gets angry and flails about, its arms and legs could knock a pro wrestler sprawling.
 Generation = 7
-Evolutions = BEWEAR,Level,27
+Evolution = BEWEAR,Level,27
 #-------------------------------
 [BEWEAR]
 Name = Bewear
@@ -19653,7 +19672,7 @@ Category = Fruit
 Pokedex = Because of its sweet, delicious aroma, bird Pokémon are always after it, but it's not intelligent enough to care.
 Generation = 7
 WildItemUncommon = GRASSYSEED
-Evolutions = STEENEE,Level,18
+Evolution = STEENEE,Level,18
 #-------------------------------
 [STEENEE]
 Name = Steenee
@@ -19679,7 +19698,7 @@ Category = Fruit
 Pokedex = It's protected by its hard sepals, so it plays with bird Pokémon without worry. They peck it relentlessly, but it doesn't care.
 Generation = 7
 WildItemUncommon = GRASSYSEED
-Evolutions = TSAREENA,HasMove,STOMP
+Evolution = TSAREENA,HasMove,STOMP
 #-------------------------------
 [TSAREENA]
 Name = Tsareena
@@ -19805,7 +19824,7 @@ Shape = Multiped
 Category = Turn Tail
 Pokedex = This Pokémon is a coward. As it desperately dashes off, the flailing of its many legs leaves a sparkling clean path in its wake.
 Generation = 7
-Evolutions = GOLISOPOD,Level,30
+Evolution = GOLISOPOD,Level,30
 #-------------------------------
 [GOLISOPOD]
 Name = Golisopod
@@ -19855,7 +19874,7 @@ Category = Sand Heap
 Pokedex = It likes the shovel on its head, so Sandygast will get serious and fight any children who come to take it back.
 Generation = 7
 WildItemUncommon = SPELLTAG
-Evolutions = PALOSSAND,Level,42
+Evolution = PALOSSAND,Level,42
 #-------------------------------
 [PALOSSAND]
 Name = Palossand
@@ -19930,7 +19949,7 @@ Category = Synthetic
 Pokedex = The heavy control mask it wears suppresses its intrinsic capabilities. This Pokémon has some hidden special power.
 Generation = 7
 Flags = Legendary
-Evolutions = SILVALLY,Happiness,
+Evolution = SILVALLY,Happiness
 #-------------------------------
 [SILVALLY]
 Name = Silvally
@@ -20183,7 +20202,7 @@ Category = Scaly
 Pokedex = It expresses its feelings by smacking its scales. Metallic sounds echo through the tall mountains where Jangmo-o lives.
 Generation = 7
 WildItemUncommon = RAZORCLAW
-Evolutions = HAKAMOO,Level,35
+Evolution = HAKAMOO,Level,35
 #-------------------------------
 [HAKAMOO]
 Name = Hakamo-o
@@ -20209,7 +20228,7 @@ Category = Scaly
 Pokedex = It sheds and regrows its scales on a continuous basis. The scales become harder and sharper each time they're regrown.
 Generation = 7
 WildItemUncommon = RAZORCLAW
-Evolutions = KOMMOO,Level,45
+Evolution = KOMMOO,Level,45
 #-------------------------------
 [KOMMOO]
 Name = Kommo-o
@@ -20358,7 +20377,7 @@ Category = Nebula
 Pokedex = Whether or not it's a Pokémon from this world is a mystery. When it's in a jam, it warps away to a safe place to hide.
 Generation = 7
 Flags = Legendary
-Evolutions = COSMOEM,Level,43
+Evolution = COSMOEM,Level,43
 #-------------------------------
 [COSMOEM]
 Name = Cosmoem
@@ -20382,7 +20401,8 @@ Category = Protostar
 Pokedex = Motionless as if dead, its body is faintly warm to the touch. In the distant past, it was called the cocoon of the stars.
 Generation = 7
 Flags = Legendary
-Evolutions = SOLGALEO,LevelDay,53,LUNALA,LevelNight,53
+Evolution = SOLGALEO,LevelDay,53
+Evolution = LUNALA,LevelNight,53
 #-------------------------------
 [SOLGALEO]
 Name = Solgaleo
@@ -20695,7 +20715,7 @@ Category = Poison Pin
 Pokedex = An Ultra Beast that lives in a different world, it cackles wildly as it sprays its opponents with poison from the needles on its head.
 Generation = 7
 Flags = UltraBeast
-Evolutions = NAGANADEL,HasMove,DRAGONPULSE
+Evolution = NAGANADEL,HasMove,DRAGONPULSE
 #-------------------------------
 [NAGANADEL]
 Name = Naganadel
@@ -20816,7 +20836,7 @@ Category = Hex Nut
 Pokedex = It melts particles of iron and other metals found in the subsoil, so it can absorb them into its body of molten steel.
 Generation = 7
 Flags = Mythical
-Evolutions = MELMETAL,None,
+Evolution = MELMETAL,None
 #-------------------------------
 [MELMETAL]
 Name = Melmetal
diff --git a/PBS/Gen 7 backup/pokemon_forms.txt b/PBS/Gen 7 backup/pokemon_forms.txt
index a1d4b2384..0e1fc76b1 100644
--- a/PBS/Gen 7 backup/pokemon_forms.txt	
+++ b/PBS/Gen 7 backup/pokemon_forms.txt	
@@ -82,9 +82,9 @@ Weight = 3.8
 Color = Black
 Pokedex = With its incisors, it gnaws through doors and infiltrates people's homes. Then, with a twitch of its whiskers, it steals whatever food it finds.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = PECHABERRY
-Evolutions = RATICATE,LevelNight,20
+Evolution = RATICATE,LevelNight,20
 #-------------------------------
 [RATICATE,1]
 FormName = Alolan
@@ -97,7 +97,7 @@ Weight = 25.5
 Color = Black
 Pokedex = It forms a group of Rattata, which it assumes command of. Each group has its own territory, and disputes over food happen often.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = PECHABERRY
 #-------------------------------
 [RAICHU,1]
@@ -128,8 +128,8 @@ Weight = 40.0
 Color = White
 Pokedex = The skin on its back is as hard as steel. Predators go after its soft belly, so it clings to the ground desperately.
 Generation = 7
-Flags = InheritFormWithEverStone
-Evolutions = SANDSLASH,Item,ICESTONE
+Flags = InheritFormWithEverstone
+Evolution = SANDSLASH,Item,ICESTONE
 #-------------------------------
 [SANDSLASH,1]
 FormName = Alolan
@@ -144,7 +144,7 @@ Weight = 55.0
 Color = Blue
 Pokedex = It runs across snow-covered plains at high speeds. It developed thick, sharp claws to plow through the snow.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [VULPIX,1]
 FormName = Alolan
@@ -157,9 +157,9 @@ EggMoves = AGILITY,CHARM,DISABLE,ENCORE,EXTRASENSORY,FLAIL,FREEZEDRY,HOWL,HYPNOS
 Color = White
 Pokedex = In hot weather, this Pokémon makes ice shards with its six tails and sprays them around to cool itself off.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = SNOWBALL
-Evolutions = NINETALES,Item,ICESTONE
+Evolution = NINETALES,Item,ICESTONE
 #-------------------------------
 [NINETALES,1]
 FormName = Alolan
@@ -173,7 +173,7 @@ TutorMoves = AQUATAIL,ATTRACT,AURORAVEIL,BLIZZARD,BODYSLAM,CALMMIND,CAPTIVATE,CO
 Color = Blue
 Pokedex = It lives on mountains perpetually covered in snow and is revered as a deity incarnate. It appears draped in a blizzard.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = SNOWBALL
 #-------------------------------
 [DIGLETT,1]
@@ -187,7 +187,7 @@ EggMoves = ANCIENTPOWER,BEATUP,ENDURE,FEINTATTACK,FINALGAMBIT,HEADBUTT,MEMENTO,M
 Weight = 1.0
 Pokedex = Its head sports an altered form of whiskers made of metal. When in communication with its comrades, its whiskers wobble to and fro.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [DUGTRIO,1]
 FormName = Alolan
@@ -200,7 +200,7 @@ TutorMoves = AERIALACE,ATTRACT,BODYSLAM,BULLDOZE,CAPTIVATE,CONFIDE,CUT,DIG,DOUBL
 Weight = 66.6
 Pokedex = Its shining gold hair provides it with protection. It's reputed that keeping any of its fallen hairs will bring bad luck.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [MEOWTH,1]
 FormName = Alolan
@@ -213,8 +213,8 @@ EggMoves = AMNESIA,ASSIST,CHARM,COVET,FLAIL,FLATTER,FOULPLAY,HYPNOSIS,PARTINGSHO
 Color = Blue
 Pokedex = It's impulsive, selfish, and fickle. It's very popular with some Trainers who like giving it the attention it needs.
 Generation = 7
-Flags = InheritFormWithEverStone
-Evolutions = PERSIAN,Happiness,
+Flags = InheritFormWithEverstone
+Evolution = PERSIAN,Happiness
 #-------------------------------
 [PERSIAN,1]
 FormName = Alolan
@@ -229,7 +229,7 @@ Weight = 33.0
 Color = Blue
 Pokedex = Its round face is a symbol of wealth. Persian that have bigger, plumper faces are considered more beautiful.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [ALAKAZAM,1]
 FormName = Mega Alakazam
@@ -254,7 +254,7 @@ Weight = 20.3
 Color = Gray
 Pokedex = Geodude compete against each other with headbutts. The iron sand on their heads will stick to whichever one has stronger magnetism.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GRAVELER,1]
@@ -268,7 +268,7 @@ Weight = 110.0
 Color = Gray
 Pokedex = They eat rocks and often get into a scrap over them. The shock of Graveler smashing together causes a flash of light and a booming noise.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GOLEM,1]
@@ -283,7 +283,7 @@ Weight = 316.0
 Color = Gray
 Pokedex = It fires rocks charged with electricity. Even if the rock isn't fired that accurately, just grazing an opponent will cause numbness and fainting.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemCommon = CELLBATTERY
 #-------------------------------
 [SLOWBRO,1]
@@ -312,7 +312,7 @@ Weight = 42.0
 Color = Green
 Pokedex = A Grimer, which had been brought in to solve a problem with garbage, developed over time into this form.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [MUK,1]
 FormName = Alolan
@@ -326,7 +326,7 @@ Weight = 52.0
 Color = Green
 Pokedex = The garbage it eats causes continuous chemical changes in its body, which produce its exceedingly vivid coloration.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [GENGAR,1]
 FormName = Mega Gengar
@@ -353,7 +353,7 @@ Generation = 7
 #-------------------------------
 [CUBONE,1]
 Generation = 7
-Evolutions = MAROWAK,LevelNight,28
+Evolution = MAROWAK,LevelNight,28
 #-------------------------------
 [MAROWAK,1]
 FormName = Alolan
@@ -444,7 +444,7 @@ Generation = 6
 [PICHU,2]
 FormName = Spiky-Eared
 Generation = 4
-Evolutions = PIKACHU,None,
+Evolution = PIKACHU,None
 #-------------------------------
 [AMPHAROS,1]
 FormName = Mega Ampharos
@@ -1337,7 +1337,7 @@ BaseExp = 243
 Moves = 1,TACKLE,1,VINEWHIP,1,FAIRYWIND,6,FAIRYWIND,10,LUCKYCHANT,15,RAZORLEAF,20,WISH,25,MAGICALLEAF,27,GRASSYTERRAIN,33,PETALBLIZZARD,38,AROMATHERAPY,43,MISTYTERRAIN,46,MOONBLAST,50,LIGHTOFRUIN,51,PETALDANCE,58,SOLARBEAM
 EggGroups = Undiscovered
 Pokedex = The flower it's holding can no longer be found blooming anywhere. It's also thought to contain terrifying power.
-Evolutions = FLORGES,None,
+Evolution = FLORGES,None
 #-------------------------------
 [FLORGES,1]
 FormName = Yellow Flower
@@ -1515,7 +1515,7 @@ Pokedex = It summons the dead with its dreamy dancing. From their malice, it dra
 Abilities = OWNTEMPO
 HiddenAbilities = OWNTEMPO
 Flags = InheritFormFromMother
-Evolutions = LYCANROC,LevelEvening,25
+Evolution = LYCANROC,LevelEvening,25
 #-------------------------------
 [LYCANROC,1]
 FormName = Midnight Form
diff --git a/PBS/Gen 8 backup/items.txt b/PBS/Gen 8 backup/items.txt
index fb9f93285..f0d40d5e1 100644
--- a/PBS/Gen 8 backup/items.txt	
+++ b/PBS/Gen 8 backup/items.txt	
@@ -523,7 +523,7 @@ Name = Big Nugget
 NamePlural = Big Nuggets
 Pocket = 1
 Price = 40000
-Flags = Fling_30
+Flags = Fling_130
 Description = A big nugget of pure gold that gives off a lustrous gleam. A maniac will buy it for a high price.
 #-------------------------------
 [HEARTSCALE]
diff --git a/PBS/Gen 8 backup/moves.txt b/PBS/Gen 8 backup/moves.txt
index 0ee30413b..fa5dbaf27 100644
--- a/PBS/Gen 8 backup/moves.txt	
+++ b/PBS/Gen 8 backup/moves.txt	
@@ -479,7 +479,7 @@ Accuracy = 100
 TotalPP = 5
 Target = NearOther
 FunctionCode = AlwaysCriticalHit
-Flags = Contact,CanProtect,CanMirrorMove,CannotMetronome
+Flags = Contact,CanProtect,CanMirrorMove,Punching,CannotMetronome
 Description = Strikes with a fierce blow through mastery of the Dark style. Always results in a critical hit.
 #-------------------------------
 [LASHOUT]
@@ -8633,7 +8633,7 @@ Accuracy = 100
 TotalPP = 5
 Target = NearOther
 FunctionCode = HitThreeTimesAlwaysCriticalHit
-Flags = Contact,CanProtect,CanMirrorMove,CannotMetronome
+Flags = Contact,CanProtect,CanMirrorMove,Punching,CannotMetronome
 Description = Hits three times in a row with mastery of the Water style. This attack always deals critical hits.
 #-------------------------------
 [WATERSHURIKEN]
diff --git a/PBS/Gen 8 backup/pokemon.txt b/PBS/Gen 8 backup/pokemon.txt
index 451a11c0b..39aa345a4 100644
--- a/PBS/Gen 8 backup/pokemon.txt	
+++ b/PBS/Gen 8 backup/pokemon.txt	
@@ -25,7 +25,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = Bulbasaur can be seen napping in bright sunlight. There is a seed on its back. By soaking up the sun's rays, the seed grows progressively larger.
 Generation = 1
-Evolutions = IVYSAUR,Level,16
+Evolution = IVYSAUR,Level,16
 #-------------------------------
 [IVYSAUR]
 Name = Ivysaur
@@ -51,7 +51,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = To support its bulb, Ivysaur's legs grow sturdy. If it spends more time lying in the sunlight, the bud will soon bloom into a large flower.
 Generation = 1
-Evolutions = VENUSAUR,Level,32
+Evolution = VENUSAUR,Level,32
 #-------------------------------
 [VENUSAUR]
 Name = Venusaur
@@ -103,7 +103,7 @@ Habitat = Mountain
 Category = Lizard
 Pokedex = The flame that burns at the tip of its tail is an indication of its emotions. The flame wavers when Charmander is happy, and blazes when it is enraged.
 Generation = 1
-Evolutions = CHARMELEON,Level,16
+Evolution = CHARMELEON,Level,16
 #-------------------------------
 [CHARMELEON]
 Name = Charmeleon
@@ -129,7 +129,7 @@ Habitat = Mountain
 Category = Flame
 Pokedex = Without pity, its sharp claws destroy foes. If it encounters a strong enemy, it becomes agitated, and the flame on its tail flares with a bluish white color.
 Generation = 1
-Evolutions = CHARIZARD,Level,36
+Evolution = CHARIZARD,Level,36
 #-------------------------------
 [CHARIZARD]
 Name = Charizard
@@ -181,7 +181,7 @@ Habitat = WatersEdge
 Category = Tiny Turtle
 Pokedex = Its shell is not just for protection. Its rounded shape and the grooves on its surface minimize resistance in water, enabling Squirtle to swim at high speeds.
 Generation = 1
-Evolutions = WARTORTLE,Level,16
+Evolution = WARTORTLE,Level,16
 #-------------------------------
 [WARTORTLE]
 Name = Wartortle
@@ -207,7 +207,7 @@ Habitat = WatersEdge
 Category = Turtle
 Pokedex = Its large tail is covered with rich, thick fur that deepens in color with age. The scratches on its shell are evidence of this Pokémon's toughness in battle.
 Generation = 1
-Evolutions = BLASTOISE,Level,36
+Evolution = BLASTOISE,Level,36
 #-------------------------------
 [BLASTOISE]
 Name = Blastoise
@@ -258,7 +258,7 @@ Habitat = Forest
 Category = Worm
 Pokedex = Its voracious appetite compels it to devour leaves bigger than itself without hesitation. It releases a terribly strong odor from its antennae.
 Generation = 1
-Evolutions = METAPOD,Level,7
+Evolution = METAPOD,Level,7
 #-------------------------------
 [METAPOD]
 Name = Metapod
@@ -283,7 +283,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = Its shell is as hard as an iron slab. A Metapod does not move very much because it is preparing its soft innards for evolution inside the shell.
 Generation = 1
-Evolutions = BUTTERFREE,Level,10
+Evolution = BUTTERFREE,Level,10
 #-------------------------------
 [BUTTERFREE]
 Name = Butterfree
@@ -335,7 +335,7 @@ Habitat = Forest
 Category = Hairy Bug
 Pokedex = A Weedle has an extremely acute sense of smell. It distinguishes its favorite kinds of leaves from those it dislikes by sniffing with its big red proboscis (nose).
 Generation = 1
-Evolutions = KAKUNA,Level,7
+Evolution = KAKUNA,Level,7
 #-------------------------------
 [KAKUNA]
 Name = Kakuna
@@ -360,7 +360,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = It remains virtually immobile while it clings to a tree. However, on the inside, it busily prepares for evolution. This is evident from how hot its shell becomes.
 Generation = 1
-Evolutions = BEEDRILL,Level,10
+Evolution = BEEDRILL,Level,10
 #-------------------------------
 [BEEDRILL]
 Name = Beedrill
@@ -413,7 +413,7 @@ Habitat = Forest
 Category = Tiny Bird
 Pokedex = It has an extremely sharp sense of direction. It can unerringly return home to its nest, however far it may be removed from its familiar surroundings.
 Generation = 1
-Evolutions = PIDGEOTTO,Level,18
+Evolution = PIDGEOTTO,Level,18
 #-------------------------------
 [PIDGEOTTO]
 Name = Pidgeotto
@@ -439,7 +439,7 @@ Habitat = Forest
 Category = Bird
 Pokedex = This Pokémon flies around, patrolling its large territory. If its living space is violated, it shows no mercy in thoroughly punishing the foe with its sharp claws.
 Generation = 1
-Evolutions = PIDGEOT,Level,36
+Evolution = PIDGEOT,Level,36
 #-------------------------------
 [PIDGEOT]
 Name = Pidgeot
@@ -492,7 +492,7 @@ Category = Mouse
 Pokedex = A Rattata is cautious in the extreme. Even while it is asleep, it constantly moves its ears and listens for danger. It will make its nest anywhere.
 Generation = 1
 WildItemUncommon = CHILANBERRY
-Evolutions = RATICATE,Level,20
+Evolution = RATICATE,Level,20
 #-------------------------------
 [RATICATE]
 Name = Raticate
@@ -546,7 +546,7 @@ Category = Tiny Bird
 Pokedex = Its loud cry can be heard over half a mile away. If its high, keening cry is heard echoing all around, it is a sign that they are warning each other of danger.
 Generation = 1
 WildItemUncommon = SHARPBEAK
-Evolutions = FEAROW,Level,20
+Evolution = FEAROW,Level,20
 #-------------------------------
 [FEAROW]
 Name = Fearow
@@ -599,7 +599,7 @@ Habitat = Grassland
 Category = Snake
 Pokedex = An Ekans curls itself up in a spiral while it rests. This position allows it to quickly respond to an enemy from any direction with a threat from its upraised head.
 Generation = 1
-Evolutions = ARBOK,Level,22
+Evolution = ARBOK,Level,22
 #-------------------------------
 [ARBOK]
 Name = Arbok
@@ -651,7 +651,7 @@ Category = Mouse
 Pokedex = It stores electricity in the electric sacs on its cheeks. When it releases pent-up energy in a burst, the electric power is equal to a lightning bolt.
 Generation = 1
 WildItemUncommon = LIGHTBALL
-Evolutions = RAICHU,Item,THUNDERSTONE
+Evolution = RAICHU,Item,THUNDERSTONE
 #-------------------------------
 [RAICHU]
 Name = Raichu
@@ -704,7 +704,7 @@ Category = Mouse
 Pokedex = When it curls up in a ball, it can make any attack bounce off harmlessly. Its hide has turned tough and solid as a result of living in the desert.
 Generation = 1
 WildItemUncommon = GRIPCLAW
-Evolutions = SANDSLASH,Level,22
+Evolution = SANDSLASH,Level,22
 #-------------------------------
 [SANDSLASH]
 Name = Sandslash
@@ -758,7 +758,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = Its highly toxic barbs are thought to have developed as protection for this small-bodied Pokémon. When enraged, it releases a horrible toxin from its horn.
 Generation = 1
-Evolutions = NIDORINA,Level,16
+Evolution = NIDORINA,Level,16
 #-------------------------------
 [NIDORINA]
 Name = Nidorina
@@ -784,7 +784,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = When it is with its friends or family, its barbs are tucked away to prevent injury. It appears to become nervous if separated from the others.
 Generation = 1
-Evolutions = NIDOQUEEN,Item,MOONSTONE
+Evolution = NIDOQUEEN,Item,MOONSTONE
 #-------------------------------
 [NIDOQUEEN]
 Name = Nidoqueen
@@ -837,7 +837,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = The male Nidoran has developed muscles that freely move its ears in any direction. Even the slightest sound does not escape this Pokémon's notice.
 Generation = 1
-Evolutions = NIDORINO,Level,16
+Evolution = NIDORINO,Level,16
 #-------------------------------
 [NIDORINO]
 Name = Nidorino
@@ -863,7 +863,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = Its horn is harder than a diamond. If it senses a hostile presence, all the barbs on its back bristle up at once, and it challenges the foe with all its might.
 Generation = 1
-Evolutions = NIDOKING,Item,MOONSTONE
+Evolution = NIDOKING,Item,MOONSTONE
 #-------------------------------
 [NIDOKING]
 Name = Nidoking
@@ -915,7 +915,7 @@ Category = Fairy
 Pokedex = On every night of a full moon, they come out to play. When dawn arrives, the tired Clefairy go to sleep nestled up against each other in deep and quiet mountains.
 Generation = 1
 WildItemUncommon = MOONSTONE
-Evolutions = CLEFABLE,Item,MOONSTONE
+Evolution = CLEFABLE,Item,MOONSTONE
 #-------------------------------
 [CLEFABLE]
 Name = Clefable
@@ -969,7 +969,7 @@ Category = Fox
 Pokedex = It can freely control fire, making fiery orbs fly like will-o'-the-wisps. Just before evolution, its six tails grow hot as if on fire.
 Generation = 1
 WildItemUncommon = CHARCOAL
-Evolutions = NINETALES,Item,FIRESTONE
+Evolution = NINETALES,Item,FIRESTONE
 #-------------------------------
 [NINETALES]
 Name = Ninetales
@@ -1022,7 +1022,7 @@ Category = Balloon
 Pokedex = Nothing can avoid falling asleep hearing a Jigglypuff's song. The sound waves of its singing voice match the brain waves of someone in a deep sleep.
 Generation = 1
 WildItemUncommon = MOONSTONE
-Evolutions = WIGGLYTUFF,Item,MOONSTONE
+Evolution = WIGGLYTUFF,Item,MOONSTONE
 #-------------------------------
 [WIGGLYTUFF]
 Name = Wigglytuff
@@ -1075,7 +1075,7 @@ Habitat = Cave
 Category = Bat
 Pokedex = While living in pitch-black caverns, their eyes gradually grew shut and deprived them of vision. They use ultrasonic waves to detect obstacles.
 Generation = 1
-Evolutions = GOLBAT,Level,22
+Evolution = GOLBAT,Level,22
 #-------------------------------
 [GOLBAT]
 Name = Golbat
@@ -1101,7 +1101,7 @@ Habitat = Cave
 Category = Bat
 Pokedex = Its fangs easily puncture even thick animal hide. It loves to feast on the blood of people and Pokémon. It flits about in darkness and strikes from behind.
 Generation = 1
-Evolutions = CROBAT,Happiness,
+Evolution = CROBAT,Happiness
 #-------------------------------
 [ODDISH]
 Name = Oddish
@@ -1129,7 +1129,7 @@ Category = Weed
 Pokedex = It grows by absorbing moonlight. During the daytime, it buries itself in the ground, leaving only its leaves exposed to avoid detection by its enemies.
 Generation = 1
 WildItemUncommon = ABSORBBULB
-Evolutions = GLOOM,Level,21
+Evolution = GLOOM,Level,21
 #-------------------------------
 [GLOOM]
 Name = Gloom
@@ -1156,7 +1156,8 @@ Category = Weed
 Pokedex = A horribly noxious honey drools from its mouth. One whiff of the honey can result in memory loss. Some fans are said to enjoy this overwhelming stink, however.
 Generation = 1
 WildItemUncommon = ABSORBBULB
-Evolutions = VILEPLUME,Item,LEAFSTONE,BELLOSSOM,Item,SUNSTONE
+Evolution = VILEPLUME,Item,LEAFSTONE
+Evolution = BELLOSSOM,Item,SUNSTONE
 #-------------------------------
 [VILEPLUME]
 Name = Vileplume
@@ -1211,7 +1212,7 @@ Pokedex = A Paras has parasitic tochukaso mushrooms growing on its back. They gr
 Generation = 1
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = PARASECT,Level,24
+Evolution = PARASECT,Level,24
 #-------------------------------
 [PARASECT]
 Name = Parasect
@@ -1265,7 +1266,7 @@ Habitat = Forest
 Category = Insect
 Pokedex = Its coat of thin, stiff hair that covers its entire body is said to have evolved for protection. Its large eyes never fail to spot even miniscule prey.
 Generation = 1
-Evolutions = VENOMOTH,Level,31
+Evolution = VENOMOTH,Level,31
 #-------------------------------
 [VENOMOTH]
 Name = Venomoth
@@ -1319,7 +1320,7 @@ Category = Mole
 Pokedex = Diglett are raised in most farms. The reason is simple--wherever they burrow, the soil is left perfectly tilled for growing delicious crops.
 Generation = 1
 WildItemUncommon = SOFTSAND
-Evolutions = DUGTRIO,Level,26
+Evolution = DUGTRIO,Level,26
 #-------------------------------
 [DUGTRIO]
 Name = Dugtrio
@@ -1373,7 +1374,8 @@ Category = Scratch Cat
 Pokedex = Meowth withdraw their sharp claws into their paws to silently sneak about. For some reason, this Pokémon loves shiny coins that glitter with light.
 Generation = 1
 WildItemUncommon = QUICKCLAW
-Evolutions = PERSIAN,Level,28,PERRSERKER,None,
+Evolution = PERSIAN,Level,28
+Evolution = PERRSERKER,None
 #-------------------------------
 [PERSIAN]
 Name = Persian
@@ -1426,7 +1428,7 @@ Habitat = WatersEdge
 Category = Duck
 Pokedex = When its headache intensifies, it starts using strange powers. However, it has no recollection of its powers, so it always looks befuddled and bewildered.
 Generation = 1
-Evolutions = GOLDUCK,Level,33
+Evolution = GOLDUCK,Level,33
 #-------------------------------
 [GOLDUCK]
 Name = Golduck
@@ -1478,7 +1480,7 @@ Habitat = Mountain
 Category = Pig Monkey
 Pokedex = When it starts shaking and its nasal breathing turns rough, it's a sure sign of anger. However, since this happens instantly, there is no time to flee.
 Generation = 1
-Evolutions = PRIMEAPE,Level,28
+Evolution = PRIMEAPE,Level,28
 #-------------------------------
 [PRIMEAPE]
 Name = Primeape
@@ -1530,7 +1532,7 @@ Habitat = Grassland
 Category = Puppy
 Pokedex = Its superb sense of smell ensures that this Pokémon won't forget any scent, no matter what. It uses its sense of smell to detect the emotions of others.
 Generation = 1
-Evolutions = ARCANINE,Item,FIRESTONE
+Evolution = ARCANINE,Item,FIRESTONE
 #-------------------------------
 [ARCANINE]
 Name = Arcanine
@@ -1582,7 +1584,7 @@ Habitat = WatersEdge
 Category = Tadpole
 Pokedex = It is possible to see this Pokémon's spiral innards right through its thin skin. However, the skin is also very flexible. Even sharp fangs bounce right off it.
 Generation = 1
-Evolutions = POLIWHIRL,Level,25
+Evolution = POLIWHIRL,Level,25
 #-------------------------------
 [POLIWHIRL]
 Name = Poliwhirl
@@ -1609,7 +1611,8 @@ Category = Tadpole
 Pokedex = Its body surface is always wet and slick with an oily fluid. Because of this greasy covering, it can easily slip and slide out of the clutches of any enemy in battle.
 Generation = 1
 WildItemUncommon = KINGSROCK
-Evolutions = POLIWRATH,Item,WATERSTONE,POLITOED,TradeItem,KINGSROCK
+Evolution = POLIWRATH,Item,WATERSTONE
+Evolution = POLITOED,TradeItem,KINGSROCK
 #-------------------------------
 [POLIWRATH]
 Name = Poliwrath
@@ -1663,7 +1666,7 @@ Category = Psi
 Pokedex = A Pokémon that sleeps 18 hours a day. Observation revealed that it uses Teleport to change its location once every hour.
 Generation = 1
 WildItemUncommon = TWISTEDSPOON
-Evolutions = KADABRA,Level,16
+Evolution = KADABRA,Level,16
 #-------------------------------
 [KADABRA]
 Name = Kadabra
@@ -1690,7 +1693,7 @@ Category = Psi
 Pokedex = It is rumored that a boy with psychic abilities suddenly transformed into Kadabra while he was assisting research into extrasensory powers.
 Generation = 1
 WildItemUncommon = TWISTEDSPOON
-Evolutions = ALAKAZAM,Trade,
+Evolution = ALAKAZAM,Trade
 #-------------------------------
 [ALAKAZAM]
 Name = Alakazam
@@ -1744,7 +1747,7 @@ Category = Superpower
 Pokedex = It continually undertakes strenuous training to master all forms of martial arts. Its strength lets it easily hoist a sumo wrestler onto its shoulders.
 Generation = 1
 WildItemUncommon = FOCUSBAND
-Evolutions = MACHOKE,Level,28
+Evolution = MACHOKE,Level,28
 #-------------------------------
 [MACHOKE]
 Name = Machoke
@@ -1771,7 +1774,7 @@ Category = Superpower
 Pokedex = A belt is worn by a Machoke to keep its overwhelming power under control. Because it is so dangerous, no one has ever removed the belt.
 Generation = 1
 WildItemUncommon = FOCUSBAND
-Evolutions = MACHAMP,Trade,
+Evolution = MACHAMP,Trade
 #-------------------------------
 [MACHAMP]
 Name = Machamp
@@ -1824,7 +1827,7 @@ Habitat = Forest
 Category = Flower
 Pokedex = A Bellsprout's thin and flexible body lets it bend and sway to avoid any attack, however strong it may be. From its mouth, it leaks a fluid that melts even iron.
 Generation = 1
-Evolutions = WEEPINBELL,Level,21
+Evolution = WEEPINBELL,Level,21
 #-------------------------------
 [WEEPINBELL]
 Name = Weepinbell
@@ -1850,7 +1853,7 @@ Habitat = Forest
 Category = Flycatcher
 Pokedex = At night, a Weepinbell hangs on to a tree branch with its hooked rear and sleeps. If it moves around in its sleep, it may wake up to find itself on the ground.
 Generation = 1
-Evolutions = VICTREEBEL,Item,LEAFSTONE
+Evolution = VICTREEBEL,Item,LEAFSTONE
 #-------------------------------
 [VICTREEBEL]
 Name = Victreebel
@@ -1903,7 +1906,7 @@ Category = Jellyfish
 Pokedex = Its body is almost entirely composed of water. It ensnares its foe with its two long tentacles, then stabs with the poison stingers at their tips.
 Generation = 1
 WildItemUncommon = POISONBARB
-Evolutions = TENTACRUEL,Level,30
+Evolution = TENTACRUEL,Level,30
 #-------------------------------
 [TENTACRUEL]
 Name = Tentacruel
@@ -1957,7 +1960,7 @@ Category = Rock
 Pokedex = It climbs mountain paths using only the power of its arms. Because they look just like boulders lining paths, hikers may step on them without noticing.
 Generation = 1
 WildItemUncommon = EVERSTONE
-Evolutions = GRAVELER,Level,25
+Evolution = GRAVELER,Level,25
 #-------------------------------
 [GRAVELER]
 Name = Graveler
@@ -1984,7 +1987,7 @@ Category = Rock
 Pokedex = They descend from mountains by tumbling down steep slopes. They are so brutal, they smash aside obstructing trees and huge boulders with thunderous tackles.
 Generation = 1
 WildItemUncommon = EVERSTONE
-Evolutions = GOLEM,Trade,
+Evolution = GOLEM,Trade
 #-------------------------------
 [GOLEM]
 Name = Golem
@@ -2037,7 +2040,7 @@ Habitat = Grassland
 Category = Fire Horse
 Pokedex = A Ponyta is very weak at birth. It can barely stand up. Its legs become stronger as it stumbles and falls while trying to keep up with its parent.
 Generation = 1
-Evolutions = RAPIDASH,Level,40
+Evolution = RAPIDASH,Level,40
 #-------------------------------
 [RAPIDASH]
 Name = Rapidash
@@ -2090,7 +2093,8 @@ Category = Dopey
 Pokedex = It catches prey by dipping its tail in water at the side of a river. But it often forgets what it is doing and spends whole days just loafing at the water's edge.
 Generation = 1
 WildItemUncommon = LAGGINGTAIL
-Evolutions = SLOWBRO,Level,37,SLOWKING,TradeItem,KINGSROCK
+Evolution = SLOWBRO,Level,37
+Evolution = SLOWKING,TradeItem,KINGSROCK
 #-------------------------------
 [SLOWBRO]
 Name = Slowbro
@@ -2143,7 +2147,7 @@ Category = Magnet
 Pokedex = The units at its sides are extremely powerful magnets. They generate enough magnetism to draw in iron objects from over 300 feet away.
 Generation = 1
 WildItemUncommon = METALCOAT
-Evolutions = MAGNETON,Level,30
+Evolution = MAGNETON,Level,30
 #-------------------------------
 [MAGNETON]
 Name = Magneton
@@ -2170,7 +2174,8 @@ Category = Magnet
 Pokedex = It is actually three Magnemite linked by magnetism. It generates powerful radio waves that raise temperatures by 3.6 degrees F within a 3,300-foot radius.
 Generation = 1
 WildItemUncommon = METALCOAT
-Evolutions = MAGNEZONE,Item,THUNDERSTONE,MAGNEZONE,LocationFlag,Magnetic
+Evolution = MAGNEZONE,Item,THUNDERSTONE
+Evolution = MAGNEZONE,LocationFlag,Magnetic
 #-------------------------------
 [FARFETCHD]
 Name = Farfetch'd
@@ -2198,7 +2203,7 @@ Category = Wild Duck
 Pokedex = It is always seen with a stick from a plant. Apparently, there are good sticks and bad sticks. This Pokémon occasionally fights with others over choice sticks.
 Generation = 1
 WildItemUncommon = LEEK
-Evolutions = SIRFETCHD,None,
+Evolution = SIRFETCHD,None
 #-------------------------------
 [DODUO]
 Name = Doduo
@@ -2226,7 +2231,7 @@ Category = Twin Bird
 Pokedex = Even while eating or sleeping, one of the heads remains always vigilant for any sign of danger. When threatened, it flees at over 60 miles per hour.
 Generation = 1
 WildItemUncommon = SHARPBEAK
-Evolutions = DODRIO,Level,31
+Evolution = DODRIO,Level,31
 #-------------------------------
 [DODRIO]
 Name = Dodrio
@@ -2279,7 +2284,7 @@ Habitat = Sea
 Category = Sea Lion
 Pokedex = Seel hunt for prey in frigid, ice-covered seas. When it needs to breathe, it punches a hole through the ice with the sharply protruding section of its head.
 Generation = 1
-Evolutions = DEWGONG,Level,34
+Evolution = DEWGONG,Level,34
 #-------------------------------
 [DEWGONG]
 Name = Dewgong
@@ -2332,7 +2337,7 @@ Category = Sludge
 Pokedex = Born from polluted sludge in the sea, Grimer's favorite food is anything filthy. They feed on wastewater pumped out from factories.
 Generation = 1
 WildItemUncommon = BLACKSLUDGE
-Evolutions = MUK,Level,38
+Evolution = MUK,Level,38
 #-------------------------------
 [MUK]
 Name = Muk
@@ -2387,7 +2392,7 @@ Pokedex = At night, it burrows a hole in the seafloor with its broad tongue to m
 Generation = 1
 WildItemCommon = PEARL
 WildItemUncommon = BIGPEARL
-Evolutions = CLOYSTER,Item,WATERSTONE
+Evolution = CLOYSTER,Item,WATERSTONE
 #-------------------------------
 [CLOYSTER]
 Name = Cloyster
@@ -2440,7 +2445,7 @@ Habitat = Cave
 Category = Gas
 Pokedex = When exposed to a strong wind, a Gastly's gaseous body quickly dwindles away. They cluster under the eaves of houses to escape the ravages of wind.
 Generation = 1
-Evolutions = HAUNTER,Level,25
+Evolution = HAUNTER,Level,25
 #-------------------------------
 [HAUNTER]
 Name = Haunter
@@ -2465,7 +2470,7 @@ Habitat = Cave
 Category = Gas
 Pokedex = If a Haunter beckons you while it is floating in darkness, don't approach it. This Pokémon will try to lick you with its tongue and steal your life away.
 Generation = 1
-Evolutions = GENGAR,Trade,
+Evolution = GENGAR,Trade
 #-------------------------------
 [GENGAR]
 Name = Gengar
@@ -2516,7 +2521,7 @@ Habitat = Cave
 Category = Rock Snake
 Pokedex = There is a magnet in its brain that prevents an Onix from losing direction while tunneling. As it grows older, its body becomes steadily rounder and smoother.
 Generation = 1
-Evolutions = STEELIX,TradeItem,METALCOAT
+Evolution = STEELIX,TradeItem,METALCOAT
 #-------------------------------
 [DROWZEE]
 Name = Drowzee
@@ -2543,7 +2548,7 @@ Habitat = Grassland
 Category = Hypnosis
 Pokedex = If your nose becomes itchy while you are sleeping, it's a sure sign that a Drowzee is standing above your pillow and trying to eat your dream through your nostrils.
 Generation = 1
-Evolutions = HYPNO,Level,26
+Evolution = HYPNO,Level,26
 #-------------------------------
 [HYPNO]
 Name = Hypno
@@ -2595,7 +2600,7 @@ Habitat = WatersEdge
 Category = River Crab
 Pokedex = Krabby live in holes dug into beaches. On sandy shores with little in the way of food, they can be seen squabbling with each other over territory.
 Generation = 1
-Evolutions = KINGLER,Level,28
+Evolution = KINGLER,Level,28
 #-------------------------------
 [KINGLER]
 Name = Kingler
@@ -2646,7 +2651,7 @@ Habitat = Urban
 Category = Ball
 Pokedex = It bears an uncanny and unexplained resemblance to a Poké Ball. Because it explodes at the slightest shock, even veteran trainers treat it with caution.
 Generation = 1
-Evolutions = ELECTRODE,Level,30
+Evolution = ELECTRODE,Level,30
 #-------------------------------
 [ELECTRODE]
 Name = Electrode
@@ -2699,7 +2704,7 @@ Category = Egg
 Pokedex = It consists of six eggs that care for each other. The eggs attract each other and spin around. When cracks increasingly appear, it is close to evolution.
 Generation = 1
 WildItemUncommon = PSYCHICSEED
-Evolutions = EXEGGUTOR,Item,LEAFSTONE
+Evolution = EXEGGUTOR,Item,LEAFSTONE
 #-------------------------------
 [EXEGGUTOR]
 Name = Exeggutor
@@ -2752,7 +2757,7 @@ Category = Lonely
 Pokedex = It pines for the mother it will never see again. Seeing a likeness of its mother in the full moon, it cries. The stains on the skull it wears are from its tears.
 Generation = 1
 WildItemUncommon = THICKCLUB
-Evolutions = MAROWAK,Level,28
+Evolution = MAROWAK,Level,28
 #-------------------------------
 [MAROWAK]
 Name = Marowak
@@ -2856,7 +2861,7 @@ Category = Licking
 Pokedex = Whenever it sees something unfamiliar, it always licks the object because it memorizes things by texture and taste. It is somewhat put off by sour things.
 Generation = 1
 WildItemUncommon = LAGGINGTAIL
-Evolutions = LICKILICKY,HasMove,ROLLOUT
+Evolution = LICKILICKY,HasMove,ROLLOUT
 #-------------------------------
 [KOFFING]
 Name = Koffing
@@ -2884,7 +2889,7 @@ Category = Poison Gas
 Pokedex = Getting up close to a Koffing will give you a chance to observe, through its thin skin, the toxic gases swirling inside. It blows up at the slightest stimulation.
 Generation = 1
 WildItemUncommon = SMOKEBALL
-Evolutions = WEEZING,Level,35
+Evolution = WEEZING,Level,35
 #-------------------------------
 [WEEZING]
 Name = Weezing
@@ -2937,7 +2942,7 @@ Habitat = RoughTerrain
 Category = Spikes
 Pokedex = Once it starts running, it doesn't stop. Its tiny brain makes it so stupid that it can't remember why it started running in the first place.
 Generation = 1
-Evolutions = RHYDON,Level,42
+Evolution = RHYDON,Level,42
 #-------------------------------
 [RHYDON]
 Name = Rhydon
@@ -2963,7 +2968,7 @@ Habitat = RoughTerrain
 Category = Drill
 Pokedex = Its horn, which rotates like a drill, destroys tall buildings with one strike. It stands on its hind legs, and its brain is well developed.
 Generation = 1
-Evolutions = RHYPERIOR,TradeItem,PROTECTOR
+Evolution = RHYPERIOR,TradeItem,PROTECTOR
 #-------------------------------
 [CHANSEY]
 Name = Chansey
@@ -2991,7 +2996,7 @@ Category = Egg
 Pokedex = Chansey lay nutritionally excellent eggs every day. The eggs are so delicious, they are eagerly devoured by even those who have lost their appetite.
 Generation = 1
 WildItemCommon = LUCKYPUNCH
-Evolutions = BLISSEY,Happiness,
+Evolution = BLISSEY,Happiness
 #-------------------------------
 [TANGELA]
 Name = Tangela
@@ -3018,7 +3023,7 @@ Habitat = Grassland
 Category = Vine
 Pokedex = Its vines snap off easily and painlessly if they are grabbed, allowing it to make a quick getaway. The lost vines are replaced by new growth the very next day.
 Generation = 1
-Evolutions = TANGROWTH,HasMove,ANCIENTPOWER
+Evolution = TANGROWTH,HasMove,ANCIENTPOWER
 #-------------------------------
 [KANGASKHAN]
 Name = Kangaskhan
@@ -3072,7 +3077,7 @@ Category = Dragon
 Pokedex = By cleverly flicking the fins on its back side to side, it moves in any direction while facing forward. It spits ink to escape if it senses danger.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = SEADRA,Level,32
+Evolution = SEADRA,Level,32
 #-------------------------------
 [SEADRA]
 Name = Seadra
@@ -3099,7 +3104,7 @@ Category = Dragon
 Pokedex = The poisonous barbs all over its body are highly valued as ingredients for making traditional herbal medicine. It shows no mercy to anything approaching its nest.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = KINGDRA,TradeItem,DRAGONSCALE
+Evolution = KINGDRA,TradeItem,DRAGONSCALE
 #-------------------------------
 [GOLDEEN]
 Name = Goldeen
@@ -3127,7 +3132,7 @@ Category = Goldfish
 Pokedex = In the springtime, schools of Goldeen can be seen swimming up falls and rivers. It metes out staggering damage with its single horn.
 Generation = 1
 WildItemUncommon = MYSTICWATER
-Evolutions = SEAKING,Level,33
+Evolution = SEAKING,Level,33
 #-------------------------------
 [SEAKING]
 Name = Seaking
@@ -3181,7 +3186,7 @@ Pokedex = It gathers with others in the night and makes its red core glow on and
 Generation = 1
 WildItemCommon = STARDUST
 WildItemUncommon = STARPIECE
-Evolutions = STARMIE,Item,WATERSTONE
+Evolution = STARMIE,Item,WATERSTONE
 #-------------------------------
 [STARMIE]
 Name = Starmie
@@ -3235,7 +3240,7 @@ Habitat = Urban
 Category = Barrier
 Pokedex = A Mr. Mime is a master of pantomime. It can convince others that something unseeable actually exists. Once believed, the imaginary object does become real.
 Generation = 1
-Evolutions = MRRIME,None,
+Evolution = MRRIME,None
 #-------------------------------
 [SCYTHER]
 Name = Scyther
@@ -3262,7 +3267,7 @@ Habitat = Grassland
 Category = Mantis
 Pokedex = Its blindingly fast speed adds to the sharpness of its twin forearm scythes. The scythes can slice through thick logs in one wicked stroke.
 Generation = 1
-Evolutions = SCIZOR,TradeItem,METALCOAT
+Evolution = SCIZOR,TradeItem,METALCOAT
 #-------------------------------
 [JYNX]
 Name = Jynx
@@ -3314,7 +3319,7 @@ Category = Electric
 Pokedex = When a storm approaches, it competes with others to scale heights that are likely to be stricken by lightning. Some towns use Electabuzz as lightning rods.
 Generation = 1
 WildItemUncommon = ELECTIRIZER
-Evolutions = ELECTIVIRE,TradeItem,ELECTIRIZER
+Evolution = ELECTIVIRE,TradeItem,ELECTIRIZER
 #-------------------------------
 [MAGMAR]
 Name = Magmar
@@ -3341,7 +3346,7 @@ Category = Spitfire
 Pokedex = In battle, it blows out intense flames from all over its body to intimidate its foe. These fiery bursts create heat waves that ignite grass and trees.
 Generation = 1
 WildItemUncommon = MAGMARIZER
-Evolutions = MAGMORTAR,TradeItem,MAGMARIZER
+Evolution = MAGMORTAR,TradeItem,MAGMARIZER
 #-------------------------------
 [PINSIR]
 Name = Pinsir
@@ -3418,7 +3423,7 @@ Habitat = WatersEdge
 Category = Fish
 Pokedex = Its swimming muscles are weak, so it is easily washed away by currents. In places where water pools, you can see many Magikarp deposited there by the flow.
 Generation = 1
-Evolutions = GYARADOS,Level,20
+Evolution = GYARADOS,Level,20
 #-------------------------------
 [GYARADOS]
 Name = Gyarados
@@ -3525,7 +3530,16 @@ Habitat = Urban
 Category = Evolution
 Pokedex = An Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokémon to evolve.
 Generation = 1
-Evolutions = VAPOREON,Item,WATERSTONE,JOLTEON,Item,THUNDERSTONE,FLAREON,Item,FIRESTONE,LEAFEON,Item,LEAFSTONE,LEAFEON,LocationFlag,MossRock,GLACEON,Item,ICESTONE,GLACEON,LocationFlag,IceRock,SYLVEON,HappinessMoveType,FAIRY,ESPEON,HappinessDay,,UMBREON,HappinessNight,
+Evolution = VAPOREON,Item,WATERSTONE
+Evolution = JOLTEON,Item,THUNDERSTONE
+Evolution = FLAREON,Item,FIRESTONE
+Evolution = LEAFEON,Item,LEAFSTONE
+Evolution = LEAFEON,LocationFlag,MossRock
+Evolution = GLACEON,Item,ICESTONE
+Evolution = GLACEON,LocationFlag,IceRock
+Evolution = SYLVEON,HappinessMoveType,FAIRY
+Evolution = ESPEON,HappinessDay
+Evolution = UMBREON,HappinessNight
 #-------------------------------
 [VAPOREON]
 Name = Vaporeon
@@ -3626,7 +3640,7 @@ Habitat = Urban
 Category = Virtual
 Pokedex = It is capable of reverting itself entirely back to program data in order to enter cyberspace. A Porygon is copy-protected so it cannot be duplicated.
 Generation = 1
-Evolutions = PORYGON2,TradeItem,UPGRADE
+Evolution = PORYGON2,TradeItem,UPGRADE
 #-------------------------------
 [OMANYTE]
 Name = Omanyte
@@ -3653,7 +3667,7 @@ Habitat = Sea
 Category = Spiral
 Pokedex = One of the ancient and long-since-extinct Pokémon that have been regenerated from fossils by humans. If attacked, it withdraws into its hard shell.
 Generation = 1
-Evolutions = OMASTAR,Level,40
+Evolution = OMASTAR,Level,40
 #-------------------------------
 [OMASTAR]
 Name = Omastar
@@ -3705,7 +3719,7 @@ Habitat = Sea
 Category = Shellfish
 Pokedex = This Pokémon has been regenerated from a fossil. However, in rare cases, living examples have been discovered. Kabuto have not changed for 300 million years.
 Generation = 1
-Evolutions = KABUTOPS,Level,40
+Evolution = KABUTOPS,Level,40
 #-------------------------------
 [KABUTOPS]
 Name = Kabutops
@@ -3891,7 +3905,7 @@ Category = Dragon
 Pokedex = A Dratini continually molts and sloughs off its old skin. It does so because the life energy within its body steadily builds to reach uncontrollable levels.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = DRAGONAIR,Level,30
+Evolution = DRAGONAIR,Level,30
 #-------------------------------
 [DRAGONAIR]
 Name = Dragonair
@@ -3918,7 +3932,7 @@ Category = Dragon
 Pokedex = A Dragonair stores an enormous amount of energy inside its body. It is said to alter the weather around it by loosing energy from the crystals on its neck and tail.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = DRAGONITE,Level,55
+Evolution = DRAGONITE,Level,55
 #-------------------------------
 [DRAGONITE]
 Name = Dragonite
@@ -4025,7 +4039,7 @@ Habitat = Grassland
 Category = Leaf
 Pokedex = It waves its leaf around to keep foes at bay. However, a sweet fragrance also wafts from the leaf, creating a friendly atmosphere that becalms the battlers.
 Generation = 2
-Evolutions = BAYLEEF,Level,16
+Evolution = BAYLEEF,Level,16
 #-------------------------------
 [BAYLEEF]
 Name = Bayleef
@@ -4051,7 +4065,7 @@ Habitat = Grassland
 Category = Leaf
 Pokedex = A Bayleef's neck is ringed by curled-up leaves. Inside each leaf is a small tree shoot. The fragrance of this shoot makes people peppy.
 Generation = 2
-Evolutions = MEGANIUM,Level,32
+Evolution = MEGANIUM,Level,32
 #-------------------------------
 [MEGANIUM]
 Name = Meganium
@@ -4103,7 +4117,7 @@ Habitat = Grassland
 Category = Fire Mouse
 Pokedex = It flares flames from its back to protect itself. The fire burns vigorously if the Pokémon is angry. When it is tired, it sputters with incomplete combustion.
 Generation = 2
-Evolutions = QUILAVA,Level,14
+Evolution = QUILAVA,Level,14
 #-------------------------------
 [QUILAVA]
 Name = Quilava
@@ -4129,7 +4143,7 @@ Habitat = Grassland
 Category = Volcano
 Pokedex = It intimidates foes with intense gusts of flames and superheated air. Its quick nimbleness lets it dodge attacks even while scorching an enemy.
 Generation = 2
-Evolutions = TYPHLOSION,Level,36
+Evolution = TYPHLOSION,Level,36
 #-------------------------------
 [TYPHLOSION]
 Name = Typhlosion
@@ -4181,7 +4195,7 @@ Habitat = WatersEdge
 Category = Big Jaw
 Pokedex = Despite its small body, Totodile's jaws are very powerful. While it may think it is just playfully nipping, its bite has enough strength to cause serious injury.
 Generation = 2
-Evolutions = CROCONAW,Level,18
+Evolution = CROCONAW,Level,18
 #-------------------------------
 [CROCONAW]
 Name = Croconaw
@@ -4207,7 +4221,7 @@ Habitat = WatersEdge
 Category = Big Jaw
 Pokedex = Once its jaws clamp down on its foe, it will absolutely not let go. Because the tips of its fangs are forked back like fishhooks, they become irremovably embedded.
 Generation = 2
-Evolutions = FERALIGATR,Level,30
+Evolution = FERALIGATR,Level,30
 #-------------------------------
 [FERALIGATR]
 Name = Feraligatr
@@ -4259,7 +4273,7 @@ Habitat = Grassland
 Category = Scout
 Pokedex = They take turns standing guard when it is time to sleep. The sentry awakens the others if it senses danger. If one gets separated, it turns sleepless with fear.
 Generation = 2
-Evolutions = FURRET,Level,15
+Evolution = FURRET,Level,15
 #-------------------------------
 [FURRET]
 Name = Furret
@@ -4311,7 +4325,7 @@ Habitat = Forest
 Category = Owl
 Pokedex = It has an internal organ that senses the earth's rotation. Using this special organ, a Hoothoot begins hooting at precisely the same time every day.
 Generation = 2
-Evolutions = NOCTOWL,Level,20
+Evolution = NOCTOWL,Level,20
 #-------------------------------
 [NOCTOWL]
 Name = Noctowl
@@ -4363,7 +4377,7 @@ Habitat = Forest
 Category = Five Star
 Pokedex = Ledyba communicate using a fluid that they secrete from where the legs join the body. They are said to convey feelings to others by altering the fluid's scent.
 Generation = 2
-Evolutions = LEDIAN,Level,18
+Evolution = LEDIAN,Level,18
 #-------------------------------
 [LEDIAN]
 Name = Ledian
@@ -4415,7 +4429,7 @@ Habitat = Forest
 Category = String Spit
 Pokedex = The web it spins can be considered its second nervous system. It is said that a Spinarak determines its prey by the tiny vibrations it feels through the web.
 Generation = 2
-Evolutions = ARIADOS,Level,22
+Evolution = ARIADOS,Level,22
 #-------------------------------
 [ARIADOS]
 Name = Ariados
@@ -4493,7 +4507,7 @@ Category = Angler
 Pokedex = When it senses danger, it discharges positive and negative electricity from its two antennae. It lives in depths beyond sunlight's reach.
 Generation = 2
 WildItemUncommon = DEEPSEASCALE
-Evolutions = LANTURN,Level,27
+Evolution = LANTURN,Level,27
 #-------------------------------
 [LANTURN]
 Name = Lanturn
@@ -4546,7 +4560,7 @@ Habitat = Forest
 Category = Tiny Mouse
 Pokedex = It is still inept at retaining electricity. When it is startled, it discharges power accidentally. It gets better at holding power as it grows older.
 Generation = 2
-Evolutions = PIKACHU,Happiness,
+Evolution = PIKACHU,Happiness
 #-------------------------------
 [CLEFFA]
 Name = Cleffa
@@ -4574,7 +4588,7 @@ Category = Star Shape
 Pokedex = On nights with many shooting stars, Cleffa can be seen dancing in a ring. They dance until daybreak, when they quench their thirst with the morning dew.
 Generation = 2
 WildItemUncommon = MOONSTONE
-Evolutions = CLEFAIRY,Happiness,
+Evolution = CLEFAIRY,Happiness
 #-------------------------------
 [IGGLYBUFF]
 Name = Igglybuff
@@ -4601,7 +4615,7 @@ Habitat = Grassland
 Category = Balloon
 Pokedex = Its soft and pliable body is very bouncy. When it sings continuously with all its might, its body steadily turns a deepening pink color.
 Generation = 2
-Evolutions = JIGGLYPUFF,Happiness,
+Evolution = JIGGLYPUFF,Happiness
 #-------------------------------
 [TOGEPI]
 Name = Togepi
@@ -4628,7 +4642,7 @@ Habitat = Forest
 Category = Spike Ball
 Pokedex = As its energy, it uses the feelings of compassion and pleasure exuded by people and Pokémon. It stores up happy feelings in its shell, then shares them out.
 Generation = 2
-Evolutions = TOGETIC,Happiness,
+Evolution = TOGETIC,Happiness
 #-------------------------------
 [TOGETIC]
 Name = Togetic
@@ -4654,7 +4668,7 @@ Habitat = Forest
 Category = Happiness
 Pokedex = It is said to be a Pokémon that brings good fortune. When it spots someone who is pure of heart, a Togetic appears and shares its happiness with that person.
 Generation = 2
-Evolutions = TOGEKISS,Item,SHINYSTONE
+Evolution = TOGEKISS,Item,SHINYSTONE
 #-------------------------------
 [NATU]
 Name = Natu
@@ -4681,7 +4695,7 @@ Habitat = Forest
 Category = Tiny Bird
 Pokedex = It runs up short trees that grow on the savanna to peck at new shoots. A Natu's eyes look as if they are always observing something.
 Generation = 2
-Evolutions = XATU,Level,25
+Evolution = XATU,Level,25
 #-------------------------------
 [XATU]
 Name = Xatu
@@ -4733,7 +4747,7 @@ Habitat = Grassland
 Category = Wool
 Pokedex = Its fluffy wool rubs together and builds a static charge. The more energy is charged, the more brightly the lightbulb at the tip of its tail glows.
 Generation = 2
-Evolutions = FLAAFFY,Level,15
+Evolution = FLAAFFY,Level,15
 #-------------------------------
 [FLAAFFY]
 Name = Flaaffy
@@ -4759,7 +4773,7 @@ Habitat = Grassland
 Category = Wool
 Pokedex = Its fleece quality changes to generate strong static electricity with a small amount of wool. The bare, slick parts of its hide are shielded against electricity.
 Generation = 2
-Evolutions = AMPHAROS,Level,30
+Evolution = AMPHAROS,Level,30
 #-------------------------------
 [AMPHAROS]
 Name = Ampharos
@@ -4837,7 +4851,7 @@ Habitat = WatersEdge
 Category = Aqua Mouse
 Pokedex = Its body is covered with water-repellent fur. Because of the fur, it can swim through water at high speed without being slowed by the water's resistance.
 Generation = 2
-Evolutions = AZUMARILL,Level,18
+Evolution = AZUMARILL,Level,18
 #-------------------------------
 [AZUMARILL]
 Name = Azumarill
@@ -4941,7 +4955,7 @@ Habitat = Grassland
 Category = Cottonweed
 Pokedex = This Pokémon drifts and floats with the wind. If it senses the approach of strong winds, a Hoppip links leaves with others to prepare against being blown away.
 Generation = 2
-Evolutions = SKIPLOOM,Level,18
+Evolution = SKIPLOOM,Level,18
 #-------------------------------
 [SKIPLOOM]
 Name = Skiploom
@@ -4967,7 +4981,7 @@ Habitat = Grassland
 Category = Cottonweed
 Pokedex = It blossoms when the temperature rises above 64 degrees F. Because its flower's blooming changes with the temperature, it is sometimes used as a thermometer.
 Generation = 2
-Evolutions = JUMPLUFF,Level,27
+Evolution = JUMPLUFF,Level,27
 #-------------------------------
 [JUMPLUFF]
 Name = Jumpluff
@@ -5019,7 +5033,7 @@ Habitat = Forest
 Category = Long Tail
 Pokedex = Its tail ends with a dexterous, handlike appendage. However, because it uses the tail so much, Aipom's real hands have become rather clumsy.
 Generation = 2
-Evolutions = AMBIPOM,HasMove,DOUBLEHIT
+Evolution = AMBIPOM,HasMove,DOUBLEHIT
 #-------------------------------
 [SUNKERN]
 Name = Sunkern
@@ -5046,7 +5060,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = Sunkern try to minimize movement to conserve the nutrients they have stored in their bodies for evolution. They will not eat, subsisting only on morning dew.
 Generation = 2
-Evolutions = SUNFLORA,Item,SUNSTONE
+Evolution = SUNFLORA,Item,SUNSTONE
 #-------------------------------
 [SUNFLORA]
 Name = Sunflora
@@ -5099,7 +5113,7 @@ Category = Clear Wing
 Pokedex = It can see 360 degrees without moving its eyes. It is a great flier capable of making sudden stops and turning midair to quickly chase down targeted prey.
 Generation = 2
 WildItemUncommon = WIDELENS
-Evolutions = YANMEGA,HasMove,ANCIENTPOWER
+Evolution = YANMEGA,HasMove,ANCIENTPOWER
 #-------------------------------
 [WOOPER]
 Name = Wooper
@@ -5126,7 +5140,7 @@ Habitat = WatersEdge
 Category = Water Fish
 Pokedex = Wooper usually live in water but come out onto land seeking food occasionally. On land, they coat their bodies with a gooey, toxic film.
 Generation = 2
-Evolutions = QUAGSIRE,Level,20
+Evolution = QUAGSIRE,Level,20
 #-------------------------------
 [QUAGSIRE]
 Name = Quagsire
@@ -5228,7 +5242,7 @@ Habitat = Forest
 Category = Darkness
 Pokedex = Murkrow were feared as the alleged bearers of ill fortune. It shows strong interest in anything that sparkles. It will even try to steal rings from women.
 Generation = 2
-Evolutions = HONCHKROW,Item,DUSKSTONE
+Evolution = HONCHKROW,Item,DUSKSTONE
 #-------------------------------
 [SLOWKING]
 Name = Slowking
@@ -5280,7 +5294,7 @@ Habitat = Cave
 Category = Screech
 Pokedex = A Misdreavus frightens people with a creepy, sobbing cry. It apparently uses its red spheres to absorb the fear of foes as its nutrition.
 Generation = 2
-Evolutions = MISMAGIUS,Item,DUSKSTONE
+Evolution = MISMAGIUS,Item,DUSKSTONE
 #-------------------------------
 [UNOWN]
 Name = Unown
@@ -5383,7 +5397,7 @@ Habitat = Forest
 Category = Bagworm
 Pokedex = A Pineco hangs from a tree branch and waits for prey. While eating, if it is disturbed by someone shaking its tree, it falls on the ground and explodes.
 Generation = 2
-Evolutions = FORRETRESS,Level,31
+Evolution = FORRETRESS,Level,31
 #-------------------------------
 [FORRETRESS]
 Name = Forretress
@@ -5461,7 +5475,7 @@ Habitat = Mountain
 Category = Fly Scorpion
 Pokedex = It glides without making a single sound. It grasps the face of its foe using its hind and large front claws, then stabs with its poison barb.
 Generation = 2
-Evolutions = GLISCOR,NightHoldItem,RAZORFANG
+Evolution = GLISCOR,NightHoldItem,RAZORFANG
 #-------------------------------
 [STEELIX]
 Name = Steelix
@@ -5514,7 +5528,7 @@ Habitat = Urban
 Category = Fairy
 Pokedex = By baring its fangs and making a scary face, it sends smaller Pokémon scurrying in terror. The Snubbull does seem a little sad at making its foes flee.
 Generation = 2
-Evolutions = GRANBULL,Level,23
+Evolution = GRANBULL,Level,23
 #-------------------------------
 [GRANBULL]
 Name = Granbull
@@ -5674,7 +5688,7 @@ Category = Sharp Claw
 Pokedex = A Sneasel scales trees by punching its hooked claws into the bark. It seeks out unguarded nests and steals eggs for food while the parents are away.
 Generation = 2
 WildItemUncommon = QUICKCLAW
-Evolutions = WEAVILE,NightHoldItem,RAZORCLAW
+Evolution = WEAVILE,NightHoldItem,RAZORCLAW
 #-------------------------------
 [TEDDIURSA]
 Name = Teddiursa
@@ -5701,7 +5715,7 @@ Habitat = Mountain
 Category = Little Bear
 Pokedex = It licks its palms that are sweetened by being soaked in honey. A Teddiursa makes its own honey by blending fruits and pollen collected by Beedrill.
 Generation = 2
-Evolutions = URSARING,Level,30
+Evolution = URSARING,Level,30
 #-------------------------------
 [URSARING]
 Name = Ursaring
@@ -5753,7 +5767,7 @@ Habitat = Mountain
 Category = Lava
 Pokedex = It is a species of Pokémon that lives in volcanic areas. If its body cools, its skin hardens and immobilizes it. To avoid that, it sleeps near magma.
 Generation = 2
-Evolutions = MAGCARGO,Level,38
+Evolution = MAGCARGO,Level,38
 #-------------------------------
 [MAGCARGO]
 Name = Magcargo
@@ -5805,7 +5819,7 @@ Habitat = Cave
 Category = Pig
 Pokedex = It roots for food by rubbing its snout against the ground. Its favorite food is a mushroom that grows under dried grass. It occasionally roots out hot springs.
 Generation = 2
-Evolutions = PILOSWINE,Level,33
+Evolution = PILOSWINE,Level,33
 #-------------------------------
 [PILOSWINE]
 Name = Piloswine
@@ -5831,7 +5845,7 @@ Habitat = Cave
 Category = Swine
 Pokedex = A Piloswine is covered by a thick coat of long hair for enduring freezing cold. It uses its tusks to dig up food that has been buried under ice.
 Generation = 2
-Evolutions = MAMOSWINE,HasMove,ANCIENTPOWER
+Evolution = MAMOSWINE,HasMove,ANCIENTPOWER
 #-------------------------------
 [CORSOLA]
 Name = Corsola
@@ -5859,7 +5873,7 @@ Category = Coral
 Pokedex = Corsola live in warm southern seas. If the sea becomes polluted, the beautiful coral stalks become discolored and crumble away in tatters.
 Generation = 2
 WildItemUncommon = LUMINOUSMOSS
-Evolutions = CURSOLA,None,
+Evolution = CURSOLA,None
 #-------------------------------
 [REMORAID]
 Name = Remoraid
@@ -5886,7 +5900,7 @@ Habitat = Sea
 Category = Jet
 Pokedex = A Remoraid uses its abdominal muscles to forcefully expel swallowed water, then shoot down flying prey. When evolution approaches, it travels down rivers.
 Generation = 2
-Evolutions = OCTILLERY,Level,25
+Evolution = OCTILLERY,Level,25
 #-------------------------------
 [OCTILLERY]
 Name = Octillery
@@ -6017,7 +6031,7 @@ Habitat = RoughTerrain
 Category = Dark
 Pokedex = Houndour communicate with each other using a variety of cries to corner their prey. This Pokémon's remarkable teamwork is simply unparalleled.
 Generation = 2
-Evolutions = HOUNDOOM,Level,24
+Evolution = HOUNDOOM,Level,24
 #-------------------------------
 [HOUNDOOM]
 Name = Houndoom
@@ -6095,7 +6109,7 @@ Habitat = RoughTerrain
 Category = Long Nose
 Pokedex = Phanpy's big ears serve as broad fans. When it becomes hot, it flaps the ears busily to cool down. Even the young are very strong.
 Generation = 2
-Evolutions = DONPHAN,Level,25
+Evolution = DONPHAN,Level,25
 #-------------------------------
 [DONPHAN]
 Name = Donphan
@@ -6146,7 +6160,7 @@ Habitat = Urban
 Category = Virtual
 Pokedex = It was created by humans using the power of science. It has been given artificial intelligence that enables it to learn new gestures and emotions on its own.
 Generation = 2
-Evolutions = PORYGONZ,TradeItem,DUBIOUSDISC
+Evolution = PORYGONZ,TradeItem,DUBIOUSDISC
 #-------------------------------
 [STANTLER]
 Name = Stantler
@@ -6223,7 +6237,9 @@ Habitat = Urban
 Category = Scuffle
 Pokedex = Tyrogue become stressed out if they do not get to train every day. When raising this Pokémon, the trainer must establish a regular training schedule.
 Generation = 2
-Evolutions = HITMONLEE,AttackGreater,20,HITMONCHAN,DefenseGreater,20,HITMONTOP,AtkDefEqual,20
+Evolution = HITMONLEE,AttackGreater,20
+Evolution = HITMONCHAN,DefenseGreater,20
+Evolution = HITMONTOP,AtkDefEqual,20
 #-------------------------------
 [HITMONTOP]
 Name = Hitmontop
@@ -6275,7 +6291,7 @@ Habitat = Urban
 Category = Kiss
 Pokedex = It actively runs about, but also falls often. Whenever it falls, it will check its reflection on a lake's surface to make sure its face hasn't become dirty.
 Generation = 2
-Evolutions = JYNX,Level,30
+Evolution = JYNX,Level,30
 #-------------------------------
 [ELEKID]
 Name = Elekid
@@ -6303,7 +6319,7 @@ Category = Electric
 Pokedex = If it touches metal and discharges the electricity it has stored in its body, an Elekid begins swinging its arms in circles to recharge itself.
 Generation = 2
 WildItemUncommon = ELECTIRIZER
-Evolutions = ELECTABUZZ,Level,30
+Evolution = ELECTABUZZ,Level,30
 #-------------------------------
 [MAGBY]
 Name = Magby
@@ -6331,7 +6347,7 @@ Category = Live Coal
 Pokedex = If a Magby is spouting yellow flames from its mouth, it is in good health. When it is fatigued, black smoke will be mixed in with the flames.
 Generation = 2
 WildItemUncommon = MAGMARIZER
-Evolutions = MAGMAR,Level,30
+Evolution = MAGMAR,Level,30
 #-------------------------------
 [MILTANK]
 Name = Miltank
@@ -6493,7 +6509,7 @@ Habitat = Mountain
 Category = Rock Skin
 Pokedex = A Larvitar is born deep under the ground. It must eat its way through the soil above and reach the surface for it to see its parents' faces.
 Generation = 2
-Evolutions = PUPITAR,Level,30
+Evolution = PUPITAR,Level,30
 #-------------------------------
 [PUPITAR]
 Name = Pupitar
@@ -6518,7 +6534,7 @@ Habitat = Mountain
 Category = Hard Shell
 Pokedex = A Pupitar creates a gas inside its body that it ejects under compression to propel itself like a jet. Its body can withstand a collision with solid steel.
 Generation = 2
-Evolutions = TYRANITAR,Level,55
+Evolution = TYRANITAR,Level,55
 #-------------------------------
 [TYRANITAR]
 Name = Tyranitar
@@ -6653,7 +6669,7 @@ Habitat = Forest
 Category = Wood Gecko
 Pokedex = It makes its nest in a giant tree in the forest. It ferociously guards against anything nearing its territory. It is said to be the protector of the trees.
 Generation = 3
-Evolutions = GROVYLE,Level,16
+Evolution = GROVYLE,Level,16
 #-------------------------------
 [GROVYLE]
 Name = Grovyle
@@ -6679,7 +6695,7 @@ Habitat = Forest
 Category = Wood Gecko
 Pokedex = Leaves grow out of this Pokémon's body. They help obscure a Grovyle from the eyes of its enemies while it is in a thickly overgrown forest.
 Generation = 3
-Evolutions = SCEPTILE,Level,36
+Evolution = SCEPTILE,Level,36
 #-------------------------------
 [SCEPTILE]
 Name = Sceptile
@@ -6731,7 +6747,7 @@ Habitat = Grassland
 Category = Chick
 Pokedex = If attacked, it strikes back by spitting balls of fire it forms in its stomach. A Torchic dislikes darkness because it can't see its surroundings.
 Generation = 3
-Evolutions = COMBUSKEN,Level,16
+Evolution = COMBUSKEN,Level,16
 #-------------------------------
 [COMBUSKEN]
 Name = Combusken
@@ -6757,7 +6773,7 @@ Habitat = Grassland
 Category = Young Fowl
 Pokedex = It lashes out with 10 kicks per second. Its strong fighting instinct compels it to keep up its offensive until the opponent gives up.
 Generation = 3
-Evolutions = BLAZIKEN,Level,36
+Evolution = BLAZIKEN,Level,36
 #-------------------------------
 [BLAZIKEN]
 Name = Blaziken
@@ -6809,7 +6825,7 @@ Habitat = WatersEdge
 Category = Mud Fish
 Pokedex = On land, it can powerfully lift large boulders by planting its four feet and heaving. It sleeps by burying itself in soil at the water's edge.
 Generation = 3
-Evolutions = MARSHTOMP,Level,16
+Evolution = MARSHTOMP,Level,16
 #-------------------------------
 [MARSHTOMP]
 Name = Marshtomp
@@ -6835,7 +6851,7 @@ Habitat = WatersEdge
 Category = Mud Fish
 Pokedex = Its toughened hind legs enable it to stand upright. Because it weakens if its skin dries out, it replenishes fluids by playing in mud.
 Generation = 3
-Evolutions = SWAMPERT,Level,36
+Evolution = SWAMPERT,Level,36
 #-------------------------------
 [SWAMPERT]
 Name = Swampert
@@ -6887,7 +6903,7 @@ Habitat = Grassland
 Category = Bite
 Pokedex = It savagely threatens foes with bared fangs. It chases after fleeing targets tenaciously. It turns tail and runs, however, if the foe strikes back.
 Generation = 3
-Evolutions = MIGHTYENA,Level,18
+Evolution = MIGHTYENA,Level,18
 #-------------------------------
 [MIGHTYENA]
 Name = Mightyena
@@ -6941,7 +6957,7 @@ Pokedex = Rubbing its nose against the ground, it always wanders about back and
 Generation = 3
 WildItemCommon = POTION
 WildItemUncommon = REVIVE
-Evolutions = LINOONE,Level,20
+Evolution = LINOONE,Level,20
 #-------------------------------
 [LINOONE]
 Name = Linoone
@@ -6969,7 +6985,7 @@ Pokedex = It is exceedingly fast if it only has to run in a straight line. When
 Generation = 3
 WildItemCommon = POTION
 WildItemUncommon = MAXREVIVE
-Evolutions = OBSTAGOON,None,
+Evolution = OBSTAGOON,None
 #-------------------------------
 [WURMPLE]
 Name = Wurmple
@@ -6997,7 +7013,8 @@ Pokedex = It sticks to tree branches and eats leaves. The thread it spits from i
 Generation = 3
 WildItemCommon = PECHABERRY
 WildItemUncommon = BRIGHTPOWDER
-Evolutions = SILCOON,Silcoon,7,CASCOON,Cascoon,7
+Evolution = SILCOON,Silcoon,7
+Evolution = CASCOON,Cascoon,7
 #-------------------------------
 [SILCOON]
 Name = Silcoon
@@ -7022,7 +7039,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = It prepares for evolution using the energy it stored while it was a Wurmple. It keeps watch over the surroundings with its two eyes.
 Generation = 3
-Evolutions = BEAUTIFLY,Level,10
+Evolution = BEAUTIFLY,Level,10
 #-------------------------------
 [BEAUTIFLY]
 Name = Beautifly
@@ -7073,7 +7090,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = To avoid detection by its enemies, it hides motionlessly beneath large leaves and in the gaps of branches. It also attaches dead leaves to its body for camouflage.
 Generation = 3
-Evolutions = DUSTOX,Level,10
+Evolution = DUSTOX,Level,10
 #-------------------------------
 [DUSTOX]
 Name = Dustox
@@ -7127,7 +7144,7 @@ Category = Water Weed
 Pokedex = This Pokémon lives in ponds with clean water. It is known to ferry small Pokémon across ponds by carrying them on the broad leaf on its head.
 Generation = 3
 WildItemUncommon = MENTALHERB
-Evolutions = LOMBRE,Level,14
+Evolution = LOMBRE,Level,14
 #-------------------------------
 [LOMBRE]
 Name = Lombre
@@ -7154,7 +7171,7 @@ Category = Jolly
 Pokedex = In the evening, it takes great delight in popping out of rivers and startling people. It feeds on aquatic moss that grows on rocks in the riverbed.
 Generation = 3
 WildItemUncommon = MENTALHERB
-Evolutions = LUDICOLO,Item,WATERSTONE
+Evolution = LUDICOLO,Item,WATERSTONE
 #-------------------------------
 [LUDICOLO]
 Name = Ludicolo
@@ -7208,7 +7225,7 @@ Category = Acorn
 Pokedex = It hangs off branches and absorbs nutrients. When it finishes eating, its body becomes so heavy that it drops to the ground with a thump.
 Generation = 3
 WildItemUncommon = POWERHERB
-Evolutions = NUZLEAF,Level,14
+Evolution = NUZLEAF,Level,14
 #-------------------------------
 [NUZLEAF]
 Name = Nuzleaf
@@ -7235,7 +7252,7 @@ Category = Wily
 Pokedex = A forest-dwelling Pokémon that is skilled at climbing trees. Its long and pointed nose is its weak point. It loses power if the nose is gripped.
 Generation = 3
 WildItemUncommon = POWERHERB
-Evolutions = SHIFTRY,Item,LEAFSTONE
+Evolution = SHIFTRY,Item,LEAFSTONE
 #-------------------------------
 [SHIFTRY]
 Name = Shiftry
@@ -7288,7 +7305,7 @@ Habitat = Grassland
 Category = Tiny Swallow
 Pokedex = Although it is small, it is very courageous. It will take on a larger Skarmory on an equal footing. However, its will weakens if it becomes hungry.
 Generation = 3
-Evolutions = SWELLOW,Level,22
+Evolution = SWELLOW,Level,22
 #-------------------------------
 [SWELLOW]
 Name = Swellow
@@ -7341,7 +7358,7 @@ Category = Seagull
 Pokedex = It makes its nest on a sheer cliff at the edge of the sea. It has trouble keeping its wings flapping in flight. Instead, it soars on updrafts.
 Generation = 3
 WildItemCommon = PRETTYFEATHER
-Evolutions = PELIPPER,Level,25
+Evolution = PELIPPER,Level,25
 #-------------------------------
 [PELIPPER]
 Name = Pelipper
@@ -7394,7 +7411,7 @@ Habitat = Urban
 Category = Feeling
 Pokedex = A Ralts has the power to sense the emotions of people and Pokémon with the horns on its head. It takes cover if it senses any hostility.
 Generation = 3
-Evolutions = KIRLIA,Level,20
+Evolution = KIRLIA,Level,20
 #-------------------------------
 [KIRLIA]
 Name = Kirlia
@@ -7420,7 +7437,8 @@ Habitat = Urban
 Category = Emotion
 Pokedex = A Kirlia has the psychic power to create a rip in the dimensions and see into the future. It is said to dance with pleasure on sunny mornings.
 Generation = 3
-Evolutions = GARDEVOIR,Level,30,GALLADE,ItemMale,DAWNSTONE
+Evolution = GARDEVOIR,Level,30
+Evolution = GALLADE,ItemMale,DAWNSTONE
 #-------------------------------
 [GARDEVOIR]
 Name = Gardevoir
@@ -7473,7 +7491,7 @@ Category = Pond Skater
 Pokedex = They gather on puddles after evening downpours, gliding across the surface of water as if sliding. It secretes honey with a sweet aroma from its head.
 Generation = 3
 WildItemCommon = HONEY
-Evolutions = MASQUERAIN,Level,22
+Evolution = MASQUERAIN,Level,22
 #-------------------------------
 [MASQUERAIN]
 Name = Masquerain
@@ -7528,7 +7546,7 @@ Pokedex = It loves to eat damp, composted soil in forests. If you enter a forest
 Generation = 3
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = BRELOOM,Level,23
+Evolution = BRELOOM,Level,23
 #-------------------------------
 [BRELOOM]
 Name = Breloom
@@ -7581,7 +7599,7 @@ Habitat = Forest
 Category = Slacker
 Pokedex = It sleeps virtually all day and night long. It doesn't change its nest its entire life, but it sometimes travels great distances by swimming in rivers.
 Generation = 3
-Evolutions = VIGOROTH,Level,18
+Evolution = VIGOROTH,Level,18
 #-------------------------------
 [VIGOROTH]
 Name = Vigoroth
@@ -7606,7 +7624,7 @@ Habitat = Forest
 Category = Wild Monkey
 Pokedex = It can't keep still because its blood boils with energy. It runs through the fields and mountains all day to calm itself. If it doesn't, it can't sleep at night.
 Generation = 3
-Evolutions = SLAKING,Level,36
+Evolution = SLAKING,Level,36
 #-------------------------------
 [SLAKING]
 Name = Slaking
@@ -7658,7 +7676,8 @@ Category = Trainee
 Pokedex = It makes its nest at the roots of a mighty tree. Using its whiskerlike antennae, it probes its surroundings in the pitch-black darkness of soil.
 Generation = 3
 WildItemUncommon = SOFTSAND
-Evolutions = NINJASK,Ninjask,20,SHEDINJA,Shedinja,20
+Evolution = NINJASK,Ninjask,20
+Evolution = SHEDINJA,Shedinja,20
 #-------------------------------
 [NINJASK]
 Name = Ninjask
@@ -7734,7 +7753,7 @@ Habitat = Cave
 Category = Whisper
 Pokedex = Its cries equal a jet plane in volume. It inhales through its ear canals. Because of this system, it can cry continually without having to catch its breath.
 Generation = 3
-Evolutions = LOUDRED,Level,20
+Evolution = LOUDRED,Level,20
 #-------------------------------
 [LOUDRED]
 Name = Loudred
@@ -7760,7 +7779,7 @@ Habitat = Cave
 Category = Big Voice
 Pokedex = It positions the round speakers on its head to assail foes with ultrasonic waves at massive volume. It builds power by stomping the ground.
 Generation = 3
-Evolutions = EXPLOUD,Level,40
+Evolution = EXPLOUD,Level,40
 #-------------------------------
 [EXPLOUD]
 Name = Exploud
@@ -7813,7 +7832,7 @@ Category = Guts
 Pokedex = It loves to toughen up its body above all else. If you hear quaking rumbles in a cave, it is the sound of Makuhita undertaking strenuous training.
 Generation = 3
 WildItemUncommon = BLACKBELT
-Evolutions = HARIYAMA,Level,24
+Evolution = HARIYAMA,Level,24
 #-------------------------------
 [HARIYAMA]
 Name = Hariyama
@@ -7867,7 +7886,7 @@ Habitat = WatersEdge
 Category = Polka Dot
 Pokedex = Its tail, which is packed with nutrition, is very bouncy like a rubber ball. On sunny days they gather at the edge of water and splash about for fun.
 Generation = 3
-Evolutions = MARILL,Happiness,
+Evolution = MARILL,Happiness
 #-------------------------------
 [NOSEPASS]
 Name = Nosepass
@@ -7895,7 +7914,8 @@ Category = Compass
 Pokedex = Its body emits a powerful magnetism. It feeds on prey that is pulled in by the force. Its magnetism is stronger in cold seasons.
 Generation = 3
 WildItemUncommon = MAGNET
-Evolutions = PROBOPASS,LocationFlag,Magnetic,PROBOPASS,Item,THUNDERSTONE
+Evolution = PROBOPASS,LocationFlag,Magnetic
+Evolution = PROBOPASS,Item,THUNDERSTONE
 #-------------------------------
 [SKITTY]
 Name = Skitty
@@ -7922,7 +7942,7 @@ Habitat = Forest
 Category = Kitten
 Pokedex = A Skitty's adorably cute behavior makes it highly popular. In battle, it makes its tail puff out. It threatens foes with a sharp growl.
 Generation = 3
-Evolutions = DELCATTY,Item,MOONSTONE
+Evolution = DELCATTY,Item,MOONSTONE
 #-------------------------------
 [DELCATTY]
 Name = Delcatty
@@ -8029,7 +8049,7 @@ Category = Iron Armor
 Pokedex = A Pokémon that is clad in steel armor. A new suit of armor is made when it evolves. The old, discarded armor is salvaged as metal for making iron products.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = LAIRON,Level,32
+Evolution = LAIRON,Level,32
 #-------------------------------
 [LAIRON]
 Name = Lairon
@@ -8056,7 +8076,7 @@ Category = Iron Armor
 Pokedex = When two Lairon meet in the wild, they fight for territory by bashing into each other with their steel bodies. The sound of their collision carries for miles.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = AGGRON,Level,42
+Evolution = AGGRON,Level,42
 #-------------------------------
 [AGGRON]
 Name = Aggron
@@ -8109,7 +8129,7 @@ Habitat = Mountain
 Category = Meditate
 Pokedex = It continually meditates for hours every day. As a result of rigorous and dedicated yoga training, it has tempered its spiritual power so much it can fly.
 Generation = 3
-Evolutions = MEDICHAM,Level,37
+Evolution = MEDICHAM,Level,37
 #-------------------------------
 [MEDICHAM]
 Name = Medicham
@@ -8161,7 +8181,7 @@ Habitat = Grassland
 Category = Lightning
 Pokedex = It generates electricity using friction from the atmosphere. In seasons with especially arid air, its entire body blazes with violent showers of sparks.
 Generation = 3
-Evolutions = MANECTRIC,Level,26
+Evolution = MANECTRIC,Level,26
 #-------------------------------
 [MANECTRIC]
 Name = Manectric
@@ -8324,7 +8344,7 @@ Category = Thorn
 Pokedex = A Roselia that drinks nutritionally rich springwater blooms with lovely flowers. The fragrance of its flowers has the effect of making its foes careless.
 Generation = 3
 WildItemUncommon = POISONBARB
-Evolutions = ROSERADE,Item,SHINYSTONE
+Evolution = ROSERADE,Item,SHINYSTONE
 #-------------------------------
 [GULPIN]
 Name = Gulpin
@@ -8353,7 +8373,7 @@ Pokedex = This Pokémon's stomach fluid can even digest scrap iron. In one gulp,
 Generation = 3
 WildItemCommon = ORANBERRY
 WildItemUncommon = SITRUSBERRY
-Evolutions = SWALOT,Level,26
+Evolution = SWALOT,Level,26
 #-------------------------------
 [SWALOT]
 Name = Swalot
@@ -8408,7 +8428,7 @@ Category = Savage
 Pokedex = Carvanha attack ships in swarms, making them sink. Although it is said to be a very vicious Pokémon, it timidly flees as soon as it finds itself alone.
 Generation = 3
 WildItemUncommon = DEEPSEATOOTH
-Evolutions = SHARPEDO,Level,30
+Evolution = SHARPEDO,Level,30
 #-------------------------------
 [SHARPEDO]
 Name = Sharpedo
@@ -8461,7 +8481,7 @@ Habitat = Sea
 Category = Ball Whale
 Pokedex = While this Pokémon usually lives in the sea, it can survive on land, although not too long. It loses vitality if its body becomes dried out.
 Generation = 3
-Evolutions = WAILORD,Level,40
+Evolution = WAILORD,Level,40
 #-------------------------------
 [WAILORD]
 Name = Wailord
@@ -8513,7 +8533,7 @@ Habitat = Mountain
 Category = Numb
 Pokedex = A Numel stores boiling magma in the hump on its back. It is a hardy Pokémon that can transport a 220-pound load. It has served humans at work since long ago.
 Generation = 3
-Evolutions = CAMERUPT,Level,33
+Evolution = CAMERUPT,Level,33
 #-------------------------------
 [CAMERUPT]
 Name = Camerupt
@@ -8592,7 +8612,7 @@ Habitat = Mountain
 Category = Bounce
 Pokedex = A Pokémon that manipulates psychic power at will. It doesn't stop bouncing even when it is asleep. It loves eating mushrooms that grow underground.
 Generation = 3
-Evolutions = GRUMPIG,Level,32
+Evolution = GRUMPIG,Level,32
 #-------------------------------
 [GRUMPIG]
 Name = Grumpig
@@ -8671,7 +8691,7 @@ Category = Ant Pit
 Pokedex = Its big jaws crunch through boulders. Because its head is so big, it has a hard time getting back upright if it tips over onto its back.
 Generation = 3
 WildItemUncommon = SOFTSAND
-Evolutions = VIBRAVA,Level,35
+Evolution = VIBRAVA,Level,35
 #-------------------------------
 [VIBRAVA]
 Name = Vibrava
@@ -8696,7 +8716,7 @@ Habitat = RoughTerrain
 Category = Vibration
 Pokedex = It looses ultrasonic waves by rubbing its wings together. Since a Vibrava's wings are still in the process of growing, it can only fly short distances.
 Generation = 3
-Evolutions = FLYGON,Level,45
+Evolution = FLYGON,Level,45
 #-------------------------------
 [FLYGON]
 Name = Flygon
@@ -8748,7 +8768,7 @@ Category = Cactus
 Pokedex = Cacnea live in deserts with virtually no rainfall. It battles by swinging its thick, spiked arms. Once a year, a yellow flower blooms.
 Generation = 3
 WildItemUncommon = STICKYBARB
-Evolutions = CACTURNE,Level,32
+Evolution = CACTURNE,Level,32
 #-------------------------------
 [CACTURNE]
 Name = Cacturne
@@ -8801,7 +8821,7 @@ Habitat = Forest
 Category = Cotton Bird
 Pokedex = A Pokémon that has wings like cottony clouds. After enduring winter, in which little food is available, Swablu flocks move closer to towns in the spring.
 Generation = 3
-Evolutions = ALTARIA,Level,35
+Evolution = ALTARIA,Level,35
 #-------------------------------
 [ALTARIA]
 Name = Altaria
@@ -8959,7 +8979,7 @@ Habitat = WatersEdge
 Category = Whiskers
 Pokedex = Its body is covered with a slimy film. The film acts as a barrier to prevent germs in muddy water from entering the Barboach's body.
 Generation = 3
-Evolutions = WHISCASH,Level,30
+Evolution = WHISCASH,Level,30
 #-------------------------------
 [WHISCASH]
 Name = Whiscash
@@ -9011,7 +9031,7 @@ Habitat = WatersEdge
 Category = Ruffian
 Pokedex = Once it grips prey with its large pincers, it will never let go, no matter what. It is a hardy Pokémon that can thrive in any environment.
 Generation = 3
-Evolutions = CRAWDAUNT,Level,30
+Evolution = CRAWDAUNT,Level,30
 #-------------------------------
 [CRAWDAUNT]
 Name = Crawdaunt
@@ -9062,7 +9082,7 @@ Category = Clay Doll
 Pokedex = A Baltoy moves by spinning on its single foot. It has been depicted in murals adorning the walls of a once-bustling city in an ancient age.
 Generation = 3
 WildItemUncommon = LIGHTCLAY
-Evolutions = CLAYDOL,Level,36
+Evolution = CLAYDOL,Level,36
 #-------------------------------
 [CLAYDOL]
 Name = Claydol
@@ -9115,7 +9135,7 @@ Category = Sea Lily
 Pokedex = It disguises itself as seaweed by making its tentacles sway. Unsuspecting prey that come too close are swallowed whole. It became extinct 100 million years ago.
 Generation = 3
 WildItemUncommon = BIGROOT
-Evolutions = CRADILY,Level,40
+Evolution = CRADILY,Level,40
 #-------------------------------
 [CRADILY]
 Name = Cradily
@@ -9168,7 +9188,7 @@ Habitat = WatersEdge
 Category = Old Shrimp
 Pokedex = It was resurrected from a fossil using the power of science. It swims by undulating the wings at its sides. They were feet that adapted to life in the sea.
 Generation = 3
-Evolutions = ARMALDO,Level,40
+Evolution = ARMALDO,Level,40
 #-------------------------------
 [ARMALDO]
 Name = Armaldo
@@ -9220,7 +9240,8 @@ Habitat = WatersEdge
 Category = Fish
 Pokedex = Feebas live in ponds that are heavily infested with weeds. Because of its hopelessly shabby appearance, it seems as if few trainers raise it.
 Generation = 3
-Evolutions = MILOTIC,TradeItem,PRISMSCALE,MILOTIC,Beauty,170
+Evolution = MILOTIC,TradeItem,PRISMSCALE
+Evolution = MILOTIC,Beauty,170
 #-------------------------------
 [MILOTIC]
 Name = Milotic
@@ -9328,7 +9349,7 @@ Category = Puppet
 Pokedex = This Pokémon roams about deep in the night seeking such negative emotions as grudges and envy. It retreats to its nest when the sun begins to rise.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = BANETTE,Level,37
+Evolution = BANETTE,Level,37
 #-------------------------------
 [BANETTE]
 Name = Banette
@@ -9382,7 +9403,7 @@ Category = Requiem
 Pokedex = A glare from its single scarlet eye makes even burly grown-ups freeze in utter fear. It is a nocturnal Pokémon that roams about under the cloak of darkness.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = DUSCLOPS,Level,37
+Evolution = DUSCLOPS,Level,37
 #-------------------------------
 [DUSCLOPS]
 Name = Dusclops
@@ -9409,7 +9430,7 @@ Category = Beckon
 Pokedex = It is thought that its body is hollow with only a spectral ball of fire burning inside. However, no one has been able to confirm this theory as fact.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = DUSKNOIR,TradeItem,REAPERCLOTH
+Evolution = DUSKNOIR,TradeItem,REAPERCLOTH
 #-------------------------------
 [TROPIUS]
 Name = Tropius
@@ -9514,7 +9535,7 @@ Habitat = Cave
 Category = Bright
 Pokedex = A Wynaut loves to eat sweet fruits. It cleverly picks fruits using its earlike arms. They gather in fruit gardens, drawn by the fragrance.
 Generation = 3
-Evolutions = WOBBUFFET,Level,15
+Evolution = WOBBUFFET,Level,15
 #-------------------------------
 [SNORUNT]
 Name = Snorunt
@@ -9542,7 +9563,8 @@ Category = Snow Hat
 Pokedex = They tend to move about in groups of around five Snorunt. In snowy regions, it is said that when they are seen late at night, snowfall will arrive by morning.
 Generation = 3
 WildItemUncommon = SNOWBALL
-Evolutions = GLALIE,Level,42,FROSLASS,ItemFemale,DAWNSTONE
+Evolution = GLALIE,Level,42
+Evolution = FROSLASS,ItemFemale,DAWNSTONE
 #-------------------------------
 [GLALIE]
 Name = Glalie
@@ -9594,7 +9616,7 @@ Habitat = Sea
 Category = Clap
 Pokedex = It is completely covered with plushy fur. As a result, it never feels the cold even when it is rolling about on ice floes or diving in the sea.
 Generation = 3
-Evolutions = SEALEO,Level,32
+Evolution = SEALEO,Level,32
 #-------------------------------
 [SEALEO]
 Name = Sealeo
@@ -9620,7 +9642,7 @@ Habitat = Sea
 Category = Ball Roll
 Pokedex = Sealeo live in herds on ice floes. Using its powerful flippers, it shatters ice. It dives into the sea to hunt prey five times a day.
 Generation = 3
-Evolutions = WALREIN,Level,44
+Evolution = WALREIN,Level,44
 #-------------------------------
 [WALREIN]
 Name = Walrein
@@ -9674,7 +9696,8 @@ Pokedex = A Clamperl slams its shell closed on prey to prevent escape. The pearl
 Generation = 3
 WildItemCommon = PEARL
 WildItemUncommon = BIGPEARL
-Evolutions = HUNTAIL,TradeItem,DEEPSEATOOTH,GOREBYSS,TradeItem,DEEPSEASCALE
+Evolution = HUNTAIL,TradeItem,DEEPSEATOOTH
+Evolution = GOREBYSS,TradeItem,DEEPSEASCALE
 #-------------------------------
 [HUNTAIL]
 Name = Huntail
@@ -9808,7 +9831,7 @@ Category = Rock Head
 Pokedex = Although it is small, this Pokémon is very powerful because its body is a bundle of muscles. It launches head-butts with its ironlike skull.
 Generation = 3
 WildItemUncommon = DRAGONFANG
-Evolutions = SHELGON,Level,30
+Evolution = SHELGON,Level,30
 #-------------------------------
 [SHELGON]
 Name = Shelgon
@@ -9835,7 +9858,7 @@ Category = Endurance
 Pokedex = It hardly eats while it awaits evolution. It becomes hardier by enduring hunger. Its shell peels off the instant it begins to evolve.
 Generation = 3
 WildItemUncommon = DRAGONFANG
-Evolutions = SALAMENCE,Level,50
+Evolution = SALAMENCE,Level,50
 #-------------------------------
 [SALAMENCE]
 Name = Salamence
@@ -9888,7 +9911,7 @@ Category = Iron Ball
 Pokedex = When Beldum gather in a swarm, they move in perfect unison as if they were but one Pokémon. They communicate with each other using brain waves.
 Generation = 3
 WildItemUncommon = METALCOAT
-Evolutions = METANG,Level,20
+Evolution = METANG,Level,20
 #-------------------------------
 [METANG]
 Name = Metang
@@ -9915,7 +9938,7 @@ Category = Iron Claw
 Pokedex = The claws tipping its arms pack the destructive power to tear through thick iron sheets as if they were silk. It flies at over 60 miles per hour.
 Generation = 3
 WildItemUncommon = METALCOAT
-Evolutions = METAGROSS,Level,45
+Evolution = METAGROSS,Level,45
 #-------------------------------
 [METAGROSS]
 Name = Metagross
@@ -10224,7 +10247,7 @@ Shape = Quadruped
 Category = Tiny Leaf
 Pokedex = Made from soil, the shell on its back hardens when it drinks water. It lives along lakes.
 Generation = 4
-Evolutions = GROTLE,Level,18
+Evolution = GROTLE,Level,18
 #-------------------------------
 [GROTLE]
 Name = Grotle
@@ -10249,7 +10272,7 @@ Shape = Quadruped
 Category = Grove
 Pokedex = It lives along water in forests. In the daytime, it leaves the forest to sunbathe its treed shell.
 Generation = 4
-Evolutions = TORTERRA,Level,32
+Evolution = TORTERRA,Level,32
 #-------------------------------
 [TORTERRA]
 Name = Torterra
@@ -10299,7 +10322,7 @@ Shape = BipedalTail
 Category = Chimp
 Pokedex = It agilely scales sheer cliffs to live atop craggy mountains. Its fire is put out when it sleeps.
 Generation = 4
-Evolutions = MONFERNO,Level,14
+Evolution = MONFERNO,Level,14
 #-------------------------------
 [MONFERNO]
 Name = Monferno
@@ -10324,7 +10347,7 @@ Shape = BipedalTail
 Category = Playful
 Pokedex = To intimidate attackers, it stretches the fire on its tail to make itself appear bigger.
 Generation = 4
-Evolutions = INFERNAPE,Level,36
+Evolution = INFERNAPE,Level,36
 #-------------------------------
 [INFERNAPE]
 Name = Infernape
@@ -10374,7 +10397,7 @@ Shape = Bipedal
 Category = Penguin
 Pokedex = Because it is very proud, it hates accepting food from people. Its thick down guards it from cold.
 Generation = 4
-Evolutions = PRINPLUP,Level,16
+Evolution = PRINPLUP,Level,16
 #-------------------------------
 [PRINPLUP]
 Name = Prinplup
@@ -10399,7 +10422,7 @@ Shape = BipedalTail
 Category = Penguin
 Pokedex = It lives alone, away from others. Apparently, every one of them believes it is the most important.
 Generation = 4
-Evolutions = EMPOLEON,Level,36
+Evolution = EMPOLEON,Level,36
 #-------------------------------
 [EMPOLEON]
 Name = Empoleon
@@ -10449,7 +10472,7 @@ Shape = Winged
 Category = Starling
 Pokedex = They flock in great numbers. Though small, they flap their wings with great power.
 Generation = 4
-Evolutions = STARAVIA,Level,14
+Evolution = STARAVIA,Level,14
 #-------------------------------
 [STARAVIA]
 Name = Staravia
@@ -10474,7 +10497,7 @@ Shape = Winged
 Category = Starling
 Pokedex = It flies around forests and fields in search of bug Pokémon. It stays within a huge flock.
 Generation = 4
-Evolutions = STARAPTOR,Level,34
+Evolution = STARAPTOR,Level,34
 #-------------------------------
 [STARAPTOR]
 Name = Staraptor
@@ -10524,7 +10547,7 @@ Shape = Quadruped
 Category = Plump Mouse
 Pokedex = With nerves of steel, nothing can perturb it. It is more agile and active than it appears.
 Generation = 4
-Evolutions = BIBAREL,Level,15
+Evolution = BIBAREL,Level,15
 #-------------------------------
 [BIBAREL]
 Name = Bibarel
@@ -10574,7 +10597,7 @@ Category = Cricket
 Pokedex = It shakes its head back to front, causing its antennae to hit each other and sound like a xylophone.
 Generation = 4
 WildItemUncommon = METRONOME
-Evolutions = KRICKETUNE,Level,10
+Evolution = KRICKETUNE,Level,10
 #-------------------------------
 [KRICKETUNE]
 Name = Kricketune
@@ -10625,7 +10648,7 @@ Shape = Quadruped
 Category = Flash
 Pokedex = All of its fur dazzles if danger is sensed. It flees while the foe is momentarily blinded.
 Generation = 4
-Evolutions = LUXIO,Level,15
+Evolution = LUXIO,Level,15
 #-------------------------------
 [LUXIO]
 Name = Luxio
@@ -10650,7 +10673,7 @@ Shape = Quadruped
 Category = Spark
 Pokedex = Its claws loose electricity with enough amperage to cause fainting. They live in small groups.
 Generation = 4
-Evolutions = LUXRAY,Level,30
+Evolution = LUXRAY,Level,30
 #-------------------------------
 [LUXRAY]
 Name = Luxray
@@ -10702,7 +10725,7 @@ Category = Bud
 Pokedex = Over the winter, it closes its bud and endures the cold. In spring, the bud opens and releases pollen.
 Generation = 4
 WildItemUncommon = POISONBARB
-Evolutions = ROSELIA,HappinessDay,
+Evolution = ROSELIA,HappinessDay
 #-------------------------------
 [ROSERADE]
 Name = Roserade
@@ -10753,7 +10776,7 @@ Shape = BipedalTail
 Category = Head Butt
 Pokedex = It lived in jungles around 100 million years ago. Its skull is as hard as iron.
 Generation = 4
-Evolutions = RAMPARDOS,Level,30
+Evolution = RAMPARDOS,Level,30
 #-------------------------------
 [RAMPARDOS]
 Name = Rampardos
@@ -10803,7 +10826,7 @@ Shape = Quadruped
 Category = Shield
 Pokedex = A Pokémon that lived in jungles around 100 million years ago. Its facial hide is extremely hard.
 Generation = 4
-Evolutions = BASTIODON,Level,30
+Evolution = BASTIODON,Level,30
 #-------------------------------
 [BASTIODON]
 Name = Bastiodon
@@ -10854,7 +10877,8 @@ Category = Bagworm
 Pokedex = To shelter itself from cold, wintry winds, it covers itself with a cloak made of twigs and leaves.
 Generation = 4
 Flags = InheritFormFromMother
-Evolutions = WORMADAM,LevelFemale,20,MOTHIM,LevelMale,20
+Evolution = WORMADAM,LevelFemale,20
+Evolution = MOTHIM,LevelMale,20
 #-------------------------------
 [WORMADAM]
 Name = Wormadam
@@ -10933,7 +10957,7 @@ Category = Tiny Bee
 Pokedex = A Pokémon formed by three others. It busily carries sweet floral honey to Vespiquen.
 Generation = 4
 WildItemUncommon = HONEY
-Evolutions = VESPIQUEN,LevelFemale,21
+Evolution = VESPIQUEN,LevelFemale,21
 #-------------------------------
 [VESPIQUEN]
 Name = Vespiquen
@@ -11009,7 +11033,7 @@ Shape = Quadruped
 Category = Sea Weasel
 Pokedex = It has a flotation sac that is like an inflatable collar. It floats on water with its head out.
 Generation = 4
-Evolutions = FLOATZEL,Level,26
+Evolution = FLOATZEL,Level,26
 #-------------------------------
 [FLOATZEL]
 Name = Floatzel
@@ -11059,7 +11083,7 @@ Category = Cherry
 Pokedex = The small ball holds the nutrients needed for evolution. Apparently, it is very sweet and tasty.
 Generation = 4
 WildItemUncommon = MIRACLESEED
-Evolutions = CHERRIM,Level,25
+Evolution = CHERRIM,Level,25
 #-------------------------------
 [CHERRIM]
 Name = Cherrim
@@ -11112,7 +11136,7 @@ Category = Sea Slug
 Pokedex = This Pokémon's habitat shapes its physique. According to some theories, life in warm ocean waters causes this variation to develop.
 Generation = 4
 Flags = InheritFormFromMother
-Evolutions = GASTRODON,Level,30
+Evolution = GASTRODON,Level,30
 #-------------------------------
 [GASTRODON]
 Name = Gastrodon
@@ -11188,7 +11212,7 @@ Shape = HeadArms
 Category = Balloon
 Pokedex = A Pokémon formed by the spirits of people and Pokémon. It loves damp, humid seasons.
 Generation = 4
-Evolutions = DRIFBLIM,Level,28
+Evolution = DRIFBLIM,Level,28
 #-------------------------------
 [DRIFBLIM]
 Name = Drifblim
@@ -11238,7 +11262,7 @@ Shape = BipedalTail
 Category = Rabbit
 Pokedex = It slams foes by sharply uncoiling its rolled ears. It stings enough to make a grown-up cry in pain.
 Generation = 4
-Evolutions = LOPUNNY,Happiness,
+Evolution = LOPUNNY,Happiness
 #-------------------------------
 [LOPUNNY]
 Name = Lopunny
@@ -11335,7 +11359,7 @@ Shape = Quadruped
 Category = Catty
 Pokedex = It claws if displeased and purrs when affectionate. Its fickleness is very popular among some.
 Generation = 4
-Evolutions = PURUGLY,Level,38
+Evolution = PURUGLY,Level,38
 #-------------------------------
 [PURUGLY]
 Name = Purugly
@@ -11386,7 +11410,7 @@ Category = Bell
 Pokedex = It emits cries by agitating an orb at the back of its throat. It moves with flouncing hops.
 Generation = 4
 WildItemUncommon = CLEANSETAG
-Evolutions = CHIMECHO,HappinessNight,
+Evolution = CHIMECHO,HappinessNight
 #-------------------------------
 [STUNKY]
 Name = Stunky
@@ -11412,7 +11436,7 @@ Shape = Quadruped
 Category = Skunk
 Pokedex = It protects itself by spraying a noxious fluid from its rear. The stench lingers for 24 hours.
 Generation = 4
-Evolutions = SKUNTANK,Level,34
+Evolution = SKUNTANK,Level,34
 #-------------------------------
 [SKUNTANK]
 Name = Skuntank
@@ -11462,7 +11486,7 @@ Category = Bronze
 Pokedex = Implements shaped like it were discovered in ancient tombs. It is unknown if they are related.
 Generation = 4
 WildItemUncommon = METALCOAT
-Evolutions = BRONZONG,Level,33
+Evolution = BRONZONG,Level,33
 #-------------------------------
 [BRONZONG]
 Name = Bronzong
@@ -11514,7 +11538,7 @@ Shape = HeadLegs
 Category = Bonsai
 Pokedex = It looks as if it is always crying. It is actually adjusting its body's fluid levels by eliminating excess.
 Generation = 4
-Evolutions = SUDOWOODO,HasMove,MIMIC
+Evolution = SUDOWOODO,HasMove,MIMIC
 #-------------------------------
 [MIMEJR]
 Name = Mime Jr.
@@ -11541,7 +11565,7 @@ Shape = Bipedal
 Category = Mime
 Pokedex = It habitually mimics foes. Once mimicked, the foe cannot take its eyes off this Pokémon.
 Generation = 4
-Evolutions = MRMIME,HasMove,MIMIC
+Evolution = MRMIME,HasMove,MIMIC
 #-------------------------------
 [HAPPINY]
 Name = Happiny
@@ -11569,7 +11593,7 @@ Category = Playhouse
 Pokedex = It loves round white things. It carries an egg-shaped rock in imitation of Chansey.
 Generation = 4
 WildItemCommon = OVALSTONE
-Evolutions = CHANSEY,DayHoldItem,OVALSTONE
+Evolution = CHANSEY,DayHoldItem,OVALSTONE
 #-------------------------------
 [CHATOT]
 Name = Chatot
@@ -11646,7 +11670,7 @@ Shape = BipedalTail
 Category = Land Shark
 Pokedex = It nests in small, horizontal holes in cave walls. It pounces to catch prey that stray too close.
 Generation = 4
-Evolutions = GABITE,Level,24
+Evolution = GABITE,Level,24
 #-------------------------------
 [GABITE]
 Name = Gabite
@@ -11671,7 +11695,7 @@ Shape = BipedalTail
 Category = Cave
 Pokedex = There is a long-held belief that medicine made from its scales will heal even incurable illnesses.
 Generation = 4
-Evolutions = GARCHOMP,Level,48
+Evolution = GARCHOMP,Level,48
 #-------------------------------
 [GARCHOMP]
 Name = Garchomp
@@ -11725,7 +11749,7 @@ Generation = 4
 WildItemCommon = LEFTOVERS
 WildItemUncommon = LEFTOVERS
 WildItemRare = LEFTOVERS
-Evolutions = SNORLAX,Happiness,
+Evolution = SNORLAX,Happiness
 #-------------------------------
 [RIOLU]
 Name = Riolu
@@ -11751,7 +11775,7 @@ Shape = BipedalTail
 Category = Emanation
 Pokedex = The aura that emanates from its body intensifies to alert others if it is afraid or sad.
 Generation = 4
-Evolutions = LUCARIO,HappinessDay,
+Evolution = LUCARIO,HappinessDay
 #-------------------------------
 [LUCARIO]
 Name = Lucario
@@ -11801,7 +11825,7 @@ Shape = Quadruped
 Category = Hippo
 Pokedex = It lives in arid places. Instead of perspiration, it expels grainy sand from its body.
 Generation = 4
-Evolutions = HIPPOWDON,Level,34
+Evolution = HIPPOWDON,Level,34
 #-------------------------------
 [HIPPOWDON]
 Name = Hippowdon
@@ -11852,7 +11876,7 @@ Category = Scorpion
 Pokedex = It grips prey with its tail claws and injects poison. It tenaciously hangs on until the poison takes.
 Generation = 4
 WildItemUncommon = POISONBARB
-Evolutions = DRAPION,Level,40
+Evolution = DRAPION,Level,40
 #-------------------------------
 [DRAPION]
 Name = Drapion
@@ -11904,7 +11928,7 @@ Category = Toxic Mouth
 Pokedex = Its cheeks hold poison sacs. It tries to catch foes off guard to jab them with toxic fingers.
 Generation = 4
 WildItemUncommon = BLACKSLUDGE
-Evolutions = TOXICROAK,Level,37
+Evolution = TOXICROAK,Level,37
 #-------------------------------
 [TOXICROAK]
 Name = Toxicroak
@@ -11979,7 +12003,7 @@ Shape = Finned
 Category = Wing Fish
 Pokedex = After long exposure to sunlight, the patterns on its tail fins shine vividly when darkness arrives.
 Generation = 4
-Evolutions = LUMINEON,Level,31
+Evolution = LUMINEON,Level,31
 #-------------------------------
 [LUMINEON]
 Name = Lumineon
@@ -12030,7 +12054,7 @@ Shape = Winged
 Category = Kite
 Pokedex = A friendly Pokémon that captures the subtle flows of seawater using its two antennae.
 Generation = 4
-Evolutions = MANTINE,HasInParty,REMORAID
+Evolution = MANTINE,HasInParty,REMORAID
 #-------------------------------
 [SNOVER]
 Name = Snover
@@ -12057,7 +12081,7 @@ Category = Frost Tree
 Pokedex = It lives on snowy mountains. Having had little contact with humans, it is boldly inquisitive.
 Generation = 4
 WildItemUncommon = NEVERMELTICE
-Evolutions = ABOMASNOW,Level,40
+Evolution = ABOMASNOW,Level,40
 #-------------------------------
 [ABOMASNOW]
 Name = Abomasnow
@@ -12943,7 +12967,7 @@ Shape = BipedalTail
 Category = Grass Snake
 Pokedex = They photosynthesize by bathing their tails in sunlight. When they are not feeling well, their tails droop.
 Generation = 5
-Evolutions = SERVINE,Level,17
+Evolution = SERVINE,Level,17
 #-------------------------------
 [SERVINE]
 Name = Servine
@@ -12968,7 +12992,7 @@ Shape = BipedalTail
 Category = Grass Snake
 Pokedex = They avoid attacks by sinking into the shadows of thick foliage. They retaliate with masterful whipping techniques.
 Generation = 5
-Evolutions = SERPERIOR,Level,36
+Evolution = SERPERIOR,Level,36
 #-------------------------------
 [SERPERIOR]
 Name = Serperior
@@ -13018,7 +13042,7 @@ Shape = Quadruped
 Category = Fire Pig
 Pokedex = It blows fire through its nose. When it catches a cold, the fire becomes pitch-black smoke instead.
 Generation = 5
-Evolutions = PIGNITE,Level,17
+Evolution = PIGNITE,Level,17
 #-------------------------------
 [PIGNITE]
 Name = Pignite
@@ -13043,7 +13067,7 @@ Shape = BipedalTail
 Category = Fire Pig
 Pokedex = Whatever it eats becomes fuel for the flame in its stomach. When it is angered, the intensity of the flame increases.
 Generation = 5
-Evolutions = EMBOAR,Level,36
+Evolution = EMBOAR,Level,36
 #-------------------------------
 [EMBOAR]
 Name = Emboar
@@ -13093,7 +13117,7 @@ Shape = BipedalTail
 Category = Sea Otter
 Pokedex = The scalchop on its stomach is made from the same elements as claws. It detaches the scalchop for use as a blade.
 Generation = 5
-Evolutions = DEWOTT,Level,17
+Evolution = DEWOTT,Level,17
 #-------------------------------
 [DEWOTT]
 Name = Dewott
@@ -13118,7 +13142,7 @@ Shape = BipedalTail
 Category = Discipline
 Pokedex = Scalchop techniques differ from one Dewott to another. It never neglects maintaining its scalchops.
 Generation = 5
-Evolutions = SAMUROTT,Level,36
+Evolution = SAMUROTT,Level,36
 #-------------------------------
 [SAMUROTT]
 Name = Samurott
@@ -13168,7 +13192,7 @@ Shape = Quadruped
 Category = Scout
 Pokedex = Extremely cautious, they take shifts to maintain a constant watch of their nest. They feel insecure without a lookout.
 Generation = 5
-Evolutions = WATCHOG,Level,20
+Evolution = WATCHOG,Level,20
 #-------------------------------
 [WATCHOG]
 Name = Watchog
@@ -13218,7 +13242,7 @@ Shape = Quadruped
 Category = Puppy
 Pokedex = The long hair around its face provides an amazing radar that lets it sense subtle changes in its surroundings.
 Generation = 5
-Evolutions = HERDIER,Level,16
+Evolution = HERDIER,Level,16
 #-------------------------------
 [HERDIER]
 Name = Herdier
@@ -13243,7 +13267,7 @@ Shape = Quadruped
 Category = Loyal Dog
 Pokedex = It loyally follows its Trainer's orders. For ages, they have helped Trainers raise Pokémon.
 Generation = 5
-Evolutions = STOUTLAND,Level,32
+Evolution = STOUTLAND,Level,32
 #-------------------------------
 [STOUTLAND]
 Name = Stoutland
@@ -13293,7 +13317,7 @@ Shape = Quadruped
 Category = Devious
 Pokedex = Its cute act is a ruse. When victims let down their guard, they find their items taken. It attacks with sharp claws.
 Generation = 5
-Evolutions = LIEPARD,Level,20
+Evolution = LIEPARD,Level,20
 #-------------------------------
 [LIEPARD]
 Name = Liepard
@@ -13343,7 +13367,7 @@ Shape = BipedalTail
 Category = Grass Monkey
 Pokedex = It shares the leaf on its head with weary-looking Pokémon. These leaves are known to relieve stress.
 Generation = 5
-Evolutions = SIMISAGE,Item,LEAFSTONE
+Evolution = SIMISAGE,Item,LEAFSTONE
 #-------------------------------
 [SIMISAGE]
 Name = Simisage
@@ -13393,7 +13417,7 @@ Shape = BipedalTail
 Category = High Temp
 Pokedex = This Pokémon lives in caves in volcanoes. The fire within the tuft on its head can reach 600º F.
 Generation = 5
-Evolutions = SIMISEAR,Item,FIRESTONE
+Evolution = SIMISEAR,Item,FIRESTONE
 #-------------------------------
 [SIMISEAR]
 Name = Simisear
@@ -13443,7 +13467,7 @@ Shape = BipedalTail
 Category = Spray
 Pokedex = It does not thrive in dry environments. It keeps itself damp by shooting water stored in its head tuft from its tail.
 Generation = 5
-Evolutions = SIMIPOUR,Item,WATERSTONE
+Evolution = SIMIPOUR,Item,WATERSTONE
 #-------------------------------
 [SIMIPOUR]
 Name = Simipour
@@ -13493,7 +13517,7 @@ Shape = Quadruped
 Category = Dream Eater
 Pokedex = It eats the dreams of people and Pokémon. When it eats a pleasant dreams, it expels pink-colored mist.
 Generation = 5
-Evolutions = MUSHARNA,Item,MOONSTONE
+Evolution = MUSHARNA,Item,MOONSTONE
 #-------------------------------
 [MUSHARNA]
 Name = Musharna
@@ -13543,7 +13567,7 @@ Shape = Winged
 Category = Tiny Pigeon
 Pokedex = These Pokémon live in cities. They are accustomed to people. Flocks often gather in parks and plazas.
 Generation = 5
-Evolutions = TRANQUILL,Level,21
+Evolution = TRANQUILL,Level,21
 #-------------------------------
 [TRANQUILL]
 Name = Tranquill
@@ -13568,7 +13592,7 @@ Shape = Winged
 Category = Wild Pigeon
 Pokedex = Many people believe that, deep in the forest where Tranquill live, there is a peaceful place where there is no war.
 Generation = 5
-Evolutions = UNFEZANT,Level,32
+Evolution = UNFEZANT,Level,32
 #-------------------------------
 [UNFEZANT]
 Name = Unfezant
@@ -13618,7 +13642,7 @@ Shape = Quadruped
 Category = Electrified
 Pokedex = When thunderclouds cover the sky, it will appear. It can catch lightning with its mane and store the electricity.
 Generation = 5
-Evolutions = ZEBSTRIKA,Level,27
+Evolution = ZEBSTRIKA,Level,27
 #-------------------------------
 [ZEBSTRIKA]
 Name = Zebstrika
@@ -13670,7 +13694,7 @@ Pokedex = They were discovered a hundred years ago in an earthquake fissure. Ins
 Generation = 5
 WildItemCommon = EVERSTONE
 WildItemUncommon = HARDSTONE
-Evolutions = BOLDORE,Level,25
+Evolution = BOLDORE,Level,25
 #-------------------------------
 [BOLDORE]
 Name = Boldore
@@ -13697,7 +13721,7 @@ Pokedex = Because its energy was too great to be contained, the energy leaked an
 Generation = 5
 WildItemCommon = EVERSTONE
 WildItemUncommon = HARDSTONE
-Evolutions = GIGALITH,Trade,
+Evolution = GIGALITH,Trade
 #-------------------------------
 [GIGALITH]
 Name = Gigalith
@@ -13749,7 +13773,7 @@ Shape = Winged
 Category = Bat
 Pokedex = Suction from its nostrils enables it to stick to cave walls during sleep. It leaves a heart-shaped mark behind.
 Generation = 5
-Evolutions = SWOOBAT,Happiness,
+Evolution = SWOOBAT,Happiness
 #-------------------------------
 [SWOOBAT]
 Name = Swoobat
@@ -13799,7 +13823,7 @@ Shape = BipedalTail
 Category = Mole
 Pokedex = It makes its way swiftly through the soil by putting both claws together and rotating at high speed.
 Generation = 5
-Evolutions = EXCADRILL,Level,31
+Evolution = EXCADRILL,Level,31
 #-------------------------------
 [EXCADRILL]
 Name = Excadrill
@@ -13876,7 +13900,7 @@ Shape = Bipedal
 Category = Muscular
 Pokedex = These Pokémon appear at building sites and help out with construction. They always carry squared logs.
 Generation = 5
-Evolutions = GURDURR,Level,25
+Evolution = GURDURR,Level,25
 #-------------------------------
 [GURDURR]
 Name = Gurdurr
@@ -13901,7 +13925,7 @@ Shape = Bipedal
 Category = Muscular
 Pokedex = They strengthen their bodies by carrying steel beams. They show off their big muscles to their friends.
 Generation = 5
-Evolutions = CONKELDURR,Trade,
+Evolution = CONKELDURR,Trade
 #-------------------------------
 [CONKELDURR]
 Name = Conkeldurr
@@ -13951,7 +13975,7 @@ Shape = Finned
 Category = Tadpole
 Pokedex = By vibrating its cheeks, it emits sound waves imperceptible to humans. It uses the rhythm of these sounds to talk.
 Generation = 5
-Evolutions = PALPITOAD,Level,25
+Evolution = PALPITOAD,Level,25
 #-------------------------------
 [PALPITOAD]
 Name = Palpitoad
@@ -13976,7 +14000,7 @@ Shape = BipedalTail
 Category = Vibration
 Pokedex = It lives in the water and on land. It uses its long, sticky tongue to capture prey.
 Generation = 5
-Evolutions = SEISMITOAD,Level,36
+Evolution = SEISMITOAD,Level,36
 #-------------------------------
 [SEISMITOAD]
 Name = Seismitoad
@@ -14077,7 +14101,7 @@ Category = Sewing
 Pokedex = This Pokémon makes clothes for itself. It chews up leaves and sews them with sticky thread extruded from its mouth.
 Generation = 5
 WildItemUncommon = MENTALHERB
-Evolutions = SWADLOON,Level,20
+Evolution = SWADLOON,Level,20
 #-------------------------------
 [SWADLOON]
 Name = Swadloon
@@ -14103,7 +14127,7 @@ Category = Leaf-Wrapped
 Pokedex = It protects itself from the cold by wrapping up in leaves. It stays on the move, eating leaves in forests.
 Generation = 5
 WildItemUncommon = MENTALHERB
-Evolutions = LEAVANNY,Happiness,
+Evolution = LEAVANNY,Happiness
 #-------------------------------
 [LEAVANNY]
 Name = Leavanny
@@ -14155,7 +14179,7 @@ Category = Centipede
 Pokedex = It discovers what is going on around it by using the feelers on its head and tail. It is brutally aggresive.
 Generation = 5
 WildItemUncommon = POISONBARB
-Evolutions = WHIRLIPEDE,Level,22
+Evolution = WHIRLIPEDE,Level,22
 #-------------------------------
 [WHIRLIPEDE]
 Name = Whirlipede
@@ -14181,7 +14205,7 @@ Category = Curlipede
 Pokedex = It is usually motionless, but when attacked, it rotates at high speed and then crashes into its opponent.
 Generation = 5
 WildItemUncommon = POISONBARB
-Evolutions = SCOLIPEDE,Level,30
+Evolution = SCOLIPEDE,Level,30
 #-------------------------------
 [SCOLIPEDE]
 Name = Scolipede
@@ -14233,7 +14257,7 @@ Category = Cotton Puff
 Pokedex = They go wherever the wind takes them. On rainy days, their bodies are heavier, so they take shelter beneath big trees.
 Generation = 5
 WildItemUncommon = ABSORBBULB
-Evolutions = WHIMSICOTT,Item,SUNSTONE
+Evolution = WHIMSICOTT,Item,SUNSTONE
 #-------------------------------
 [WHIMSICOTT]
 Name = Whimsicott
@@ -14285,7 +14309,7 @@ Category = Bulb
 Pokedex = Since they prefer moist, nutrient-rich soil, the areas where Petilil live are known to be good for growing plants.
 Generation = 5
 WildItemUncommon = ABSORBBULB
-Evolutions = LILLIGANT,Item,SUNSTONE
+Evolution = LILLIGANT,Item,SUNSTONE
 #-------------------------------
 [LILLIGANT]
 Name = Lilligant
@@ -14365,7 +14389,7 @@ Category = Desert Croc
 Pokedex = It moves along below the sand's surface, except for its nose and eyes. A dark membrane shields its eyes from the sun.
 Generation = 5
 WildItemUncommon = BLACKGLASSES
-Evolutions = KROKOROK,Level,29
+Evolution = KROKOROK,Level,29
 #-------------------------------
 [KROKOROK]
 Name = Krokorok
@@ -14391,7 +14415,7 @@ Category = Desert Croc
 Pokedex = The special membrane covering its eyes can sense the heat of objects, so it can see its surroundings, even in darkness.
 Generation = 5
 WildItemUncommon = BLACKGLASSES
-Evolutions = KROOKODILE,Level,40
+Evolution = KROOKODILE,Level,40
 #-------------------------------
 [KROOKODILE]
 Name = Krookodile
@@ -14442,7 +14466,7 @@ Shape = Bipedal
 Category = Zen Charm
 Pokedex = Darumaka's droppings are hot, so people used to put them in their clothes to keep themselves warm.
 Generation = 5
-Evolutions = DARMANITAN,Level,35
+Evolution = DARMANITAN,Level,35
 #-------------------------------
 [DARMANITAN]
 Name = Darmanitan
@@ -14520,7 +14544,7 @@ Category = Rock Inn
 Pokedex = It makes a hole in a suitable rock. If that rock breaks, the Pokémon remains agitated until it locates a replacement.
 Generation = 5
 WildItemUncommon = HARDSTONE
-Evolutions = CRUSTLE,Level,34
+Evolution = CRUSTLE,Level,34
 #-------------------------------
 [CRUSTLE]
 Name = Crustle
@@ -14572,7 +14596,7 @@ Category = Shedding
 Pokedex = It immediately headbutts anyone that makes eye contact with it. Its skull is massively thick.
 Generation = 5
 WildItemUncommon = SHEDSHELL
-Evolutions = SCRAFTY,Level,39
+Evolution = SCRAFTY,Level,39
 #-------------------------------
 [SCRAFTY]
 Name = Scrafty
@@ -14648,7 +14672,8 @@ Category = Spirit
 Pokedex = These Pokémon arose from the spirits of people interred in graves in past ages. Each retains memories of its former life.
 Generation = 5
 WildItemUncommon = SPELLTAG
-Evolutions = COFAGRIGUS,Level,34,RUNERIGUS,None,
+Evolution = COFAGRIGUS,Level,34
+Evolution = RUNERIGUS,None
 #-------------------------------
 [COFAGRIGUS]
 Name = Cofagrigus
@@ -14698,7 +14723,7 @@ Shape = Quadruped
 Category = Prototurtle
 Pokedex = About 100 million years ago, these Pokémon swam in oceans. It is thought they also went on land to attack prey.
 Generation = 5
-Evolutions = CARRACOSTA,Level,37
+Evolution = CARRACOSTA,Level,37
 #-------------------------------
 [CARRACOSTA]
 Name = Carracosta
@@ -14747,7 +14772,7 @@ Shape = Winged
 Category = First Bird
 Pokedex = Revived from a fossil, this Pokémon is thought to be the ancestor of all bird Pokémon.
 Generation = 5
-Evolutions = ARCHEOPS,Level,37
+Evolution = ARCHEOPS,Level,37
 #-------------------------------
 [ARCHEOPS]
 Name = Archeops
@@ -14797,7 +14822,7 @@ Category = Trash Bag
 Pokedex = The combination of garbage bags and industrial waste caused the chemical reaction that crated this Pokémon.
 Generation = 5
 WildItemUncommon = SILKSCARF
-Evolutions = GARBODOR,Level,36
+Evolution = GARBODOR,Level,36
 #-------------------------------
 [GARBODOR]
 Name = Garbodor
@@ -14848,7 +14873,7 @@ Shape = Quadruped
 Category = Tricky Fox
 Pokedex = To protect themselves from danger, they hide their true identities by transforming into people and Pokémon.
 Generation = 5
-Evolutions = ZOROARK,Level,30
+Evolution = ZOROARK,Level,30
 #-------------------------------
 [ZOROARK]
 Name = Zoroark
@@ -14897,7 +14922,7 @@ Shape = Quadruped
 Category = Chinchilla
 Pokedex = These Pokémon prefer a tidy habitat. They are always sweeping and dusting, using their tails as brooms.
 Generation = 5
-Evolutions = CINCCINO,Item,SHINYSTONE
+Evolution = CINCCINO,Item,SHINYSTONE
 #-------------------------------
 [CINCCINO]
 Name = Cinccino
@@ -14947,7 +14972,7 @@ Shape = Bipedal
 Category = Fixation
 Pokedex = They intently observe both Trainers and Pokémon. Apparently, they are looking at something that only Gothita can see.
 Generation = 5
-Evolutions = GOTHORITA,Level,32
+Evolution = GOTHORITA,Level,32
 #-------------------------------
 [GOTHORITA]
 Name = Gothorita
@@ -14972,7 +14997,7 @@ Shape = Bipedal
 Category = Manipulate
 Pokedex = Starlight is the source of their power. At night, they mark star positions by using psychic power to float stones.
 Generation = 5
-Evolutions = GOTHITELLE,Level,41
+Evolution = GOTHITELLE,Level,41
 #-------------------------------
 [GOTHITELLE]
 Name = Gothitelle
@@ -15022,7 +15047,7 @@ Shape = Head
 Category = Cell
 Pokedex = Because their bodies are enveloped in a special liquid, they can survive in any environment.
 Generation = 5
-Evolutions = DUOSION,Level,32
+Evolution = DUOSION,Level,32
 #-------------------------------
 [DUOSION]
 Name = Duosion
@@ -15047,7 +15072,7 @@ Shape = Head
 Category = Mitosis
 Pokedex = When their brains, now divided in two, are thinking the same thoughts, these Pokémon exhibit their maximum power.
 Generation = 5
-Evolutions = REUNICLUS,Level,41
+Evolution = REUNICLUS,Level,41
 #-------------------------------
 [REUNICLUS]
 Name = Reuniclus
@@ -15097,7 +15122,7 @@ Shape = Winged
 Category = Water Bird
 Pokedex = When attacked, it uses its feathers to splash water, escaping under cover of the spray.
 Generation = 5
-Evolutions = SWANNA,Level,35
+Evolution = SWANNA,Level,35
 #-------------------------------
 [SWANNA]
 Name = Swanna
@@ -15148,7 +15173,7 @@ Category = Fresh Snow
 Pokedex = This Pokémon formed from icicles bathed in energy from the morning sun. It sleeps buried in snow.
 Generation = 5
 WildItemUncommon = NEVERMELTICE
-Evolutions = VANILLISH,Level,35
+Evolution = VANILLISH,Level,35
 #-------------------------------
 [VANILLISH]
 Name = Vanillish
@@ -15174,7 +15199,7 @@ Category = Icy Snow
 Pokedex = It conceals itself from enemy eyes by creating many small ice particles and hiding among them.
 Generation = 5
 WildItemUncommon = NEVERMELTICE
-Evolutions = VANILLUXE,Level,47
+Evolution = VANILLUXE,Level,47
 #-------------------------------
 [VANILLUXE]
 Name = Vanilluxe
@@ -15226,7 +15251,7 @@ Shape = Quadruped
 Category = Season
 Pokedex = The turning of the seasons changes the color and scent of this Pokémon's fur. People use it to mark the seasons.
 Generation = 5
-Evolutions = SAWSBUCK,Level,34
+Evolution = SAWSBUCK,Level,34
 #-------------------------------
 [SAWSBUCK]
 Name = Sawsbuck
@@ -15302,7 +15327,7 @@ Shape = Bipedal
 Category = Clamping
 Pokedex = When they feel threatened, they spit an acidic liquid to drive attackers away. This Pokémon targets Shelmet.
 Generation = 5
-Evolutions = ESCAVALIER,TradeSpecies,SHELMET
+Evolution = ESCAVALIER,TradeSpecies,SHELMET
 #-------------------------------
 [ESCAVALIER]
 Name = Escavalier
@@ -15354,7 +15379,7 @@ Pokedex = For some reason, this Pokémon resembles a Poké Ball. They release po
 Generation = 5
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = AMOONGUSS,Level,39
+Evolution = AMOONGUSS,Level,39
 #-------------------------------
 [AMOONGUSS]
 Name = Amoonguss
@@ -15406,7 +15431,7 @@ Shape = Multiped
 Category = Floating
 Pokedex = They paralyze prey with poison, then drag them down to their lairs, five miles below the surface.
 Generation = 5
-Evolutions = JELLICENT,Level,40
+Evolution = JELLICENT,Level,40
 #-------------------------------
 [JELLICENT]
 Name = Jellicent
@@ -15481,7 +15506,7 @@ Shape = Insectoid
 Category = Attaching
 Pokedex = They attach themselves to large-bodied Pokémon and absorb static electricity, which they store in an electric pouch.
 Generation = 5
-Evolutions = GALVANTULA,Level,36
+Evolution = GALVANTULA,Level,36
 #-------------------------------
 [GALVANTULA]
 Name = Galvantula
@@ -15531,7 +15556,7 @@ Category = Thorn Seed
 Pokedex = They stick their spikes into cave walls and absorb the minerals they find in the rock.
 Generation = 5
 WildItemUncommon = STICKYBARB
-Evolutions = FERROTHORN,Level,40
+Evolution = FERROTHORN,Level,40
 #-------------------------------
 [FERROTHORN]
 Name = Ferrothorn
@@ -15581,7 +15606,7 @@ Shape = MultiBody
 Category = Gear
 Pokedex = Interlocking two bodies and spinning around generates the energy they need to live.
 Generation = 5
-Evolutions = KLANG,Level,38
+Evolution = KLANG,Level,38
 #-------------------------------
 [KLANG]
 Name = Klang
@@ -15606,7 +15631,7 @@ Shape = MultiBody
 Category = Gear
 Pokedex = Spinning minigears are rotated at high speed and repeatedly fired away. It is dangerous if the gears don't return.
 Generation = 5
-Evolutions = KLINKLANG,Level,49
+Evolution = KLINKLANG,Level,49
 #-------------------------------
 [KLINKLANG]
 Name = Klinklang
@@ -15654,7 +15679,7 @@ Shape = Finned
 Category = EleFish
 Pokedex = These Pokémon move in schools. They have an electricity-generating organ, so they discharge electricity if in danger.
 Generation = 5
-Evolutions = EELEKTRIK,Level,39
+Evolution = EELEKTRIK,Level,39
 #-------------------------------
 [EELEKTRIK]
 Name = Eelektrik
@@ -15678,7 +15703,7 @@ Shape = Finned
 Category = EleFish
 Pokedex = These Pokémon have a big appetite. When they spot their prey, they attack it and paralyze it with electricity.
 Generation = 5
-Evolutions = EELEKTROSS,Item,THUNDERSTONE
+Evolution = EELEKTROSS,Item,THUNDERSTONE
 #-------------------------------
 [EELEKTROSS]
 Name = Eelektross
@@ -15727,7 +15752,7 @@ Shape = BipedalTail
 Category = Cerebral
 Pokedex = This Pokémon had never been seen until it appeared from far in the desert 50 years ago.
 Generation = 5
-Evolutions = BEHEEYEM,Level,42
+Evolution = BEHEEYEM,Level,42
 #-------------------------------
 [BEHEEYEM]
 Name = Beheeyem
@@ -15777,7 +15802,7 @@ Shape = HeadBase
 Category = Candle
 Pokedex = While shining a light and pretending to be a guide, it leeches off the life force of any who follow it.
 Generation = 5
-Evolutions = LAMPENT,Level,41
+Evolution = LAMPENT,Level,41
 #-------------------------------
 [LAMPENT]
 Name = Lampent
@@ -15802,7 +15827,7 @@ Shape = HeadArms
 Category = Lamp
 Pokedex = It arrives near the moment of death and steals spirit from the body.
 Generation = 5
-Evolutions = CHANDELURE,Item,DUSKSTONE
+Evolution = CHANDELURE,Item,DUSKSTONE
 #-------------------------------
 [CHANDELURE]
 Name = Chandelure
@@ -15852,7 +15877,7 @@ Shape = BipedalTail
 Category = Tusk
 Pokedex = They mark their territory by leaving gashes in trees with their tusks. If a tusk breaks, a new one grows in quickly.
 Generation = 5
-Evolutions = FRAXURE,Level,38
+Evolution = FRAXURE,Level,38
 #-------------------------------
 [FRAXURE]
 Name = Fraxure
@@ -15877,7 +15902,7 @@ Shape = BipedalTail
 Category = Axe Jaw
 Pokedex = Their tusks can shatter rocks. Territory battles between Fraxure can be intensely violent.
 Generation = 5
-Evolutions = HAXORUS,Level,48
+Evolution = HAXORUS,Level,48
 #-------------------------------
 [HAXORUS]
 Name = Haxorus
@@ -15927,7 +15952,7 @@ Shape = BipedalTail
 Category = Chill
 Pokedex = Its nose is always running. It sniffs the snot back up because the mucus provides the raw material for its moves.
 Generation = 5
-Evolutions = BEARTIC,Level,37
+Evolution = BEARTIC,Level,37
 #-------------------------------
 [BEARTIC]
 Name = Beartic
@@ -16001,7 +16026,7 @@ Shape = Head
 Category = Snail
 Pokedex = It evolves when bathed in an electric-like energy along with Karrablast. The reason is still unknown.
 Generation = 5
-Evolutions = ACCELGOR,TradeSpecies,KARRABLAST
+Evolution = ACCELGOR,TradeSpecies,KARRABLAST
 #-------------------------------
 [ACCELGOR]
 Name = Accelgor
@@ -16077,7 +16102,7 @@ Shape = BipedalTail
 Category = Martial Arts
 Pokedex = They have mastered elegant combos. As they concentrate, their battle moves become swifter and more precise.
 Generation = 5
-Evolutions = MIENSHAO,Level,50
+Evolution = MIENSHAO,Level,50
 #-------------------------------
 [MIENSHAO]
 Name = Mienshao
@@ -16153,7 +16178,7 @@ Category = Automaton
 Pokedex = These Pokémon are thought to have been created by the science of an ancient and mysterious civilization.
 Generation = 5
 WildItemUncommon = LIGHTCLAY
-Evolutions = GOLURK,Level,43
+Evolution = GOLURK,Level,43
 #-------------------------------
 [GOLURK]
 Name = Golurk
@@ -16204,7 +16229,7 @@ Shape = Bipedal
 Category = Sharp Blade
 Pokedex = They fight at Bisharp's command. They cling to their prey and inflict damage by sinking their blades into it.
 Generation = 5
-Evolutions = BISHARP,Level,52
+Evolution = BISHARP,Level,52
 #-------------------------------
 [BISHARP]
 Name = Bisharp
@@ -16278,7 +16303,7 @@ Shape = Winged
 Category = Eaglet
 Pokedex = They will challenge anything, even strong opponents, without fear. Their frequent fights help them become stronger.
 Generation = 5
-Evolutions = BRAVIARY,Level,54
+Evolution = BRAVIARY,Level,54
 #-------------------------------
 [BRAVIARY]
 Name = Braviary
@@ -16328,7 +16353,7 @@ Shape = Winged
 Category = Diapered
 Pokedex = They tend to guard their posteriors with suitable bones they have found. They pursue weak Pokémon.
 Generation = 5
-Evolutions = MANDIBUZZ,Level,54
+Evolution = MANDIBUZZ,Level,54
 #-------------------------------
 [MANDIBUZZ]
 Name = Mandibuzz
@@ -16427,7 +16452,7 @@ Shape = Quadruped
 Category = Irate
 Pokedex = They cannot see, so they tackle and bite to learn about their surroundings. Their bodies are covered in wounds.
 Generation = 5
-Evolutions = ZWEILOUS,Level,50
+Evolution = ZWEILOUS,Level,50
 #-------------------------------
 [ZWEILOUS]
 Name = Zweilous
@@ -16451,7 +16476,7 @@ Shape = Quadruped
 Category = Hostile
 Pokedex = Since their two heads do not get along and compete with each other for food, they always eat too much.
 Generation = 5
-Evolutions = HYDREIGON,Level,64
+Evolution = HYDREIGON,Level,64
 #-------------------------------
 [HYDREIGON]
 Name = Hydreigon
@@ -16500,7 +16525,7 @@ Shape = Insectoid
 Category = Torch
 Pokedex = The base of volcanoes is where they make their homes. They shoot fire from their five horns to repel attacking enemies.
 Generation = 5
-Evolutions = VOLCARONA,Level,59
+Evolution = VOLCARONA,Level,59
 #-------------------------------
 [VOLCARONA]
 Name = Volcarona
@@ -16853,7 +16878,7 @@ Shape = BipedalTail
 Category = Spiny Nut
 Pokedex = The quills on its head are usually soft. When it flexes them, the points become so hard and sharp that they can pierce rock.
 Generation = 6
-Evolutions = QUILLADIN,Level,16
+Evolution = QUILLADIN,Level,16
 #-------------------------------
 [QUILLADIN]
 Name = Quilladin
@@ -16878,7 +16903,7 @@ Shape = BipedalTail
 Category = Spiny Armor
 Pokedex = They strengthen their lower bodies by running into one another. They are very kind and won't start fights.
 Generation = 6
-Evolutions = CHESNAUGHT,Level,36
+Evolution = CHESNAUGHT,Level,36
 #-------------------------------
 [CHESNAUGHT]
 Name = Chesnaught
@@ -16928,7 +16953,7 @@ Shape = Quadruped
 Category = Fox
 Pokedex = As it walks, it munches on a twig in place of a snack. It intimidates opponents by puffing hot air out of its ears.
 Generation = 6
-Evolutions = BRAIXEN,Level,16
+Evolution = BRAIXEN,Level,16
 #-------------------------------
 [BRAIXEN]
 Name = Braixen
@@ -16953,7 +16978,7 @@ Shape = BipedalTail
 Category = Fox
 Pokedex = When the twig is plucked from its tail, friction sets the twig alight. The flame is used to send signals to its allies.
 Generation = 6
-Evolutions = DELPHOX,Level,36
+Evolution = DELPHOX,Level,36
 #-------------------------------
 [DELPHOX]
 Name = Delphox
@@ -17003,7 +17028,7 @@ Shape = Quadruped
 Category = Bubble Frog
 Pokedex = It protects its skin by covering its body in delicate bubbles. Beneath its happy-go-lucky air, it keeps a watchful eye on its surroundings.
 Generation = 6
-Evolutions = FROGADIER,Level,16
+Evolution = FROGADIER,Level,16
 #-------------------------------
 [FROGADIER]
 Name = Frogadier
@@ -17028,7 +17053,7 @@ Shape = Bipedal
 Category = Bubble Frog
 Pokedex = It can throw bubble-covered pebbles with precise control, hitting empty cans up to a hundred feet away.
 Generation = 6
-Evolutions = GRENINJA,Level,36
+Evolution = GRENINJA,Level,36
 #-------------------------------
 [GRENINJA]
 Name = Greninja
@@ -17078,7 +17103,7 @@ Shape = BipedalTail
 Category = Digging
 Pokedex = It has ears like shovels. Digging holes strengthens its ears so much that they can sever thick roots effortlessly.
 Generation = 6
-Evolutions = DIGGERSBY,Level,20
+Evolution = DIGGERSBY,Level,20
 #-------------------------------
 [DIGGERSBY]
 Name = Diggersby
@@ -17128,7 +17153,7 @@ Shape = Winged
 Category = Tiny Robin
 Pokedex = These friendly Pokémon send signals to one another with beautiful chirps and tail-feather movements.
 Generation = 6
-Evolutions = FLETCHINDER,Level,17
+Evolution = FLETCHINDER,Level,17
 #-------------------------------
 [FLETCHINDER]
 Name = Fletchinder
@@ -17153,7 +17178,7 @@ Shape = Winged
 Category = Ember
 Pokedex = From its beak, it expels embers that set the tall grass on fire. Then it pounces on the bewildered prey that pop out of the grass.
 Generation = 6
-Evolutions = TALONFLAME,Level,35
+Evolution = TALONFLAME,Level,35
 #-------------------------------
 [TALONFLAME]
 Name = Talonflame
@@ -17203,7 +17228,7 @@ Shape = Insectoid
 Category = Scatterdust
 Pokedex = When under attack from bird Pokémon, it spews a poisonous black powder that causes paralysis on contact.
 Generation = 6
-Evolutions = SPEWPA,Level,9
+Evolution = SPEWPA,Level,9
 #-------------------------------
 [SPEWPA]
 Name = Spewpa
@@ -17228,7 +17253,7 @@ Shape = HeadBase
 Category = Scatterdust
 Pokedex = It lives hidden within thicket shadows. When predators attack, it quickly bristles the fur covering its body in an effort to threaten them.
 Generation = 6
-Evolutions = VIVILLON,Level,12
+Evolution = VIVILLON,Level,12
 #-------------------------------
 [VIVILLON]
 Name = Vivillon
@@ -17279,7 +17304,7 @@ Shape = Quadruped
 Category = Lion Cub
 Pokedex = They set off on their own from their pride and live by themselves to become stronger. These hot-blooded Pokémon are quick to fight.
 Generation = 6
-Evolutions = PYROAR,Level,35
+Evolution = PYROAR,Level,35
 #-------------------------------
 [PYROAR]
 Name = Pyroar
@@ -17331,7 +17356,7 @@ Category = Single Bloom
 Pokedex = When it finds a flower it likes, it dwells on that flower its whole life long. It floats in the wind's embrace with an untroubled heart.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = FLOETTE,Level,19
+Evolution = FLOETTE,Level,19
 #-------------------------------
 [FLOETTE]
 Name = Floette
@@ -17358,7 +17383,7 @@ Category = Single Bloom
 Pokedex = It flutters around fields of flowers and cares for flowers that are starting to wilt. It draws out the power of flowers to battle.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = FLORGES,Item,SHINYSTONE
+Evolution = FLORGES,Item,SHINYSTONE
 #-------------------------------
 [FLORGES]
 Name = Florges
@@ -17410,7 +17435,7 @@ Shape = Quadruped
 Category = Mount
 Pokedex = If it has sunshine and water, it doesn't need to eat, because it can generate energy from the leaves on its back.
 Generation = 6
-Evolutions = GOGOAT,Level,32
+Evolution = GOGOAT,Level,32
 #-------------------------------
 [GOGOAT]
 Name = Gogoat
@@ -17461,7 +17486,7 @@ Category = Playful
 Pokedex = It does its best to be taken seriously by its enemies, but its glare is not sufficiently intimidating. Chewing on a leaf is its trademark.
 Generation = 6
 WildItemUncommon = MENTALHERB
-Evolutions = PANGORO,LevelDarkInParty,32
+Evolution = PANGORO,LevelDarkInParty,32
 #-------------------------------
 [PANGORO]
 Name = Pangoro
@@ -17537,7 +17562,7 @@ Shape = BipedalTail
 Category = Restraint
 Pokedex = The organ that emits its intense psychic power is sheltered by its ears to keep power from leaking out.
 Generation = 6
-Evolutions = MEOWSTIC,Level,25
+Evolution = MEOWSTIC,Level,25
 #-------------------------------
 [MEOWSTIC]
 Name = Meowstic
@@ -17587,7 +17612,7 @@ Shape = HeadBase
 Category = Sword
 Pokedex = Apparently this Pokémon is born when a departed spirit inhabits a sword. It attaches itself to people and drinks their life force.
 Generation = 6
-Evolutions = DOUBLADE,Level,35
+Evolution = DOUBLADE,Level,35
 #-------------------------------
 [DOUBLADE]
 Name = Doublade
@@ -17611,7 +17636,7 @@ Shape = MultiBody
 Category = Sword
 Pokedex = The complex attack patterns of its two swords are unstoppable, even for an opponent greatly accomplished at swordplay.
 Generation = 6
-Evolutions = AEGISLASH,Item,DUSKSTONE
+Evolution = AEGISLASH,Item,DUSKSTONE
 #-------------------------------
 [AEGISLASH]
 Name = Aegislash
@@ -17661,7 +17686,7 @@ Shape = HeadArms
 Category = Perfume
 Pokedex = It emits a scent that enraptures those who smell it. This fragrance changes depending on what it has eaten.
 Generation = 6
-Evolutions = AROMATISSE,TradeItem,SACHET
+Evolution = AROMATISSE,TradeItem,SACHET
 #-------------------------------
 [AROMATISSE]
 Name = Aromatisse
@@ -17711,7 +17736,7 @@ Shape = HeadLegs
 Category = Cotton Candy
 Pokedex = To entangle its opponents in battle, it extrudes white threads as sweet and sticky as cotton candy.
 Generation = 6
-Evolutions = SLURPUFF,TradeItem,WHIPPEDDREAM
+Evolution = SLURPUFF,TradeItem,WHIPPEDDREAM
 #-------------------------------
 [SLURPUFF]
 Name = Slurpuff
@@ -17761,7 +17786,7 @@ Shape = Multiped
 Category = Revolving
 Pokedex = It flashes the light-emitting spots on its body, which drains its opponent's will to fight. It takes the opportunity to scuttle away and hide.
 Generation = 6
-Evolutions = MALAMAR,Level,30
+Evolution = MALAMAR,Level,30
 #-------------------------------
 [MALAMAR]
 Name = Malamar
@@ -17811,7 +17836,7 @@ Shape = MultiBody
 Category = Two-Handed
 Pokedex = They stretch and then contract, yanking their rocks along with them in bold hops. They eat seaweed that washes up on the shoreline.
 Generation = 6
-Evolutions = BARBARACLE,Level,39
+Evolution = BARBARACLE,Level,39
 #-------------------------------
 [BARBARACLE]
 Name = Barbaracle
@@ -17861,7 +17886,7 @@ Shape = HeadBase
 Category = Mock Kelp
 Pokedex = Camouflaged as rotten kelp, they spray liquid poison on prey that approaches unawares and then finish it off.
 Generation = 6
-Evolutions = DRAGALGE,Level,48
+Evolution = DRAGALGE,Level,48
 #-------------------------------
 [DRAGALGE]
 Name = Dragalge
@@ -17910,7 +17935,7 @@ Shape = Insectoid
 Category = Water Gun
 Pokedex = Through controlled expulsions of internal gas, it can expel water like a pistol shot. At close distances, it can shatter rock.
 Generation = 6
-Evolutions = CLAWITZER,Level,37
+Evolution = CLAWITZER,Level,37
 #-------------------------------
 [CLAWITZER]
 Name = Clawitzer
@@ -17959,7 +17984,7 @@ Shape = BipedalTail
 Category = Generator
 Pokedex = They make their home in deserts. They can generate their energy from basking in the sun, so eating food is not a requirement.
 Generation = 6
-Evolutions = HELIOLISK,Item,SUNSTONE
+Evolution = HELIOLISK,Item,SUNSTONE
 #-------------------------------
 [HELIOLISK]
 Name = Heliolisk
@@ -18009,7 +18034,7 @@ Shape = BipedalTail
 Category = Royal Heir
 Pokedex = Its immense jaws have enough destructive force that it can chew up an automobile. It lived 100 million years ago.
 Generation = 6
-Evolutions = TYRANTRUM,LevelDay,39
+Evolution = TYRANTRUM,LevelDay,39
 #-------------------------------
 [TYRANTRUM]
 Name = Tyrantrum
@@ -18059,7 +18084,7 @@ Shape = Quadruped
 Category = Tundra
 Pokedex = This ancient Pokémon was restored from part of its body that had been frozen in ice for over 100 million years.
 Generation = 6
-Evolutions = AURORUS,LevelNight,39
+Evolution = AURORUS,LevelNight,39
 #-------------------------------
 [AURORUS]
 Name = Aurorus
@@ -18209,7 +18234,7 @@ Category = Soft Tissue
 Pokedex = Its source of protection is its slimy, germ-laden mucous membrane. Anyone who touches it needs some thorough hand-washing.
 Generation = 6
 WildItemUncommon = SHEDSHELL
-Evolutions = SLIGGOO,Level,40
+Evolution = SLIGGOO,Level,40
 #-------------------------------
 [SLIGGOO]
 Name = Sliggoo
@@ -18235,7 +18260,7 @@ Category = Soft Tissue
 Pokedex = This Pokémon's mucous can dissolve anything. Toothless, it sprays mucous on its prey. Once they're nicely dissolved, it slurps them up.
 Generation = 6
 WildItemUncommon = SHEDSHELL
-Evolutions = GOODRA,LevelRain,50
+Evolution = GOODRA,LevelRain,50
 #-------------------------------
 [GOODRA]
 Name = Goodra
@@ -18310,7 +18335,7 @@ Shape = HeadArms
 Category = Stump
 Pokedex = These Pokémon are stumps possessed by the spirits of children who died in the forest. Their cries sound like eerie screams.
 Generation = 6
-Evolutions = TREVENANT,Trade,
+Evolution = TREVENANT,Trade
 #-------------------------------
 [TREVENANT]
 Name = Trevenant
@@ -18361,7 +18386,7 @@ Category = Pumpkin
 Pokedex = When taking spirits to the afterlife, small Pumpkaboo prefer the spirits of children to those of adults.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = GOURGEIST,Trade,
+Evolution = GOURGEIST,Trade
 #-------------------------------
 [GOURGEIST]
 Name = Gourgeist
@@ -18412,7 +18437,7 @@ Shape = Quadruped
 Category = Ice Chunk
 Pokedex = It blocks opponents' attacks with the ice that shields its body. It uses cold air to repair any cracks with new ice.
 Generation = 6
-Evolutions = AVALUGG,Level,37
+Evolution = AVALUGG,Level,37
 #-------------------------------
 [AVALUGG]
 Name = Avalugg
@@ -18462,7 +18487,7 @@ Shape = Winged
 Category = Sound Wave
 Pokedex = Even a robust wrestler will become dizzy and unable to stand when exposed to its 200,000-hertz ultrasonic waves.
 Generation = 6
-Evolutions = NOIVERN,Level,48
+Evolution = NOIVERN,Level,48
 #-------------------------------
 [NOIVERN]
 Name = Noivern
@@ -18659,7 +18684,7 @@ Shape = Winged
 Category = Grass Quill
 Pokedex = It sends its feathers, which are as sharp as blades, flying in attack. Its legs are strong, so its kicks are also formidable.
 Generation = 7
-Evolutions = DARTRIX,Level,17
+Evolution = DARTRIX,Level,17
 #-------------------------------
 [DARTRIX]
 Name = Dartrix
@@ -18684,7 +18709,7 @@ Shape = Winged
 Category = Blade Quill
 Pokedex = A bit of a dandy, it spends its free time preening its wings. Its preoccupation with any dirt on its plumage can leave it unable to battle.
 Generation = 7
-Evolutions = DECIDUEYE,Level,34
+Evolution = DECIDUEYE,Level,34
 #-------------------------------
 [DECIDUEYE]
 Name = Decidueye
@@ -18734,7 +18759,7 @@ Shape = Quadruped
 Category = Fire Cat
 Pokedex = Its coat regrows twice a year. When the time comes, Litten sets its own body on fire and burns away the old fur.
 Generation = 7
-Evolutions = TORRACAT,Level,17
+Evolution = TORRACAT,Level,17
 #-------------------------------
 [TORRACAT]
 Name = Torracat
@@ -18759,7 +18784,7 @@ Shape = Quadruped
 Category = Fire Cat
 Pokedex = It can act spoiled if it grows close to its Trainer. A powerful Pokémon, its sharp claws can leave its Trainer's whole body covered in scratches.
 Generation = 7
-Evolutions = INCINEROAR,Level,34
+Evolution = INCINEROAR,Level,34
 #-------------------------------
 [INCINEROAR]
 Name = Incineroar
@@ -18809,7 +18834,7 @@ Shape = Finned
 Category = Sea Lion
 Pokedex = This Pokémon snorts body fluids from its nose, blowing balloons to smash into its foes. It's famous for being a hard worker.
 Generation = 7
-Evolutions = BRIONNE,Level,17
+Evolution = BRIONNE,Level,17
 #-------------------------------
 [BRIONNE]
 Name = Brionne
@@ -18834,7 +18859,7 @@ Shape = Finned
 Category = Pop Star
 Pokedex = It gets excited when it sees a dance it doesn't know. This hard worker practices diligently until it can learn that dance.
 Generation = 7
-Evolutions = PRIMARINA,Level,34
+Evolution = PRIMARINA,Level,34
 #-------------------------------
 [PRIMARINA]
 Name = Primarina
@@ -18885,7 +18910,7 @@ Category = Woodpecker
 Pokedex = It pecks at trees with its hard beak. You can get some idea of its mood or condition from the rhythm of its pecking.
 Generation = 7
 WildItemUncommon = ORANBERRY
-Evolutions = TRUMBEAK,Level,14
+Evolution = TRUMBEAK,Level,14
 #-------------------------------
 [TRUMBEAK]
 Name = Trumbeak
@@ -18911,7 +18936,7 @@ Category = Bugle Beak
 Pokedex = It eats berries and stores their seeds in its beak. When it encounters enemies or prey, it fires off all the seeds in a burst.
 Generation = 7
 WildItemUncommon = SITRUSBERRY
-Evolutions = TOUCANNON,Level,28
+Evolution = TOUCANNON,Level,28
 #-------------------------------
 [TOUCANNON]
 Name = Toucannon
@@ -18963,7 +18988,7 @@ Category = Loitering
 Pokedex = Its stomach takes up most of its long torso. It's a big eater, so the amount Trainers have to spend on its food is no laughing matter.
 Generation = 7
 WildItemUncommon = PECHABERRY
-Evolutions = GUMSHOOS,LevelDay,20
+Evolution = GUMSHOOS,LevelDay,20
 #-------------------------------
 [GUMSHOOS]
 Name = Gumshoos
@@ -19013,7 +19038,7 @@ Shape = Insectoid
 Category = Larva
 Pokedex = It spits a sticky thread to stop opponents in their tracks, and then it grabs them in its sharp, sturdy mandibles to take them down.
 Generation = 7
-Evolutions = CHARJABUG,Level,20
+Evolution = CHARJABUG,Level,20
 #-------------------------------
 [CHARJABUG]
 Name = Charjabug
@@ -19038,7 +19063,8 @@ Category = Battery
 Pokedex = It buries itself in fallen leaves and barely moves, munching away on humus. If you accidentally step on one, you'll get a shock!
 Generation = 7
 WildItemUncommon = CELLBATTERY
-Evolutions = VIKAVOLT,Item,THUNDERSTONE,VIKAVOLT,LocationFlag,Magnetic
+Evolution = VIKAVOLT,Item,THUNDERSTONE
+Evolution = VIKAVOLT,LocationFlag,Magnetic
 #-------------------------------
 [VIKAVOLT]
 Name = Vikavolt
@@ -19088,7 +19114,7 @@ Category = Boxing
 Pokedex = It punches so much, its pincers often come off from overuse, but they grow back quickly. What little meat they contain is rich and delicious.
 Generation = 7
 WildItemUncommon = ASPEARBERRY
-Evolutions = CRABOMINABLE,LocationFlag,IceRock
+Evolution = CRABOMINABLE,LocationFlag,IceRock
 #-------------------------------
 [CRABOMINABLE]
 Name = Crabominable
@@ -19167,7 +19193,7 @@ Category = Bee Fly
 Pokedex = It feeds on the nectar and pollen of flowers. Because it's able to sense auras, it can identify which flowers are about to bloom.
 Generation = 7
 WildItemUncommon = HONEY
-Evolutions = RIBOMBEE,Level,25
+Evolution = RIBOMBEE,Level,25
 #-------------------------------
 [RIBOMBEE]
 Name = Ribombee
@@ -19218,7 +19244,7 @@ Shape = Quadruped
 Category = Puppy
 Pokedex = This Pokémon has lived with people since times long ago. It can sense when its Trainer is in the dumps and will stick close by its Trainer's side.
 Generation = 7
-Evolutions = LYCANROC,Level,25
+Evolution = LYCANROC,Level,25
 #-------------------------------
 [LYCANROC]
 Name = Lycanroc
@@ -19295,7 +19321,7 @@ Category = Brutal Star
 Pokedex = It plunges the poison spike on its head into its prey. When the prey has weakened, Mareanie deals the finishing blow with its 10 tentacles.
 Generation = 7
 WildItemUncommon = POISONBARB
-Evolutions = TOXAPEX,Level,38
+Evolution = TOXAPEX,Level,38
 #-------------------------------
 [TOXAPEX]
 Name = Toxapex
@@ -19347,7 +19373,7 @@ Category = Donkey
 Pokedex = It loves playing in the mud. If it isn't showered with mud on a daily basis, it gets stressed out and stops listening to its Trainer.
 Generation = 7
 WildItemUncommon = LIGHTCLAY
-Evolutions = MUDSDALE,Level,30
+Evolution = MUDSDALE,Level,30
 #-------------------------------
 [MUDSDALE]
 Name = Mudsdale
@@ -19399,7 +19425,7 @@ Category = Water Bubble
 Pokedex = When two Dewpider meet, they display their water bubbles to each other. Then the one with the smaller bubble gets out of the other's way.
 Generation = 7
 WildItemUncommon = MYSTICWATER
-Evolutions = ARAQUANID,Level,22
+Evolution = ARAQUANID,Level,22
 #-------------------------------
 [ARAQUANID]
 Name = Araquanid
@@ -19451,7 +19477,7 @@ Category = Sickle Grass
 Pokedex = When the sun rises, Fomantis spreads its four leaves and bathes in the sunlight. The tip of its head has a pleasant aroma.
 Generation = 7
 WildItemUncommon = MIRACLESEED
-Evolutions = LURANTIS,LevelDay,34
+Evolution = LURANTIS,LevelDay,34
 #-------------------------------
 [LURANTIS]
 Name = Lurantis
@@ -19504,7 +19530,7 @@ Pokedex = It scatters its shining spores around itself. Even though they're dang
 Generation = 7
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = SHIINOTIC,Level,24
+Evolution = SHIINOTIC,Level,24
 #-------------------------------
 [SHIINOTIC]
 Name = Shiinotic
@@ -19557,7 +19583,7 @@ Category = Toxic Lizard
 Pokedex = It burns its bodily fluids to create a poisonous gas. When its enemies become disoriented from inhaling the gas, it attacks them.
 Generation = 7
 WildItemUncommon = SMOKEBALL
-Evolutions = SALAZZLE,LevelFemale,33
+Evolution = SALAZZLE,LevelFemale,33
 #-------------------------------
 [SALAZZLE]
 Name = Salazzle
@@ -19608,7 +19634,7 @@ Shape = Quadruped
 Category = Flailing
 Pokedex = Despite its adorable appearance, when it gets angry and flails about, its arms and legs could knock a pro wrestler sprawling.
 Generation = 7
-Evolutions = BEWEAR,Level,27
+Evolution = BEWEAR,Level,27
 #-------------------------------
 [BEWEAR]
 Name = Bewear
@@ -19659,7 +19685,7 @@ Category = Fruit
 Pokedex = Because of its sweet, delicious aroma, bird Pokémon are always after it, but it's not intelligent enough to care.
 Generation = 7
 WildItemUncommon = GRASSYSEED
-Evolutions = STEENEE,Level,18
+Evolution = STEENEE,Level,18
 #-------------------------------
 [STEENEE]
 Name = Steenee
@@ -19685,7 +19711,7 @@ Category = Fruit
 Pokedex = It's protected by its hard sepals, so it plays with bird Pokémon without worry. They peck it relentlessly, but it doesn't care.
 Generation = 7
 WildItemUncommon = GRASSYSEED
-Evolutions = TSAREENA,HasMove,STOMP
+Evolution = TSAREENA,HasMove,STOMP
 #-------------------------------
 [TSAREENA]
 Name = Tsareena
@@ -19811,7 +19837,7 @@ Shape = Multiped
 Category = Turn Tail
 Pokedex = This Pokémon is a coward. As it desperately dashes off, the flailing of its many legs leaves a sparkling clean path in its wake.
 Generation = 7
-Evolutions = GOLISOPOD,Level,30
+Evolution = GOLISOPOD,Level,30
 #-------------------------------
 [GOLISOPOD]
 Name = Golisopod
@@ -19861,7 +19887,7 @@ Category = Sand Heap
 Pokedex = It likes the shovel on its head, so Sandygast will get serious and fight any children who come to take it back.
 Generation = 7
 WildItemUncommon = SPELLTAG
-Evolutions = PALOSSAND,Level,42
+Evolution = PALOSSAND,Level,42
 #-------------------------------
 [PALOSSAND]
 Name = Palossand
@@ -19936,7 +19962,7 @@ Category = Synthetic
 Pokedex = The heavy control mask it wears suppresses its intrinsic capabilities. This Pokémon has some hidden special power.
 Generation = 7
 Flags = Legendary
-Evolutions = SILVALLY,Happiness,
+Evolution = SILVALLY,Happiness
 #-------------------------------
 [SILVALLY]
 Name = Silvally
@@ -20189,7 +20215,7 @@ Category = Scaly
 Pokedex = It expresses its feelings by smacking its scales. Metallic sounds echo through the tall mountains where Jangmo-o lives.
 Generation = 7
 WildItemUncommon = RAZORCLAW
-Evolutions = HAKAMOO,Level,35
+Evolution = HAKAMOO,Level,35
 #-------------------------------
 [HAKAMOO]
 Name = Hakamo-o
@@ -20215,7 +20241,7 @@ Category = Scaly
 Pokedex = It sheds and regrows its scales on a continuous basis. The scales become harder and sharper each time they're regrown.
 Generation = 7
 WildItemUncommon = RAZORCLAW
-Evolutions = KOMMOO,Level,45
+Evolution = KOMMOO,Level,45
 #-------------------------------
 [KOMMOO]
 Name = Kommo-o
@@ -20364,7 +20390,7 @@ Category = Nebula
 Pokedex = Whether or not it's a Pokémon from this world is a mystery. When it's in a jam, it warps away to a safe place to hide.
 Generation = 7
 Flags = Legendary
-Evolutions = COSMOEM,Level,43
+Evolution = COSMOEM,Level,43
 #-------------------------------
 [COSMOEM]
 Name = Cosmoem
@@ -20389,7 +20415,8 @@ Category = Protostar
 Pokedex = Motionless as if dead, its body is faintly warm to the touch. In the distant past, it was called the cocoon of the stars.
 Generation = 7
 Flags = Legendary
-Evolutions = SOLGALEO,LevelDay,53,LUNALA,LevelNight,53
+Evolution = SOLGALEO,LevelDay,53
+Evolution = LUNALA,LevelNight,53
 #-------------------------------
 [SOLGALEO]
 Name = Solgaleo
@@ -20702,7 +20729,7 @@ Category = Poison Pin
 Pokedex = An Ultra Beast that lives in a different world, it cackles wildly as it sprays its opponents with poison from the needles on its head.
 Generation = 7
 Flags = UltraBeast
-Evolutions = NAGANADEL,HasMove,DRAGONPULSE
+Evolution = NAGANADEL,HasMove,DRAGONPULSE
 #-------------------------------
 [NAGANADEL]
 Name = Naganadel
@@ -20823,7 +20850,7 @@ Category = Hex Nut
 Pokedex = It melts particles of iron and other metals found in the subsoil, so it can absorb them into its body of molten steel.
 Generation = 7
 Flags = Mythical
-Evolutions = MELMETAL,Level,45
+Evolution = MELMETAL,Level,45
 #-------------------------------
 [MELMETAL]
 Name = Melmetal
@@ -20873,7 +20900,7 @@ Shape = BipedalTail
 Category = Chimp
 Pokedex = When it uses its special stick to strike up a beat, the sound waves produced carry revitalizing energy to the plants and flowers in the area.
 Generation = 8
-Evolutions = THWACKEY,Level,16
+Evolution = THWACKEY,Level,16
 #-------------------------------
 [THWACKEY]
 Name = Thwackey
@@ -20898,7 +20925,7 @@ Shape = BipedalTail
 Category = Beat
 Pokedex = When it's drumming out rapid beats in battle, it gets so caught up in the rhythm that it won't even notice that it's already knocked out its opponent.
 Generation = 8
-Evolutions = RILLABOOM,Level,35
+Evolution = RILLABOOM,Level,35
 #-------------------------------
 [RILLABOOM]
 Name = Rillaboom
@@ -20948,7 +20975,7 @@ Shape = BipedalTail
 Category = Rabbit
 Pokedex = A warm-up of running around gets fire energy coursing through this Pokémon's body. Once that happens, it's ready to fight at full power.
 Generation = 8
-Evolutions = RABOOT,Level,16
+Evolution = RABOOT,Level,16
 #-------------------------------
 [RABOOT]
 Name = Raboot
@@ -20973,7 +21000,7 @@ Shape = BipedalTail
 Category = Rabbit
 Pokedex = It kicks berries right off the branches of trees and then juggles them with its feet, practicing its footwork.
 Generation = 8
-Evolutions = CINDERACE,Level,35
+Evolution = CINDERACE,Level,35
 #-------------------------------
 [CINDERACE]
 Name = Cinderace
@@ -21023,7 +21050,7 @@ Shape = Quadruped
 Category = Water Lizard
 Pokedex = When scared, this Pokémon cries. Its tears pack the chemical punch of 100 onions, and attackers won't be able to resist weeping.
 Generation = 8
-Evolutions = DRIZZILE,Level,16
+Evolution = DRIZZILE,Level,16
 #-------------------------------
 [DRIZZILE]
 Name = Drizzile
@@ -21048,7 +21075,7 @@ Shape = BipedalTail
 Category = Water Lizard
 Pokedex = A clever combatant, this Pokémon battles using water balloons created with moisture secreted from its palms.
 Generation = 8
-Evolutions = INTELEON,Level,35
+Evolution = INTELEON,Level,35
 #-------------------------------
 [INTELEON]
 Name = Inteleon
@@ -21099,7 +21126,7 @@ Category = Cheeky
 Pokedex = It eats berries nonstop—a habit that has made it more resilient than it looks. It'll show up on farms, searching for yet more berries.
 Generation = 8
 WildItemUncommon = ORANBERRY
-Evolutions = GREEDENT,Level,24
+Evolution = GREEDENT,Level,24
 #-------------------------------
 [GREEDENT]
 Name = Greedent
@@ -21150,7 +21177,7 @@ Shape = Winged
 Category = Tiny Bird
 Pokedex = Jumping nimbly about, this small-bodied Pokémon takes advantage of even the slightest opportunity to disorient larger opponents.
 Generation = 8
-Evolutions = CORVISQUIRE,Level,18
+Evolution = CORVISQUIRE,Level,18
 #-------------------------------
 [CORVISQUIRE]
 Name = Corvisquire
@@ -21175,7 +21202,7 @@ Shape = Winged
 Category = Raven
 Pokedex = Smart enough to use tools in battle, these Pokémon have been seen picking up rocks and flinging them or using ropes to wrap up enemies.
 Generation = 8
-Evolutions = CORVIKNIGHT,Level,38
+Evolution = CORVIKNIGHT,Level,38
 #-------------------------------
 [CORVIKNIGHT]
 Name = Corviknight
@@ -21224,7 +21251,7 @@ Shape = Insectoid
 Category = Larva
 Pokedex = Often found in gardens, this Pokémon has hairs on its body that it uses to assess its surroundings.
 Generation = 8
-Evolutions = DOTTLER,Level,10
+Evolution = DOTTLER,Level,10
 #-------------------------------
 [DOTTLER]
 Name = Dottler
@@ -21250,7 +21277,7 @@ Category = Radome
 Pokedex = It barely moves, but it's still alive. Hiding in its shell without food or water seems to have awakened its psychic powers.
 Generation = 8
 WildItemUncommon = PSYCHICSEED
-Evolutions = ORBEETLE,Level,30
+Evolution = ORBEETLE,Level,30
 #-------------------------------
 [ORBEETLE]
 Name = Orbeetle
@@ -21301,7 +21328,7 @@ Shape = Quadruped
 Category = Fox
 Pokedex = Aided by the soft pads on its feet, it silently raids the food stores of other Pokémon. It survives off its ill-gotten gains.
 Generation = 8
-Evolutions = THIEVUL,Level,18
+Evolution = THIEVUL,Level,18
 #-------------------------------
 [THIEVUL]
 Name = Thievul
@@ -21351,7 +21378,7 @@ Shape = HeadBase
 Category = Flowering
 Pokedex = It anchors itself in the ground with its single leg, then basks in the sun. After absorbing enough sunlight, its petals spread as it blooms brilliantly.
 Generation = 8
-Evolutions = ELDEGOSS,Level,20
+Evolution = ELDEGOSS,Level,20
 #-------------------------------
 [ELDEGOSS]
 Name = Eldegoss
@@ -21401,7 +21428,7 @@ Shape = Quadruped
 Category = Sheep
 Pokedex = Its curly fleece is such an effective cushion that this Pokémon could fall off a cliff and stand right back up at the bottom, unharmed.
 Generation = 8
-Evolutions = DUBWOOL,Level,24
+Evolution = DUBWOOL,Level,24
 #-------------------------------
 [DUBWOOL]
 Name = Dubwool
@@ -21451,7 +21478,7 @@ Shape = Quadruped
 Category = Snapping
 Pokedex = It starts off battles by attacking with its rock-hard horn, but as soon as the opponent flinches, this Pokémon bites down and never lets go.
 Generation = 8
-Evolutions = DREDNAW,Level,22
+Evolution = DREDNAW,Level,22
 #-------------------------------
 [DREDNAW]
 Name = Drednaw
@@ -21501,7 +21528,7 @@ Shape = Quadruped
 Category = Puppy
 Pokedex = This gluttonous Pokémon only assists people with their work because it wants treats. As it runs, it crackles with electricity.
 Generation = 8
-Evolutions = BOLTUND,Level,25
+Evolution = BOLTUND,Level,25
 #-------------------------------
 [BOLTUND]
 Name = Boltund
@@ -21551,7 +21578,7 @@ Shape = Head
 Category = Coal
 Pokedex = Most of its body has the same composition as coal. Fittingly, this Pokémon was first discovered in coal mines about 400 years ago.
 Generation = 8
-Evolutions = CARKOL,Level,18
+Evolution = CARKOL,Level,18
 #-------------------------------
 [CARKOL]
 Name = Carkol
@@ -21576,7 +21603,7 @@ Shape = HeadLegs
 Category = Coal
 Pokedex = By rapidly rolling its legs, it can travel at over 18 mph. The temperature of the flames it breathes exceeds 1,000 degrees Celsius.
 Generation = 8
-Evolutions = COALOSSAL,Level,34
+Evolution = COALOSSAL,Level,34
 #-------------------------------
 [COALOSSAL]
 Name = Coalossal
@@ -21626,7 +21653,8 @@ Shape = Serpentine
 Category = Apple Core
 Pokedex = It spends its entire life inside an apple. It hides from its natural enemies, bird Pokémon, by pretending it's just an apple and nothing more.
 Generation = 8
-Evolutions = FLAPPLE,Item,TARTAPPLE,APPLETUN,Item,SWEETAPPLE
+Evolution = FLAPPLE,Item,TARTAPPLE
+Evolution = APPLETUN,Item,SWEETAPPLE
 #-------------------------------
 [FLAPPLE]
 Name = Flapple
@@ -21700,7 +21728,7 @@ Shape = Serpentine
 Category = Sand Snake
 Pokedex = It spews sand from its nostrils. While the enemy is blinded, it burrows into the ground to hide.
 Generation = 8
-Evolutions = SANDACONDA,Level,36
+Evolution = SANDACONDA,Level,36
 #-------------------------------
 [SANDACONDA]
 Name = Sandaconda
@@ -21774,7 +21802,7 @@ Shape = Finned
 Category = Rush
 Pokedex = If it sees any movement around it, this Pokémon charges for it straightaway, leading with its sharply pointed jaw. It's very proud of that jaw.
 Generation = 8
-Evolutions = BARRASKEWDA,Level,26
+Evolution = BARRASKEWDA,Level,26
 #-------------------------------
 [BARRASKEWDA]
 Name = Barraskewda
@@ -21824,7 +21852,7 @@ Shape = BipedalTail
 Category = Baby
 Pokedex = It manipulates the chemical makeup of its poison to produce electricity. The voltage is weak, but it can cause a tingling paralysis.
 Generation = 8
-Evolutions = TOXTRICITY,Level,30
+Evolution = TOXTRICITY,Level,30
 #-------------------------------
 [TOXTRICITY]
 Name = Toxtricity
@@ -21875,7 +21903,7 @@ Shape = Multiped
 Category = Radiator
 Pokedex = It stores flammable gas in its body and uses it to generate heat. The yellow sections on its belly get particularly hot.
 Generation = 8
-Evolutions = CENTISKORCH,Level,28
+Evolution = CENTISKORCH,Level,28
 #-------------------------------
 [CENTISKORCH]
 Name = Centiskorch
@@ -21925,7 +21953,7 @@ Shape = Multiped
 Category = Tantrum
 Pokedex = It's very curious, but its means of investigating things is to try to punch them with its tentacles. The search for food is what brings it onto land.
 Generation = 8
-Evolutions = GRAPPLOCT,HasMove,TAUNT
+Evolution = GRAPPLOCT,HasMove,TAUNT
 #-------------------------------
 [GRAPPLOCT]
 Name = Grapploct
@@ -21975,7 +22003,7 @@ Shape = Head
 Category = Black Tea
 Pokedex = The teacup in which this Pokémon makes its home is a famous piece of antique tableware. Many forgeries are in circulation.
 Generation = 8
-Evolutions = POLTEAGEIST,Item,CRACKEDPOT
+Evolution = POLTEAGEIST,Item,CRACKEDPOT
 #-------------------------------
 [POLTEAGEIST]
 Name = Polteageist
@@ -22026,7 +22054,7 @@ Shape = HeadLegs
 Category = Calm
 Pokedex = Via the protrusion on its head, it senses other creatures' emotions. If you don't have a calm disposition, it will never warm up to you.
 Generation = 8
-Evolutions = HATTREM,Level,32
+Evolution = HATTREM,Level,32
 #-------------------------------
 [HATTREM]
 Name = Hattrem
@@ -22051,7 +22079,7 @@ Shape = Bipedal
 Category = Serene
 Pokedex = Using the braids on its head, it pummels foes to get them to quiet down. One blow from those braids would knock out a professional boxer.
 Generation = 8
-Evolutions = HATTERENE,Level,42
+Evolution = HATTERENE,Level,42
 #-------------------------------
 [HATTERENE]
 Name = Hatterene
@@ -22100,7 +22128,7 @@ Shape = Bipedal
 Category = Wily
 Pokedex = Through its nose, it sucks in the emanations produced by people and Pokémon when they feel annoyed. It thrives off this negative energy.
 Generation = 8
-Evolutions = MORGREM,Level,32
+Evolution = MORGREM,Level,32
 #-------------------------------
 [MORGREM]
 Name = Morgrem
@@ -22125,7 +22153,7 @@ Shape = Bipedal
 Category = Devious
 Pokedex = With sly cunning, it tries to lure people into the woods. Some believe it to have the power to make crops grow.
 Generation = 8
-Evolutions = GRIMMSNARL,Level,42
+Evolution = GRIMMSNARL,Level,42
 #-------------------------------
 [GRIMMSNARL]
 Name = Grimmsnarl
@@ -22331,7 +22359,13 @@ Shape = Head
 Category = Cream
 Pokedex = This Pokémon was born from sweet-smelling particles in the air. Its body is made of cream.
 Generation = 8
-Evolutions = ALCREMIE,HoldItem,STRAWBERRYSWEET,ALCREMIE,HoldItem,BERRYSWEET,ALCREMIE,HoldItem,LOVESWEET,ALCREMIE,HoldItem,STARSWEET,ALCREMIE,HoldItem,CLOVERSWEET,ALCREMIE,HoldItem,FLOWERSWEET,ALCREMIE,HoldItem,RIBBONSWEET
+Evolution = ALCREMIE,HoldItem,STRAWBERRYSWEET
+Evolution = ALCREMIE,HoldItem,BERRYSWEET
+Evolution = ALCREMIE,HoldItem,LOVESWEET
+Evolution = ALCREMIE,HoldItem,STARSWEET
+Evolution = ALCREMIE,HoldItem,CLOVERSWEET
+Evolution = ALCREMIE,HoldItem,FLOWERSWEET
+Evolution = ALCREMIE,HoldItem,RIBBONSWEET
 #-------------------------------
 [ALCREMIE]
 Name = Alcremie
@@ -22432,7 +22466,7 @@ Category = Worm
 Pokedex = It spits out thread imbued with a frigid sort of energy and uses it to tie its body to branches, disguising itself as an icicle while it sleeps.
 Generation = 8
 WildItemUncommon = SNOWBALL
-Evolutions = FROSMOTH,HappinessNight,
+Evolution = FROSMOTH,HappinessNight
 #-------------------------------
 [FROSMOTH]
 Name = Frosmoth
@@ -22583,7 +22617,7 @@ Category = Copperderm
 Pokedex = It digs up the ground with its trunk. It's also very strong, being able to carry loads of over five tons without any problem at all.
 Generation = 8
 WildItemUncommon = LAGGINGTAIL
-Evolutions = COPPERAJAH,Level,34
+Evolution = COPPERAJAH,Level,34
 #-------------------------------
 [COPPERAJAH]
 Name = Copperajah
@@ -22755,7 +22789,7 @@ Shape = Serpentine
 Category = Lingering
 Pokedex = After being reborn as a ghost Pokémon, Dreepy wanders the areas it used to inhabit back when it was alive in prehistoric seas.
 Generation = 8
-Evolutions = DRAKLOAK,Level,50
+Evolution = DRAKLOAK,Level,50
 #-------------------------------
 [DRAKLOAK]
 Name = Drakloak
@@ -22780,7 +22814,7 @@ Shape = HeadArms
 Category = Caretaker
 Pokedex = It's capable of flying faster than 120 mph. It battles alongside Dreepy and dotes on them until they successfully evolve.
 Generation = 8
-Evolutions = DRAGAPULT,Level,60
+Evolution = DRAGAPULT,Level,60
 #-------------------------------
 [DRAGAPULT]
 Name = Dragapult
@@ -22909,7 +22943,7 @@ Category = Wushu
 Pokedex = Kubfu trains hard to perfect its moves. The moves it masters will determine which form it takes when it evolves.
 Generation = 8
 Flags = Legendary
-Evolutions = URSHIFU,Event,1
+Evolution = URSHIFU,Event,1
 #-------------------------------
 [URSHIFU]
 Name = Urshifu
diff --git a/PBS/Gen 8 backup/pokemon_forms.txt b/PBS/Gen 8 backup/pokemon_forms.txt
index 5865b9713..08ae264e4 100644
--- a/PBS/Gen 8 backup/pokemon_forms.txt	
+++ b/PBS/Gen 8 backup/pokemon_forms.txt	
@@ -82,9 +82,9 @@ Weight = 3.8
 Color = Black
 Pokedex = With its incisors, it gnaws through doors and infiltrates people's homes. Then, with a twitch of its whiskers, it steals whatever food it finds.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = PECHABERRY
-Evolutions = RATICATE,LevelNight,20
+Evolution = RATICATE,LevelNight,20
 #-------------------------------
 [RATICATE,1]
 FormName = Alolan
@@ -97,7 +97,7 @@ Weight = 25.5
 Color = Black
 Pokedex = It forms a group of Rattata, which it assumes command of. Each group has its own territory, and disputes over food happen often.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = PECHABERRY
 #-------------------------------
 [RAICHU,1]
@@ -128,8 +128,8 @@ Weight = 40.0
 Color = White
 Pokedex = The skin on its back is as hard as steel. Predators go after its soft belly, so it clings to the ground desperately.
 Generation = 7
-Flags = InheritFormWithEverStone
-Evolutions = SANDSLASH,Item,ICESTONE
+Flags = InheritFormWithEverstone
+Evolution = SANDSLASH,Item,ICESTONE
 #-------------------------------
 [SANDSLASH,1]
 FormName = Alolan
@@ -144,7 +144,7 @@ Weight = 55.0
 Color = Blue
 Pokedex = It runs across snow-covered plains at high speeds. It developed thick, sharp claws to plow through the snow.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [VULPIX,1]
 FormName = Alolan
@@ -157,9 +157,9 @@ EggMoves = AGILITY,CHARM,DISABLE,ENCORE,EXTRASENSORY,FLAIL,FREEZEDRY,HOWL,HYPNOS
 Color = White
 Pokedex = In hot weather, this Pokémon makes ice shards with its six tails and sprays them around to cool itself off.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = SNOWBALL
-Evolutions = NINETALES,Item,ICESTONE
+Evolution = NINETALES,Item,ICESTONE
 #-------------------------------
 [NINETALES,1]
 FormName = Alolan
@@ -173,7 +173,7 @@ TutorMoves = AGILITY,AQUATAIL,ATTRACT,AURORAVEIL,AVALANCHE,BLIZZARD,BODYSLAM,CAL
 Color = Blue
 Pokedex = It lives on mountains perpetually covered in snow and is revered as a deity incarnate. It appears draped in a blizzard.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = SNOWBALL
 #-------------------------------
 [DIGLETT,1]
@@ -187,7 +187,7 @@ EggMoves = ANCIENTPOWER,BEATUP,ENDURE,FEINTATTACK,FINALGAMBIT,HEADBUTT,MEMENTO,M
 Weight = 1.0
 Pokedex = Its head sports an altered form of whiskers made of metal. When in communication with its comrades, its whiskers wobble to and fro.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [DUGTRIO,1]
 FormName = Alolan
@@ -200,7 +200,7 @@ TutorMoves = AERIALACE,AGILITY,ALLYSWITCH,ASSURANCE,ATTRACT,BEATUP,BODYSLAM,BULL
 Weight = 66.6
 Pokedex = Its shining gold hair provides it with protection. It's reputed that keeping any of its fallen hairs will bring bad luck.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [MEOWTH,1]
 FormName = Alolan
@@ -213,8 +213,8 @@ EggMoves = AMNESIA,ASSIST,CHARM,COVET,FLAIL,FLATTER,FOULPLAY,HYPNOSIS,PARTINGSHO
 Color = Blue
 Pokedex = It's impulsive, selfish, and fickle. It's very popular with some Trainers who like giving it the attention it needs.
 Generation = 7
-Flags = InheritFormWithEverStone
-Evolutions = PERSIAN,Happiness,
+Flags = InheritFormWithEverstone
+Evolution = PERSIAN,Happiness
 #-------------------------------
 [MEOWTH,2]
 FormName = Galarian
@@ -229,8 +229,8 @@ Color = Brown
 Shape = BipedalTail
 Pokedex = Living with a savage, seafaring people has toughened this Pokémon's body so much that parts of it have turned to iron.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = PERRSERKER,Level,28
+Flags = InheritFormWithEverstone
+Evolution = PERRSERKER,Level,28
 #-------------------------------
 [PERSIAN,1]
 FormName = Alolan
@@ -245,7 +245,7 @@ Weight = 33.0
 Color = Blue
 Pokedex = Its round face is a symbol of wealth. Persian that have bigger, plumper faces are considered more beautiful.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [ALAKAZAM,1]
 FormName = Mega Alakazam
@@ -270,7 +270,7 @@ Weight = 20.3
 Color = Gray
 Pokedex = Geodude compete against each other with headbutts. The iron sand on their heads will stick to whichever one has stronger magnetism.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GRAVELER,1]
@@ -284,7 +284,7 @@ Weight = 110.0
 Color = Gray
 Pokedex = They eat rocks and often get into a scrap over them. The shock of Graveler smashing together causes a flash of light and a booming noise.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GOLEM,1]
@@ -299,7 +299,7 @@ Weight = 316.0
 Color = Gray
 Pokedex = It fires rocks charged with electricity. Even if the rock isn't fired that accurately, just grazing an opponent will cause numbness and fainting.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemCommon = CELLBATTERY
 #-------------------------------
 [PONYTA,1]
@@ -315,7 +315,7 @@ Color = White
 Category = Unique Horn
 Pokedex = Its small horn hides a healing power. With a few rubs from this Pokémon's horn, any slight wound you have will be healed.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [RAPIDASH,1]
 FormName = Galarian
@@ -329,7 +329,7 @@ Color = White
 Category = Unique Horn
 Pokedex = Little can stand up to its psycho cut. Unleashed from this Pokémon's horn, the move will punch a hole right through a thick metal sheet.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [SLOWPOKE,1]
 FormName = Galarian
@@ -339,8 +339,9 @@ Moves = 1,TACKLE,1,CURSE,3,GROWL,6,ACID,9,YAWN,12,CONFUSION,15,DISABLE,18,WATERP
 TutorMoves = AMNESIA,ATTRACT,BLIZZARD,BODYSLAM,BRINE,BULLDOZE,CALMMIND,CAPTIVATE,CONFIDE,DIG,DIVE,DOUBLEEDGE,DOUBLETEAM,EARTHQUAKE,ENDURE,EXPANDINGFORCE,FACADE,FIREBLAST,FLAMETHROWER,FOULPLAY,FRUSTRATION,FUTURESIGHT,GRASSKNOT,HAIL,HIDDENPOWER,HYDROPUMP,ICEBEAM,ICYWIND,IMPRISON,IRONTAIL,LIGHTSCREEN,LIQUIDATION,MIMIC,MUDSHOT,NATURALGIFT,PAYDAY,PROTECT,PSYCHIC,PSYCHICTERRAIN,PSYSHOCK,RAINDANCE,REST,RETURN,ROUND,SAFEGUARD,SCALD,SECRETPOWER,SHADOWBALL,SKILLSWAP,SLEEPTALK,SNORE,STOREDPOWER,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWIFT,THUNDERWAVE,TRIATTACK,TRICK,TRICKROOM,WEATHERBALL,WHIRLPOOL,WONDERROOM,ZENHEADBUTT
 Pokedex = Although this Pokémon is normally zoned out, its expression abruptly sharpens on occasion. The cause for this seems to lie in Slowpoke's diet.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = SLOWBRO,Item,GALARICACUFF,SLOWKING,Item,GALARICAWREATH
+Flags = InheritFormWithEverstone
+Evolution = SLOWBRO,Item,GALARICACUFF
+Evolution = SLOWKING,Item,GALARICAWREATH
 #-------------------------------
 [SLOWBRO,1]
 FormName = Galarian
@@ -352,7 +353,7 @@ TutorMoves = AMNESIA,ATTRACT,AVALANCHE,BLIZZARD,BODYSLAM,BRICKBREAK,BRINE,BRUTAL
 Weight = 70.5
 Pokedex = If this Pokémon squeezes the tongue of the Shellder biting it, the Shellder will launch a toxic liquid from the tip of its shell.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [SLOWBRO,2]
 FormName = Mega Slowbro
@@ -379,9 +380,9 @@ EggMoves = COUNTER,COVET,CURSE,DOUBLEEDGE,FEINT,FLAIL,NIGHTSLASH,QUICKATTACK,QUI
 Weight = 42.0
 Pokedex = The stalks of leeks are thicker and longer in the Galar region. Farfetch'd that adapted to these stalks took on a unique form.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemCommon = LEEK
-Evolutions = SIRFETCHD,BattleDealCriticalHit,3
+Evolution = SIRFETCHD,BattleDealCriticalHit,3
 #-------------------------------
 [GRIMER,1]
 FormName = Alolan
@@ -396,7 +397,7 @@ Weight = 42.0
 Color = Green
 Pokedex = A Grimer, which had been brought in to solve a problem with garbage, developed over time into this form.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [MUK,1]
 FormName = Alolan
@@ -410,7 +411,7 @@ Weight = 52.0
 Color = Green
 Pokedex = The garbage it eats causes continuous chemical changes in its body, which produce its exceedingly vivid coloration.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [GENGAR,1]
 FormName = Mega Gengar
@@ -437,7 +438,7 @@ Generation = 7
 #-------------------------------
 [CUBONE,1]
 Generation = 7
-Evolutions = MAROWAK,LevelNight,28
+Evolution = MAROWAK,LevelNight,28
 #-------------------------------
 [MAROWAK,1]
 FormName = Alolan
@@ -490,8 +491,8 @@ Color = White
 Category = Dancing
 Pokedex = Its talent is tap-dancing. It can also manipulate temperatures to create a floor of ice, which this Pokémon can kick up to use as a barrier.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = MRRIME,Level,42
+Flags = InheritFormWithEverstone
+Evolution = MRRIME,Level,42
 #-------------------------------
 [PINSIR,1]
 FormName = Mega Pinsir
@@ -603,7 +604,7 @@ Generation = 6
 [PICHU,2]
 FormName = Spiky-Eared
 Generation = 4
-Evolutions = PIKACHU,None,
+Evolution = PIKACHU,None
 #-------------------------------
 [AMPHAROS,1]
 FormName = Mega Ampharos
@@ -627,7 +628,7 @@ Height = 1.8
 Category = Hexpert
 Pokedex = While chanting strange spells, this Pokémon combines its internal toxins with what it's eaten, creating strange potions.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [UNOWN,1]
 FormName = B
@@ -760,8 +761,8 @@ Weight = 0.5
 Color = White
 Pokedex = Sudden climate change wiped out this ancient kind of Corsola. This Pokémon absorbs others' life-force through its branches.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = CURSOLA,Level,38
+Flags = InheritFormWithEverstone
+Evolution = CURSOLA,Level,38
 #-------------------------------
 [HOUNDOOM,1]
 FormName = Mega Houndoom
@@ -826,7 +827,7 @@ EggMoves = KNOCKOFF,PARTINGSHOT,QUICKGUARD
 Color = White
 Pokedex = Its restlessness has it constantly running around. If it sees another Pokémon, it will purposely run into them in order to start a fight.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [LINOONE,1]
 FormName = Galarian
@@ -835,8 +836,8 @@ Moves = 0,NIGHTSLASH,1,SWITCHEROO,1,PINMISSILE,1,BABYDOLLEYES,1,TACKLE,1,LEER,1,
 TutorMoves = ASSURANCE,ATTRACT,BLIZZARD,BODYPRESS,BODYSLAM,CAPTIVATE,CONFIDE,DIG,DOUBLEEDGE,DOUBLETEAM,ENDURE,FACADE,FAKETEARS,FLING,FRUSTRATION,GIGAIMPACT,GRASSKNOT,GUNKSHOT,HELPINGHAND,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONTAIL,LASHOUT,MIMIC,MUDSHOT,NATURALGIFT,PAYBACK,PINMISSILE,PROTECT,RAINDANCE,REST,RETALIATE,RETURN,ROUND,SCARYFACE,SCREECH,SECRETPOWER,SEEDBOMB,SHADOWBALL,SHADOWCLAW,SLEEPTALK,SNARL,SNORE,STOMPINGTANTRUM,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,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.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = OBSTAGOON,LevelNight,35
+Flags = InheritFormWithEverstone
+Evolution = OBSTAGOON,LevelNight,35
 #-------------------------------
 [GARDEVOIR,1]
 FormName = Mega Gardevoir
@@ -1339,8 +1340,8 @@ Weight = 40.0
 Color = White
 Pokedex = The colder they get, the more energetic they are. They freeze their breath to make snowballs, using them as ammo for playful snowball fights.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = DARMANITAN,Item,ICESTONE
+Flags = InheritFormWithEverstone
+Evolution = DARMANITAN,Item,ICESTONE
 #-------------------------------
 [DARMANITAN,1]
 FormName = Zen Mode
@@ -1363,7 +1364,7 @@ Color = White
 Category = Zen Charm
 Pokedex = On days when blizzards blow through, it comes down to where people live. It stashes food in the snowball on its head, taking it home for later.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [DARMANITAN,3]
 FormName = Galarian Zen Mode
@@ -1390,8 +1391,8 @@ Moves = 1,ASTONISH,1,PROTECT,4,HAZE,8,NIGHTSHADE,12,DISABLE,16,BRUTALSWING,20,CR
 TutorMoves = ALLYSWITCH,ATTRACT,BRUTALSWING,CALMMIND,CAPTIVATE,CONFIDE,DARKPULSE,DOUBLEEDGE,DOUBLETEAM,EARTHPOWER,EARTHQUAKE,ENDURE,ENERGYBALL,FACADE,FAKETEARS,FRUSTRATION,HEX,HIDDENPOWER,IMPRISON,IRONDEFENSE,MIMIC,NASTYPLOT,NATURALGIFT,PAYBACK,POLTERGEIST,PROTECT,PSYCHIC,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SECRETPOWER,SHADOWBALL,SKILLSWAP,SLEEPTALK,SNORE,SUBSTITUTE,SWAGGER,THIEF,TOXIC,TOXICSPIKES,TRICK,TRICKROOM,WILLOWISP,WONDERROOM,ZENHEADBUTT
 Pokedex = A clay slab with cursed engravings took possession of a Yamask. The slab is said to be absorbing the Yamask's dark power.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = RUNERIGUS,EventAfterDamageTaken,2
+Flags = InheritFormWithEverstone
+Evolution = RUNERIGUS,EventAfterDamageTaken,2
 #-------------------------------
 [DEERLING,1]
 FormName = Summer Form
@@ -1427,7 +1428,7 @@ Weight = 20.5
 Color = Green
 Pokedex = Its conspicuous lips lure prey in as it lies in wait in the mud. When prey gets close, Stunfisk clamps its jagged steel fins down on them.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [TORNADUS,1]
 FormName = Therian Forme
@@ -1617,7 +1618,7 @@ BaseExp = 243
 Moves = 1,TACKLE,1,VINEWHIP,1,FAIRYWIND,6,FAIRYWIND,10,LUCKYCHANT,15,RAZORLEAF,20,WISH,25,MAGICALLEAF,27,GRASSYTERRAIN,33,PETALBLIZZARD,38,AROMATHERAPY,43,MISTYTERRAIN,46,MOONBLAST,50,LIGHTOFRUIN,51,PETALDANCE,58,SOLARBEAM
 EggGroups = Undiscovered
 Pokedex = The flower it's holding can no longer be found blooming anywhere. It's also thought to contain terrifying power.
-Evolutions = FLORGES,None,
+Evolution = FLORGES,None
 #-------------------------------
 [FLORGES,1]
 FormName = Yellow Flower
@@ -1803,7 +1804,7 @@ Pokedex = It summons the dead with its dreamy dancing. From their malice, it dra
 Abilities = OWNTEMPO
 HiddenAbilities = OWNTEMPO
 Flags = InheritFormFromMother
-Evolutions = LYCANROC,LevelEvening,25
+Evolution = LYCANROC,LevelEvening,25
 #-------------------------------
 [LYCANROC,1]
 FormName = Midnight Form
@@ -2049,7 +2050,7 @@ Pokedex = Capable of generating 15,000 volts of electricity, this Pokémon looks
 [SINISTEA,1]
 FormName = Antique Form
 Pokedex = The swirl pattern in this Pokémon's body is its weakness. If it gets stirred, the swirl loses its shape, and Sinistea gets dizzy.
-Evolutions = POLTEAGEIST,Item,CHIPPEDPOT
+Evolution = POLTEAGEIST,Item,CHIPPEDPOT
 #-------------------------------
 [POLTEAGEIST,1]
 FormName = Antique Form
diff --git a/PBS/items.txt b/PBS/items.txt
index fb9f93285..f0d40d5e1 100644
--- a/PBS/items.txt
+++ b/PBS/items.txt
@@ -523,7 +523,7 @@ Name = Big Nugget
 NamePlural = Big Nuggets
 Pocket = 1
 Price = 40000
-Flags = Fling_30
+Flags = Fling_130
 Description = A big nugget of pure gold that gives off a lustrous gleam. A maniac will buy it for a high price.
 #-------------------------------
 [HEARTSCALE]
diff --git a/PBS/moves.txt b/PBS/moves.txt
index 0ee30413b..fa5dbaf27 100644
--- a/PBS/moves.txt
+++ b/PBS/moves.txt
@@ -479,7 +479,7 @@ Accuracy = 100
 TotalPP = 5
 Target = NearOther
 FunctionCode = AlwaysCriticalHit
-Flags = Contact,CanProtect,CanMirrorMove,CannotMetronome
+Flags = Contact,CanProtect,CanMirrorMove,Punching,CannotMetronome
 Description = Strikes with a fierce blow through mastery of the Dark style. Always results in a critical hit.
 #-------------------------------
 [LASHOUT]
@@ -8633,7 +8633,7 @@ Accuracy = 100
 TotalPP = 5
 Target = NearOther
 FunctionCode = HitThreeTimesAlwaysCriticalHit
-Flags = Contact,CanProtect,CanMirrorMove,CannotMetronome
+Flags = Contact,CanProtect,CanMirrorMove,Punching,CannotMetronome
 Description = Hits three times in a row with mastery of the Water style. This attack always deals critical hits.
 #-------------------------------
 [WATERSHURIKEN]
diff --git a/PBS/pokemon.txt b/PBS/pokemon.txt
index 451a11c0b..39aa345a4 100644
--- a/PBS/pokemon.txt
+++ b/PBS/pokemon.txt
@@ -25,7 +25,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = Bulbasaur can be seen napping in bright sunlight. There is a seed on its back. By soaking up the sun's rays, the seed grows progressively larger.
 Generation = 1
-Evolutions = IVYSAUR,Level,16
+Evolution = IVYSAUR,Level,16
 #-------------------------------
 [IVYSAUR]
 Name = Ivysaur
@@ -51,7 +51,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = To support its bulb, Ivysaur's legs grow sturdy. If it spends more time lying in the sunlight, the bud will soon bloom into a large flower.
 Generation = 1
-Evolutions = VENUSAUR,Level,32
+Evolution = VENUSAUR,Level,32
 #-------------------------------
 [VENUSAUR]
 Name = Venusaur
@@ -103,7 +103,7 @@ Habitat = Mountain
 Category = Lizard
 Pokedex = The flame that burns at the tip of its tail is an indication of its emotions. The flame wavers when Charmander is happy, and blazes when it is enraged.
 Generation = 1
-Evolutions = CHARMELEON,Level,16
+Evolution = CHARMELEON,Level,16
 #-------------------------------
 [CHARMELEON]
 Name = Charmeleon
@@ -129,7 +129,7 @@ Habitat = Mountain
 Category = Flame
 Pokedex = Without pity, its sharp claws destroy foes. If it encounters a strong enemy, it becomes agitated, and the flame on its tail flares with a bluish white color.
 Generation = 1
-Evolutions = CHARIZARD,Level,36
+Evolution = CHARIZARD,Level,36
 #-------------------------------
 [CHARIZARD]
 Name = Charizard
@@ -181,7 +181,7 @@ Habitat = WatersEdge
 Category = Tiny Turtle
 Pokedex = Its shell is not just for protection. Its rounded shape and the grooves on its surface minimize resistance in water, enabling Squirtle to swim at high speeds.
 Generation = 1
-Evolutions = WARTORTLE,Level,16
+Evolution = WARTORTLE,Level,16
 #-------------------------------
 [WARTORTLE]
 Name = Wartortle
@@ -207,7 +207,7 @@ Habitat = WatersEdge
 Category = Turtle
 Pokedex = Its large tail is covered with rich, thick fur that deepens in color with age. The scratches on its shell are evidence of this Pokémon's toughness in battle.
 Generation = 1
-Evolutions = BLASTOISE,Level,36
+Evolution = BLASTOISE,Level,36
 #-------------------------------
 [BLASTOISE]
 Name = Blastoise
@@ -258,7 +258,7 @@ Habitat = Forest
 Category = Worm
 Pokedex = Its voracious appetite compels it to devour leaves bigger than itself without hesitation. It releases a terribly strong odor from its antennae.
 Generation = 1
-Evolutions = METAPOD,Level,7
+Evolution = METAPOD,Level,7
 #-------------------------------
 [METAPOD]
 Name = Metapod
@@ -283,7 +283,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = Its shell is as hard as an iron slab. A Metapod does not move very much because it is preparing its soft innards for evolution inside the shell.
 Generation = 1
-Evolutions = BUTTERFREE,Level,10
+Evolution = BUTTERFREE,Level,10
 #-------------------------------
 [BUTTERFREE]
 Name = Butterfree
@@ -335,7 +335,7 @@ Habitat = Forest
 Category = Hairy Bug
 Pokedex = A Weedle has an extremely acute sense of smell. It distinguishes its favorite kinds of leaves from those it dislikes by sniffing with its big red proboscis (nose).
 Generation = 1
-Evolutions = KAKUNA,Level,7
+Evolution = KAKUNA,Level,7
 #-------------------------------
 [KAKUNA]
 Name = Kakuna
@@ -360,7 +360,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = It remains virtually immobile while it clings to a tree. However, on the inside, it busily prepares for evolution. This is evident from how hot its shell becomes.
 Generation = 1
-Evolutions = BEEDRILL,Level,10
+Evolution = BEEDRILL,Level,10
 #-------------------------------
 [BEEDRILL]
 Name = Beedrill
@@ -413,7 +413,7 @@ Habitat = Forest
 Category = Tiny Bird
 Pokedex = It has an extremely sharp sense of direction. It can unerringly return home to its nest, however far it may be removed from its familiar surroundings.
 Generation = 1
-Evolutions = PIDGEOTTO,Level,18
+Evolution = PIDGEOTTO,Level,18
 #-------------------------------
 [PIDGEOTTO]
 Name = Pidgeotto
@@ -439,7 +439,7 @@ Habitat = Forest
 Category = Bird
 Pokedex = This Pokémon flies around, patrolling its large territory. If its living space is violated, it shows no mercy in thoroughly punishing the foe with its sharp claws.
 Generation = 1
-Evolutions = PIDGEOT,Level,36
+Evolution = PIDGEOT,Level,36
 #-------------------------------
 [PIDGEOT]
 Name = Pidgeot
@@ -492,7 +492,7 @@ Category = Mouse
 Pokedex = A Rattata is cautious in the extreme. Even while it is asleep, it constantly moves its ears and listens for danger. It will make its nest anywhere.
 Generation = 1
 WildItemUncommon = CHILANBERRY
-Evolutions = RATICATE,Level,20
+Evolution = RATICATE,Level,20
 #-------------------------------
 [RATICATE]
 Name = Raticate
@@ -546,7 +546,7 @@ Category = Tiny Bird
 Pokedex = Its loud cry can be heard over half a mile away. If its high, keening cry is heard echoing all around, it is a sign that they are warning each other of danger.
 Generation = 1
 WildItemUncommon = SHARPBEAK
-Evolutions = FEAROW,Level,20
+Evolution = FEAROW,Level,20
 #-------------------------------
 [FEAROW]
 Name = Fearow
@@ -599,7 +599,7 @@ Habitat = Grassland
 Category = Snake
 Pokedex = An Ekans curls itself up in a spiral while it rests. This position allows it to quickly respond to an enemy from any direction with a threat from its upraised head.
 Generation = 1
-Evolutions = ARBOK,Level,22
+Evolution = ARBOK,Level,22
 #-------------------------------
 [ARBOK]
 Name = Arbok
@@ -651,7 +651,7 @@ Category = Mouse
 Pokedex = It stores electricity in the electric sacs on its cheeks. When it releases pent-up energy in a burst, the electric power is equal to a lightning bolt.
 Generation = 1
 WildItemUncommon = LIGHTBALL
-Evolutions = RAICHU,Item,THUNDERSTONE
+Evolution = RAICHU,Item,THUNDERSTONE
 #-------------------------------
 [RAICHU]
 Name = Raichu
@@ -704,7 +704,7 @@ Category = Mouse
 Pokedex = When it curls up in a ball, it can make any attack bounce off harmlessly. Its hide has turned tough and solid as a result of living in the desert.
 Generation = 1
 WildItemUncommon = GRIPCLAW
-Evolutions = SANDSLASH,Level,22
+Evolution = SANDSLASH,Level,22
 #-------------------------------
 [SANDSLASH]
 Name = Sandslash
@@ -758,7 +758,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = Its highly toxic barbs are thought to have developed as protection for this small-bodied Pokémon. When enraged, it releases a horrible toxin from its horn.
 Generation = 1
-Evolutions = NIDORINA,Level,16
+Evolution = NIDORINA,Level,16
 #-------------------------------
 [NIDORINA]
 Name = Nidorina
@@ -784,7 +784,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = When it is with its friends or family, its barbs are tucked away to prevent injury. It appears to become nervous if separated from the others.
 Generation = 1
-Evolutions = NIDOQUEEN,Item,MOONSTONE
+Evolution = NIDOQUEEN,Item,MOONSTONE
 #-------------------------------
 [NIDOQUEEN]
 Name = Nidoqueen
@@ -837,7 +837,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = The male Nidoran has developed muscles that freely move its ears in any direction. Even the slightest sound does not escape this Pokémon's notice.
 Generation = 1
-Evolutions = NIDORINO,Level,16
+Evolution = NIDORINO,Level,16
 #-------------------------------
 [NIDORINO]
 Name = Nidorino
@@ -863,7 +863,7 @@ Habitat = Grassland
 Category = Poison Pin
 Pokedex = Its horn is harder than a diamond. If it senses a hostile presence, all the barbs on its back bristle up at once, and it challenges the foe with all its might.
 Generation = 1
-Evolutions = NIDOKING,Item,MOONSTONE
+Evolution = NIDOKING,Item,MOONSTONE
 #-------------------------------
 [NIDOKING]
 Name = Nidoking
@@ -915,7 +915,7 @@ Category = Fairy
 Pokedex = On every night of a full moon, they come out to play. When dawn arrives, the tired Clefairy go to sleep nestled up against each other in deep and quiet mountains.
 Generation = 1
 WildItemUncommon = MOONSTONE
-Evolutions = CLEFABLE,Item,MOONSTONE
+Evolution = CLEFABLE,Item,MOONSTONE
 #-------------------------------
 [CLEFABLE]
 Name = Clefable
@@ -969,7 +969,7 @@ Category = Fox
 Pokedex = It can freely control fire, making fiery orbs fly like will-o'-the-wisps. Just before evolution, its six tails grow hot as if on fire.
 Generation = 1
 WildItemUncommon = CHARCOAL
-Evolutions = NINETALES,Item,FIRESTONE
+Evolution = NINETALES,Item,FIRESTONE
 #-------------------------------
 [NINETALES]
 Name = Ninetales
@@ -1022,7 +1022,7 @@ Category = Balloon
 Pokedex = Nothing can avoid falling asleep hearing a Jigglypuff's song. The sound waves of its singing voice match the brain waves of someone in a deep sleep.
 Generation = 1
 WildItemUncommon = MOONSTONE
-Evolutions = WIGGLYTUFF,Item,MOONSTONE
+Evolution = WIGGLYTUFF,Item,MOONSTONE
 #-------------------------------
 [WIGGLYTUFF]
 Name = Wigglytuff
@@ -1075,7 +1075,7 @@ Habitat = Cave
 Category = Bat
 Pokedex = While living in pitch-black caverns, their eyes gradually grew shut and deprived them of vision. They use ultrasonic waves to detect obstacles.
 Generation = 1
-Evolutions = GOLBAT,Level,22
+Evolution = GOLBAT,Level,22
 #-------------------------------
 [GOLBAT]
 Name = Golbat
@@ -1101,7 +1101,7 @@ Habitat = Cave
 Category = Bat
 Pokedex = Its fangs easily puncture even thick animal hide. It loves to feast on the blood of people and Pokémon. It flits about in darkness and strikes from behind.
 Generation = 1
-Evolutions = CROBAT,Happiness,
+Evolution = CROBAT,Happiness
 #-------------------------------
 [ODDISH]
 Name = Oddish
@@ -1129,7 +1129,7 @@ Category = Weed
 Pokedex = It grows by absorbing moonlight. During the daytime, it buries itself in the ground, leaving only its leaves exposed to avoid detection by its enemies.
 Generation = 1
 WildItemUncommon = ABSORBBULB
-Evolutions = GLOOM,Level,21
+Evolution = GLOOM,Level,21
 #-------------------------------
 [GLOOM]
 Name = Gloom
@@ -1156,7 +1156,8 @@ Category = Weed
 Pokedex = A horribly noxious honey drools from its mouth. One whiff of the honey can result in memory loss. Some fans are said to enjoy this overwhelming stink, however.
 Generation = 1
 WildItemUncommon = ABSORBBULB
-Evolutions = VILEPLUME,Item,LEAFSTONE,BELLOSSOM,Item,SUNSTONE
+Evolution = VILEPLUME,Item,LEAFSTONE
+Evolution = BELLOSSOM,Item,SUNSTONE
 #-------------------------------
 [VILEPLUME]
 Name = Vileplume
@@ -1211,7 +1212,7 @@ Pokedex = A Paras has parasitic tochukaso mushrooms growing on its back. They gr
 Generation = 1
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = PARASECT,Level,24
+Evolution = PARASECT,Level,24
 #-------------------------------
 [PARASECT]
 Name = Parasect
@@ -1265,7 +1266,7 @@ Habitat = Forest
 Category = Insect
 Pokedex = Its coat of thin, stiff hair that covers its entire body is said to have evolved for protection. Its large eyes never fail to spot even miniscule prey.
 Generation = 1
-Evolutions = VENOMOTH,Level,31
+Evolution = VENOMOTH,Level,31
 #-------------------------------
 [VENOMOTH]
 Name = Venomoth
@@ -1319,7 +1320,7 @@ Category = Mole
 Pokedex = Diglett are raised in most farms. The reason is simple--wherever they burrow, the soil is left perfectly tilled for growing delicious crops.
 Generation = 1
 WildItemUncommon = SOFTSAND
-Evolutions = DUGTRIO,Level,26
+Evolution = DUGTRIO,Level,26
 #-------------------------------
 [DUGTRIO]
 Name = Dugtrio
@@ -1373,7 +1374,8 @@ Category = Scratch Cat
 Pokedex = Meowth withdraw their sharp claws into their paws to silently sneak about. For some reason, this Pokémon loves shiny coins that glitter with light.
 Generation = 1
 WildItemUncommon = QUICKCLAW
-Evolutions = PERSIAN,Level,28,PERRSERKER,None,
+Evolution = PERSIAN,Level,28
+Evolution = PERRSERKER,None
 #-------------------------------
 [PERSIAN]
 Name = Persian
@@ -1426,7 +1428,7 @@ Habitat = WatersEdge
 Category = Duck
 Pokedex = When its headache intensifies, it starts using strange powers. However, it has no recollection of its powers, so it always looks befuddled and bewildered.
 Generation = 1
-Evolutions = GOLDUCK,Level,33
+Evolution = GOLDUCK,Level,33
 #-------------------------------
 [GOLDUCK]
 Name = Golduck
@@ -1478,7 +1480,7 @@ Habitat = Mountain
 Category = Pig Monkey
 Pokedex = When it starts shaking and its nasal breathing turns rough, it's a sure sign of anger. However, since this happens instantly, there is no time to flee.
 Generation = 1
-Evolutions = PRIMEAPE,Level,28
+Evolution = PRIMEAPE,Level,28
 #-------------------------------
 [PRIMEAPE]
 Name = Primeape
@@ -1530,7 +1532,7 @@ Habitat = Grassland
 Category = Puppy
 Pokedex = Its superb sense of smell ensures that this Pokémon won't forget any scent, no matter what. It uses its sense of smell to detect the emotions of others.
 Generation = 1
-Evolutions = ARCANINE,Item,FIRESTONE
+Evolution = ARCANINE,Item,FIRESTONE
 #-------------------------------
 [ARCANINE]
 Name = Arcanine
@@ -1582,7 +1584,7 @@ Habitat = WatersEdge
 Category = Tadpole
 Pokedex = It is possible to see this Pokémon's spiral innards right through its thin skin. However, the skin is also very flexible. Even sharp fangs bounce right off it.
 Generation = 1
-Evolutions = POLIWHIRL,Level,25
+Evolution = POLIWHIRL,Level,25
 #-------------------------------
 [POLIWHIRL]
 Name = Poliwhirl
@@ -1609,7 +1611,8 @@ Category = Tadpole
 Pokedex = Its body surface is always wet and slick with an oily fluid. Because of this greasy covering, it can easily slip and slide out of the clutches of any enemy in battle.
 Generation = 1
 WildItemUncommon = KINGSROCK
-Evolutions = POLIWRATH,Item,WATERSTONE,POLITOED,TradeItem,KINGSROCK
+Evolution = POLIWRATH,Item,WATERSTONE
+Evolution = POLITOED,TradeItem,KINGSROCK
 #-------------------------------
 [POLIWRATH]
 Name = Poliwrath
@@ -1663,7 +1666,7 @@ Category = Psi
 Pokedex = A Pokémon that sleeps 18 hours a day. Observation revealed that it uses Teleport to change its location once every hour.
 Generation = 1
 WildItemUncommon = TWISTEDSPOON
-Evolutions = KADABRA,Level,16
+Evolution = KADABRA,Level,16
 #-------------------------------
 [KADABRA]
 Name = Kadabra
@@ -1690,7 +1693,7 @@ Category = Psi
 Pokedex = It is rumored that a boy with psychic abilities suddenly transformed into Kadabra while he was assisting research into extrasensory powers.
 Generation = 1
 WildItemUncommon = TWISTEDSPOON
-Evolutions = ALAKAZAM,Trade,
+Evolution = ALAKAZAM,Trade
 #-------------------------------
 [ALAKAZAM]
 Name = Alakazam
@@ -1744,7 +1747,7 @@ Category = Superpower
 Pokedex = It continually undertakes strenuous training to master all forms of martial arts. Its strength lets it easily hoist a sumo wrestler onto its shoulders.
 Generation = 1
 WildItemUncommon = FOCUSBAND
-Evolutions = MACHOKE,Level,28
+Evolution = MACHOKE,Level,28
 #-------------------------------
 [MACHOKE]
 Name = Machoke
@@ -1771,7 +1774,7 @@ Category = Superpower
 Pokedex = A belt is worn by a Machoke to keep its overwhelming power under control. Because it is so dangerous, no one has ever removed the belt.
 Generation = 1
 WildItemUncommon = FOCUSBAND
-Evolutions = MACHAMP,Trade,
+Evolution = MACHAMP,Trade
 #-------------------------------
 [MACHAMP]
 Name = Machamp
@@ -1824,7 +1827,7 @@ Habitat = Forest
 Category = Flower
 Pokedex = A Bellsprout's thin and flexible body lets it bend and sway to avoid any attack, however strong it may be. From its mouth, it leaks a fluid that melts even iron.
 Generation = 1
-Evolutions = WEEPINBELL,Level,21
+Evolution = WEEPINBELL,Level,21
 #-------------------------------
 [WEEPINBELL]
 Name = Weepinbell
@@ -1850,7 +1853,7 @@ Habitat = Forest
 Category = Flycatcher
 Pokedex = At night, a Weepinbell hangs on to a tree branch with its hooked rear and sleeps. If it moves around in its sleep, it may wake up to find itself on the ground.
 Generation = 1
-Evolutions = VICTREEBEL,Item,LEAFSTONE
+Evolution = VICTREEBEL,Item,LEAFSTONE
 #-------------------------------
 [VICTREEBEL]
 Name = Victreebel
@@ -1903,7 +1906,7 @@ Category = Jellyfish
 Pokedex = Its body is almost entirely composed of water. It ensnares its foe with its two long tentacles, then stabs with the poison stingers at their tips.
 Generation = 1
 WildItemUncommon = POISONBARB
-Evolutions = TENTACRUEL,Level,30
+Evolution = TENTACRUEL,Level,30
 #-------------------------------
 [TENTACRUEL]
 Name = Tentacruel
@@ -1957,7 +1960,7 @@ Category = Rock
 Pokedex = It climbs mountain paths using only the power of its arms. Because they look just like boulders lining paths, hikers may step on them without noticing.
 Generation = 1
 WildItemUncommon = EVERSTONE
-Evolutions = GRAVELER,Level,25
+Evolution = GRAVELER,Level,25
 #-------------------------------
 [GRAVELER]
 Name = Graveler
@@ -1984,7 +1987,7 @@ Category = Rock
 Pokedex = They descend from mountains by tumbling down steep slopes. They are so brutal, they smash aside obstructing trees and huge boulders with thunderous tackles.
 Generation = 1
 WildItemUncommon = EVERSTONE
-Evolutions = GOLEM,Trade,
+Evolution = GOLEM,Trade
 #-------------------------------
 [GOLEM]
 Name = Golem
@@ -2037,7 +2040,7 @@ Habitat = Grassland
 Category = Fire Horse
 Pokedex = A Ponyta is very weak at birth. It can barely stand up. Its legs become stronger as it stumbles and falls while trying to keep up with its parent.
 Generation = 1
-Evolutions = RAPIDASH,Level,40
+Evolution = RAPIDASH,Level,40
 #-------------------------------
 [RAPIDASH]
 Name = Rapidash
@@ -2090,7 +2093,8 @@ Category = Dopey
 Pokedex = It catches prey by dipping its tail in water at the side of a river. But it often forgets what it is doing and spends whole days just loafing at the water's edge.
 Generation = 1
 WildItemUncommon = LAGGINGTAIL
-Evolutions = SLOWBRO,Level,37,SLOWKING,TradeItem,KINGSROCK
+Evolution = SLOWBRO,Level,37
+Evolution = SLOWKING,TradeItem,KINGSROCK
 #-------------------------------
 [SLOWBRO]
 Name = Slowbro
@@ -2143,7 +2147,7 @@ Category = Magnet
 Pokedex = The units at its sides are extremely powerful magnets. They generate enough magnetism to draw in iron objects from over 300 feet away.
 Generation = 1
 WildItemUncommon = METALCOAT
-Evolutions = MAGNETON,Level,30
+Evolution = MAGNETON,Level,30
 #-------------------------------
 [MAGNETON]
 Name = Magneton
@@ -2170,7 +2174,8 @@ Category = Magnet
 Pokedex = It is actually three Magnemite linked by magnetism. It generates powerful radio waves that raise temperatures by 3.6 degrees F within a 3,300-foot radius.
 Generation = 1
 WildItemUncommon = METALCOAT
-Evolutions = MAGNEZONE,Item,THUNDERSTONE,MAGNEZONE,LocationFlag,Magnetic
+Evolution = MAGNEZONE,Item,THUNDERSTONE
+Evolution = MAGNEZONE,LocationFlag,Magnetic
 #-------------------------------
 [FARFETCHD]
 Name = Farfetch'd
@@ -2198,7 +2203,7 @@ Category = Wild Duck
 Pokedex = It is always seen with a stick from a plant. Apparently, there are good sticks and bad sticks. This Pokémon occasionally fights with others over choice sticks.
 Generation = 1
 WildItemUncommon = LEEK
-Evolutions = SIRFETCHD,None,
+Evolution = SIRFETCHD,None
 #-------------------------------
 [DODUO]
 Name = Doduo
@@ -2226,7 +2231,7 @@ Category = Twin Bird
 Pokedex = Even while eating or sleeping, one of the heads remains always vigilant for any sign of danger. When threatened, it flees at over 60 miles per hour.
 Generation = 1
 WildItemUncommon = SHARPBEAK
-Evolutions = DODRIO,Level,31
+Evolution = DODRIO,Level,31
 #-------------------------------
 [DODRIO]
 Name = Dodrio
@@ -2279,7 +2284,7 @@ Habitat = Sea
 Category = Sea Lion
 Pokedex = Seel hunt for prey in frigid, ice-covered seas. When it needs to breathe, it punches a hole through the ice with the sharply protruding section of its head.
 Generation = 1
-Evolutions = DEWGONG,Level,34
+Evolution = DEWGONG,Level,34
 #-------------------------------
 [DEWGONG]
 Name = Dewgong
@@ -2332,7 +2337,7 @@ Category = Sludge
 Pokedex = Born from polluted sludge in the sea, Grimer's favorite food is anything filthy. They feed on wastewater pumped out from factories.
 Generation = 1
 WildItemUncommon = BLACKSLUDGE
-Evolutions = MUK,Level,38
+Evolution = MUK,Level,38
 #-------------------------------
 [MUK]
 Name = Muk
@@ -2387,7 +2392,7 @@ Pokedex = At night, it burrows a hole in the seafloor with its broad tongue to m
 Generation = 1
 WildItemCommon = PEARL
 WildItemUncommon = BIGPEARL
-Evolutions = CLOYSTER,Item,WATERSTONE
+Evolution = CLOYSTER,Item,WATERSTONE
 #-------------------------------
 [CLOYSTER]
 Name = Cloyster
@@ -2440,7 +2445,7 @@ Habitat = Cave
 Category = Gas
 Pokedex = When exposed to a strong wind, a Gastly's gaseous body quickly dwindles away. They cluster under the eaves of houses to escape the ravages of wind.
 Generation = 1
-Evolutions = HAUNTER,Level,25
+Evolution = HAUNTER,Level,25
 #-------------------------------
 [HAUNTER]
 Name = Haunter
@@ -2465,7 +2470,7 @@ Habitat = Cave
 Category = Gas
 Pokedex = If a Haunter beckons you while it is floating in darkness, don't approach it. This Pokémon will try to lick you with its tongue and steal your life away.
 Generation = 1
-Evolutions = GENGAR,Trade,
+Evolution = GENGAR,Trade
 #-------------------------------
 [GENGAR]
 Name = Gengar
@@ -2516,7 +2521,7 @@ Habitat = Cave
 Category = Rock Snake
 Pokedex = There is a magnet in its brain that prevents an Onix from losing direction while tunneling. As it grows older, its body becomes steadily rounder and smoother.
 Generation = 1
-Evolutions = STEELIX,TradeItem,METALCOAT
+Evolution = STEELIX,TradeItem,METALCOAT
 #-------------------------------
 [DROWZEE]
 Name = Drowzee
@@ -2543,7 +2548,7 @@ Habitat = Grassland
 Category = Hypnosis
 Pokedex = If your nose becomes itchy while you are sleeping, it's a sure sign that a Drowzee is standing above your pillow and trying to eat your dream through your nostrils.
 Generation = 1
-Evolutions = HYPNO,Level,26
+Evolution = HYPNO,Level,26
 #-------------------------------
 [HYPNO]
 Name = Hypno
@@ -2595,7 +2600,7 @@ Habitat = WatersEdge
 Category = River Crab
 Pokedex = Krabby live in holes dug into beaches. On sandy shores with little in the way of food, they can be seen squabbling with each other over territory.
 Generation = 1
-Evolutions = KINGLER,Level,28
+Evolution = KINGLER,Level,28
 #-------------------------------
 [KINGLER]
 Name = Kingler
@@ -2646,7 +2651,7 @@ Habitat = Urban
 Category = Ball
 Pokedex = It bears an uncanny and unexplained resemblance to a Poké Ball. Because it explodes at the slightest shock, even veteran trainers treat it with caution.
 Generation = 1
-Evolutions = ELECTRODE,Level,30
+Evolution = ELECTRODE,Level,30
 #-------------------------------
 [ELECTRODE]
 Name = Electrode
@@ -2699,7 +2704,7 @@ Category = Egg
 Pokedex = It consists of six eggs that care for each other. The eggs attract each other and spin around. When cracks increasingly appear, it is close to evolution.
 Generation = 1
 WildItemUncommon = PSYCHICSEED
-Evolutions = EXEGGUTOR,Item,LEAFSTONE
+Evolution = EXEGGUTOR,Item,LEAFSTONE
 #-------------------------------
 [EXEGGUTOR]
 Name = Exeggutor
@@ -2752,7 +2757,7 @@ Category = Lonely
 Pokedex = It pines for the mother it will never see again. Seeing a likeness of its mother in the full moon, it cries. The stains on the skull it wears are from its tears.
 Generation = 1
 WildItemUncommon = THICKCLUB
-Evolutions = MAROWAK,Level,28
+Evolution = MAROWAK,Level,28
 #-------------------------------
 [MAROWAK]
 Name = Marowak
@@ -2856,7 +2861,7 @@ Category = Licking
 Pokedex = Whenever it sees something unfamiliar, it always licks the object because it memorizes things by texture and taste. It is somewhat put off by sour things.
 Generation = 1
 WildItemUncommon = LAGGINGTAIL
-Evolutions = LICKILICKY,HasMove,ROLLOUT
+Evolution = LICKILICKY,HasMove,ROLLOUT
 #-------------------------------
 [KOFFING]
 Name = Koffing
@@ -2884,7 +2889,7 @@ Category = Poison Gas
 Pokedex = Getting up close to a Koffing will give you a chance to observe, through its thin skin, the toxic gases swirling inside. It blows up at the slightest stimulation.
 Generation = 1
 WildItemUncommon = SMOKEBALL
-Evolutions = WEEZING,Level,35
+Evolution = WEEZING,Level,35
 #-------------------------------
 [WEEZING]
 Name = Weezing
@@ -2937,7 +2942,7 @@ Habitat = RoughTerrain
 Category = Spikes
 Pokedex = Once it starts running, it doesn't stop. Its tiny brain makes it so stupid that it can't remember why it started running in the first place.
 Generation = 1
-Evolutions = RHYDON,Level,42
+Evolution = RHYDON,Level,42
 #-------------------------------
 [RHYDON]
 Name = Rhydon
@@ -2963,7 +2968,7 @@ Habitat = RoughTerrain
 Category = Drill
 Pokedex = Its horn, which rotates like a drill, destroys tall buildings with one strike. It stands on its hind legs, and its brain is well developed.
 Generation = 1
-Evolutions = RHYPERIOR,TradeItem,PROTECTOR
+Evolution = RHYPERIOR,TradeItem,PROTECTOR
 #-------------------------------
 [CHANSEY]
 Name = Chansey
@@ -2991,7 +2996,7 @@ Category = Egg
 Pokedex = Chansey lay nutritionally excellent eggs every day. The eggs are so delicious, they are eagerly devoured by even those who have lost their appetite.
 Generation = 1
 WildItemCommon = LUCKYPUNCH
-Evolutions = BLISSEY,Happiness,
+Evolution = BLISSEY,Happiness
 #-------------------------------
 [TANGELA]
 Name = Tangela
@@ -3018,7 +3023,7 @@ Habitat = Grassland
 Category = Vine
 Pokedex = Its vines snap off easily and painlessly if they are grabbed, allowing it to make a quick getaway. The lost vines are replaced by new growth the very next day.
 Generation = 1
-Evolutions = TANGROWTH,HasMove,ANCIENTPOWER
+Evolution = TANGROWTH,HasMove,ANCIENTPOWER
 #-------------------------------
 [KANGASKHAN]
 Name = Kangaskhan
@@ -3072,7 +3077,7 @@ Category = Dragon
 Pokedex = By cleverly flicking the fins on its back side to side, it moves in any direction while facing forward. It spits ink to escape if it senses danger.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = SEADRA,Level,32
+Evolution = SEADRA,Level,32
 #-------------------------------
 [SEADRA]
 Name = Seadra
@@ -3099,7 +3104,7 @@ Category = Dragon
 Pokedex = The poisonous barbs all over its body are highly valued as ingredients for making traditional herbal medicine. It shows no mercy to anything approaching its nest.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = KINGDRA,TradeItem,DRAGONSCALE
+Evolution = KINGDRA,TradeItem,DRAGONSCALE
 #-------------------------------
 [GOLDEEN]
 Name = Goldeen
@@ -3127,7 +3132,7 @@ Category = Goldfish
 Pokedex = In the springtime, schools of Goldeen can be seen swimming up falls and rivers. It metes out staggering damage with its single horn.
 Generation = 1
 WildItemUncommon = MYSTICWATER
-Evolutions = SEAKING,Level,33
+Evolution = SEAKING,Level,33
 #-------------------------------
 [SEAKING]
 Name = Seaking
@@ -3181,7 +3186,7 @@ Pokedex = It gathers with others in the night and makes its red core glow on and
 Generation = 1
 WildItemCommon = STARDUST
 WildItemUncommon = STARPIECE
-Evolutions = STARMIE,Item,WATERSTONE
+Evolution = STARMIE,Item,WATERSTONE
 #-------------------------------
 [STARMIE]
 Name = Starmie
@@ -3235,7 +3240,7 @@ Habitat = Urban
 Category = Barrier
 Pokedex = A Mr. Mime is a master of pantomime. It can convince others that something unseeable actually exists. Once believed, the imaginary object does become real.
 Generation = 1
-Evolutions = MRRIME,None,
+Evolution = MRRIME,None
 #-------------------------------
 [SCYTHER]
 Name = Scyther
@@ -3262,7 +3267,7 @@ Habitat = Grassland
 Category = Mantis
 Pokedex = Its blindingly fast speed adds to the sharpness of its twin forearm scythes. The scythes can slice through thick logs in one wicked stroke.
 Generation = 1
-Evolutions = SCIZOR,TradeItem,METALCOAT
+Evolution = SCIZOR,TradeItem,METALCOAT
 #-------------------------------
 [JYNX]
 Name = Jynx
@@ -3314,7 +3319,7 @@ Category = Electric
 Pokedex = When a storm approaches, it competes with others to scale heights that are likely to be stricken by lightning. Some towns use Electabuzz as lightning rods.
 Generation = 1
 WildItemUncommon = ELECTIRIZER
-Evolutions = ELECTIVIRE,TradeItem,ELECTIRIZER
+Evolution = ELECTIVIRE,TradeItem,ELECTIRIZER
 #-------------------------------
 [MAGMAR]
 Name = Magmar
@@ -3341,7 +3346,7 @@ Category = Spitfire
 Pokedex = In battle, it blows out intense flames from all over its body to intimidate its foe. These fiery bursts create heat waves that ignite grass and trees.
 Generation = 1
 WildItemUncommon = MAGMARIZER
-Evolutions = MAGMORTAR,TradeItem,MAGMARIZER
+Evolution = MAGMORTAR,TradeItem,MAGMARIZER
 #-------------------------------
 [PINSIR]
 Name = Pinsir
@@ -3418,7 +3423,7 @@ Habitat = WatersEdge
 Category = Fish
 Pokedex = Its swimming muscles are weak, so it is easily washed away by currents. In places where water pools, you can see many Magikarp deposited there by the flow.
 Generation = 1
-Evolutions = GYARADOS,Level,20
+Evolution = GYARADOS,Level,20
 #-------------------------------
 [GYARADOS]
 Name = Gyarados
@@ -3525,7 +3530,16 @@ Habitat = Urban
 Category = Evolution
 Pokedex = An Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokémon to evolve.
 Generation = 1
-Evolutions = VAPOREON,Item,WATERSTONE,JOLTEON,Item,THUNDERSTONE,FLAREON,Item,FIRESTONE,LEAFEON,Item,LEAFSTONE,LEAFEON,LocationFlag,MossRock,GLACEON,Item,ICESTONE,GLACEON,LocationFlag,IceRock,SYLVEON,HappinessMoveType,FAIRY,ESPEON,HappinessDay,,UMBREON,HappinessNight,
+Evolution = VAPOREON,Item,WATERSTONE
+Evolution = JOLTEON,Item,THUNDERSTONE
+Evolution = FLAREON,Item,FIRESTONE
+Evolution = LEAFEON,Item,LEAFSTONE
+Evolution = LEAFEON,LocationFlag,MossRock
+Evolution = GLACEON,Item,ICESTONE
+Evolution = GLACEON,LocationFlag,IceRock
+Evolution = SYLVEON,HappinessMoveType,FAIRY
+Evolution = ESPEON,HappinessDay
+Evolution = UMBREON,HappinessNight
 #-------------------------------
 [VAPOREON]
 Name = Vaporeon
@@ -3626,7 +3640,7 @@ Habitat = Urban
 Category = Virtual
 Pokedex = It is capable of reverting itself entirely back to program data in order to enter cyberspace. A Porygon is copy-protected so it cannot be duplicated.
 Generation = 1
-Evolutions = PORYGON2,TradeItem,UPGRADE
+Evolution = PORYGON2,TradeItem,UPGRADE
 #-------------------------------
 [OMANYTE]
 Name = Omanyte
@@ -3653,7 +3667,7 @@ Habitat = Sea
 Category = Spiral
 Pokedex = One of the ancient and long-since-extinct Pokémon that have been regenerated from fossils by humans. If attacked, it withdraws into its hard shell.
 Generation = 1
-Evolutions = OMASTAR,Level,40
+Evolution = OMASTAR,Level,40
 #-------------------------------
 [OMASTAR]
 Name = Omastar
@@ -3705,7 +3719,7 @@ Habitat = Sea
 Category = Shellfish
 Pokedex = This Pokémon has been regenerated from a fossil. However, in rare cases, living examples have been discovered. Kabuto have not changed for 300 million years.
 Generation = 1
-Evolutions = KABUTOPS,Level,40
+Evolution = KABUTOPS,Level,40
 #-------------------------------
 [KABUTOPS]
 Name = Kabutops
@@ -3891,7 +3905,7 @@ Category = Dragon
 Pokedex = A Dratini continually molts and sloughs off its old skin. It does so because the life energy within its body steadily builds to reach uncontrollable levels.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = DRAGONAIR,Level,30
+Evolution = DRAGONAIR,Level,30
 #-------------------------------
 [DRAGONAIR]
 Name = Dragonair
@@ -3918,7 +3932,7 @@ Category = Dragon
 Pokedex = A Dragonair stores an enormous amount of energy inside its body. It is said to alter the weather around it by loosing energy from the crystals on its neck and tail.
 Generation = 1
 WildItemUncommon = DRAGONSCALE
-Evolutions = DRAGONITE,Level,55
+Evolution = DRAGONITE,Level,55
 #-------------------------------
 [DRAGONITE]
 Name = Dragonite
@@ -4025,7 +4039,7 @@ Habitat = Grassland
 Category = Leaf
 Pokedex = It waves its leaf around to keep foes at bay. However, a sweet fragrance also wafts from the leaf, creating a friendly atmosphere that becalms the battlers.
 Generation = 2
-Evolutions = BAYLEEF,Level,16
+Evolution = BAYLEEF,Level,16
 #-------------------------------
 [BAYLEEF]
 Name = Bayleef
@@ -4051,7 +4065,7 @@ Habitat = Grassland
 Category = Leaf
 Pokedex = A Bayleef's neck is ringed by curled-up leaves. Inside each leaf is a small tree shoot. The fragrance of this shoot makes people peppy.
 Generation = 2
-Evolutions = MEGANIUM,Level,32
+Evolution = MEGANIUM,Level,32
 #-------------------------------
 [MEGANIUM]
 Name = Meganium
@@ -4103,7 +4117,7 @@ Habitat = Grassland
 Category = Fire Mouse
 Pokedex = It flares flames from its back to protect itself. The fire burns vigorously if the Pokémon is angry. When it is tired, it sputters with incomplete combustion.
 Generation = 2
-Evolutions = QUILAVA,Level,14
+Evolution = QUILAVA,Level,14
 #-------------------------------
 [QUILAVA]
 Name = Quilava
@@ -4129,7 +4143,7 @@ Habitat = Grassland
 Category = Volcano
 Pokedex = It intimidates foes with intense gusts of flames and superheated air. Its quick nimbleness lets it dodge attacks even while scorching an enemy.
 Generation = 2
-Evolutions = TYPHLOSION,Level,36
+Evolution = TYPHLOSION,Level,36
 #-------------------------------
 [TYPHLOSION]
 Name = Typhlosion
@@ -4181,7 +4195,7 @@ Habitat = WatersEdge
 Category = Big Jaw
 Pokedex = Despite its small body, Totodile's jaws are very powerful. While it may think it is just playfully nipping, its bite has enough strength to cause serious injury.
 Generation = 2
-Evolutions = CROCONAW,Level,18
+Evolution = CROCONAW,Level,18
 #-------------------------------
 [CROCONAW]
 Name = Croconaw
@@ -4207,7 +4221,7 @@ Habitat = WatersEdge
 Category = Big Jaw
 Pokedex = Once its jaws clamp down on its foe, it will absolutely not let go. Because the tips of its fangs are forked back like fishhooks, they become irremovably embedded.
 Generation = 2
-Evolutions = FERALIGATR,Level,30
+Evolution = FERALIGATR,Level,30
 #-------------------------------
 [FERALIGATR]
 Name = Feraligatr
@@ -4259,7 +4273,7 @@ Habitat = Grassland
 Category = Scout
 Pokedex = They take turns standing guard when it is time to sleep. The sentry awakens the others if it senses danger. If one gets separated, it turns sleepless with fear.
 Generation = 2
-Evolutions = FURRET,Level,15
+Evolution = FURRET,Level,15
 #-------------------------------
 [FURRET]
 Name = Furret
@@ -4311,7 +4325,7 @@ Habitat = Forest
 Category = Owl
 Pokedex = It has an internal organ that senses the earth's rotation. Using this special organ, a Hoothoot begins hooting at precisely the same time every day.
 Generation = 2
-Evolutions = NOCTOWL,Level,20
+Evolution = NOCTOWL,Level,20
 #-------------------------------
 [NOCTOWL]
 Name = Noctowl
@@ -4363,7 +4377,7 @@ Habitat = Forest
 Category = Five Star
 Pokedex = Ledyba communicate using a fluid that they secrete from where the legs join the body. They are said to convey feelings to others by altering the fluid's scent.
 Generation = 2
-Evolutions = LEDIAN,Level,18
+Evolution = LEDIAN,Level,18
 #-------------------------------
 [LEDIAN]
 Name = Ledian
@@ -4415,7 +4429,7 @@ Habitat = Forest
 Category = String Spit
 Pokedex = The web it spins can be considered its second nervous system. It is said that a Spinarak determines its prey by the tiny vibrations it feels through the web.
 Generation = 2
-Evolutions = ARIADOS,Level,22
+Evolution = ARIADOS,Level,22
 #-------------------------------
 [ARIADOS]
 Name = Ariados
@@ -4493,7 +4507,7 @@ Category = Angler
 Pokedex = When it senses danger, it discharges positive and negative electricity from its two antennae. It lives in depths beyond sunlight's reach.
 Generation = 2
 WildItemUncommon = DEEPSEASCALE
-Evolutions = LANTURN,Level,27
+Evolution = LANTURN,Level,27
 #-------------------------------
 [LANTURN]
 Name = Lanturn
@@ -4546,7 +4560,7 @@ Habitat = Forest
 Category = Tiny Mouse
 Pokedex = It is still inept at retaining electricity. When it is startled, it discharges power accidentally. It gets better at holding power as it grows older.
 Generation = 2
-Evolutions = PIKACHU,Happiness,
+Evolution = PIKACHU,Happiness
 #-------------------------------
 [CLEFFA]
 Name = Cleffa
@@ -4574,7 +4588,7 @@ Category = Star Shape
 Pokedex = On nights with many shooting stars, Cleffa can be seen dancing in a ring. They dance until daybreak, when they quench their thirst with the morning dew.
 Generation = 2
 WildItemUncommon = MOONSTONE
-Evolutions = CLEFAIRY,Happiness,
+Evolution = CLEFAIRY,Happiness
 #-------------------------------
 [IGGLYBUFF]
 Name = Igglybuff
@@ -4601,7 +4615,7 @@ Habitat = Grassland
 Category = Balloon
 Pokedex = Its soft and pliable body is very bouncy. When it sings continuously with all its might, its body steadily turns a deepening pink color.
 Generation = 2
-Evolutions = JIGGLYPUFF,Happiness,
+Evolution = JIGGLYPUFF,Happiness
 #-------------------------------
 [TOGEPI]
 Name = Togepi
@@ -4628,7 +4642,7 @@ Habitat = Forest
 Category = Spike Ball
 Pokedex = As its energy, it uses the feelings of compassion and pleasure exuded by people and Pokémon. It stores up happy feelings in its shell, then shares them out.
 Generation = 2
-Evolutions = TOGETIC,Happiness,
+Evolution = TOGETIC,Happiness
 #-------------------------------
 [TOGETIC]
 Name = Togetic
@@ -4654,7 +4668,7 @@ Habitat = Forest
 Category = Happiness
 Pokedex = It is said to be a Pokémon that brings good fortune. When it spots someone who is pure of heart, a Togetic appears and shares its happiness with that person.
 Generation = 2
-Evolutions = TOGEKISS,Item,SHINYSTONE
+Evolution = TOGEKISS,Item,SHINYSTONE
 #-------------------------------
 [NATU]
 Name = Natu
@@ -4681,7 +4695,7 @@ Habitat = Forest
 Category = Tiny Bird
 Pokedex = It runs up short trees that grow on the savanna to peck at new shoots. A Natu's eyes look as if they are always observing something.
 Generation = 2
-Evolutions = XATU,Level,25
+Evolution = XATU,Level,25
 #-------------------------------
 [XATU]
 Name = Xatu
@@ -4733,7 +4747,7 @@ Habitat = Grassland
 Category = Wool
 Pokedex = Its fluffy wool rubs together and builds a static charge. The more energy is charged, the more brightly the lightbulb at the tip of its tail glows.
 Generation = 2
-Evolutions = FLAAFFY,Level,15
+Evolution = FLAAFFY,Level,15
 #-------------------------------
 [FLAAFFY]
 Name = Flaaffy
@@ -4759,7 +4773,7 @@ Habitat = Grassland
 Category = Wool
 Pokedex = Its fleece quality changes to generate strong static electricity with a small amount of wool. The bare, slick parts of its hide are shielded against electricity.
 Generation = 2
-Evolutions = AMPHAROS,Level,30
+Evolution = AMPHAROS,Level,30
 #-------------------------------
 [AMPHAROS]
 Name = Ampharos
@@ -4837,7 +4851,7 @@ Habitat = WatersEdge
 Category = Aqua Mouse
 Pokedex = Its body is covered with water-repellent fur. Because of the fur, it can swim through water at high speed without being slowed by the water's resistance.
 Generation = 2
-Evolutions = AZUMARILL,Level,18
+Evolution = AZUMARILL,Level,18
 #-------------------------------
 [AZUMARILL]
 Name = Azumarill
@@ -4941,7 +4955,7 @@ Habitat = Grassland
 Category = Cottonweed
 Pokedex = This Pokémon drifts and floats with the wind. If it senses the approach of strong winds, a Hoppip links leaves with others to prepare against being blown away.
 Generation = 2
-Evolutions = SKIPLOOM,Level,18
+Evolution = SKIPLOOM,Level,18
 #-------------------------------
 [SKIPLOOM]
 Name = Skiploom
@@ -4967,7 +4981,7 @@ Habitat = Grassland
 Category = Cottonweed
 Pokedex = It blossoms when the temperature rises above 64 degrees F. Because its flower's blooming changes with the temperature, it is sometimes used as a thermometer.
 Generation = 2
-Evolutions = JUMPLUFF,Level,27
+Evolution = JUMPLUFF,Level,27
 #-------------------------------
 [JUMPLUFF]
 Name = Jumpluff
@@ -5019,7 +5033,7 @@ Habitat = Forest
 Category = Long Tail
 Pokedex = Its tail ends with a dexterous, handlike appendage. However, because it uses the tail so much, Aipom's real hands have become rather clumsy.
 Generation = 2
-Evolutions = AMBIPOM,HasMove,DOUBLEHIT
+Evolution = AMBIPOM,HasMove,DOUBLEHIT
 #-------------------------------
 [SUNKERN]
 Name = Sunkern
@@ -5046,7 +5060,7 @@ Habitat = Grassland
 Category = Seed
 Pokedex = Sunkern try to minimize movement to conserve the nutrients they have stored in their bodies for evolution. They will not eat, subsisting only on morning dew.
 Generation = 2
-Evolutions = SUNFLORA,Item,SUNSTONE
+Evolution = SUNFLORA,Item,SUNSTONE
 #-------------------------------
 [SUNFLORA]
 Name = Sunflora
@@ -5099,7 +5113,7 @@ Category = Clear Wing
 Pokedex = It can see 360 degrees without moving its eyes. It is a great flier capable of making sudden stops and turning midair to quickly chase down targeted prey.
 Generation = 2
 WildItemUncommon = WIDELENS
-Evolutions = YANMEGA,HasMove,ANCIENTPOWER
+Evolution = YANMEGA,HasMove,ANCIENTPOWER
 #-------------------------------
 [WOOPER]
 Name = Wooper
@@ -5126,7 +5140,7 @@ Habitat = WatersEdge
 Category = Water Fish
 Pokedex = Wooper usually live in water but come out onto land seeking food occasionally. On land, they coat their bodies with a gooey, toxic film.
 Generation = 2
-Evolutions = QUAGSIRE,Level,20
+Evolution = QUAGSIRE,Level,20
 #-------------------------------
 [QUAGSIRE]
 Name = Quagsire
@@ -5228,7 +5242,7 @@ Habitat = Forest
 Category = Darkness
 Pokedex = Murkrow were feared as the alleged bearers of ill fortune. It shows strong interest in anything that sparkles. It will even try to steal rings from women.
 Generation = 2
-Evolutions = HONCHKROW,Item,DUSKSTONE
+Evolution = HONCHKROW,Item,DUSKSTONE
 #-------------------------------
 [SLOWKING]
 Name = Slowking
@@ -5280,7 +5294,7 @@ Habitat = Cave
 Category = Screech
 Pokedex = A Misdreavus frightens people with a creepy, sobbing cry. It apparently uses its red spheres to absorb the fear of foes as its nutrition.
 Generation = 2
-Evolutions = MISMAGIUS,Item,DUSKSTONE
+Evolution = MISMAGIUS,Item,DUSKSTONE
 #-------------------------------
 [UNOWN]
 Name = Unown
@@ -5383,7 +5397,7 @@ Habitat = Forest
 Category = Bagworm
 Pokedex = A Pineco hangs from a tree branch and waits for prey. While eating, if it is disturbed by someone shaking its tree, it falls on the ground and explodes.
 Generation = 2
-Evolutions = FORRETRESS,Level,31
+Evolution = FORRETRESS,Level,31
 #-------------------------------
 [FORRETRESS]
 Name = Forretress
@@ -5461,7 +5475,7 @@ Habitat = Mountain
 Category = Fly Scorpion
 Pokedex = It glides without making a single sound. It grasps the face of its foe using its hind and large front claws, then stabs with its poison barb.
 Generation = 2
-Evolutions = GLISCOR,NightHoldItem,RAZORFANG
+Evolution = GLISCOR,NightHoldItem,RAZORFANG
 #-------------------------------
 [STEELIX]
 Name = Steelix
@@ -5514,7 +5528,7 @@ Habitat = Urban
 Category = Fairy
 Pokedex = By baring its fangs and making a scary face, it sends smaller Pokémon scurrying in terror. The Snubbull does seem a little sad at making its foes flee.
 Generation = 2
-Evolutions = GRANBULL,Level,23
+Evolution = GRANBULL,Level,23
 #-------------------------------
 [GRANBULL]
 Name = Granbull
@@ -5674,7 +5688,7 @@ Category = Sharp Claw
 Pokedex = A Sneasel scales trees by punching its hooked claws into the bark. It seeks out unguarded nests and steals eggs for food while the parents are away.
 Generation = 2
 WildItemUncommon = QUICKCLAW
-Evolutions = WEAVILE,NightHoldItem,RAZORCLAW
+Evolution = WEAVILE,NightHoldItem,RAZORCLAW
 #-------------------------------
 [TEDDIURSA]
 Name = Teddiursa
@@ -5701,7 +5715,7 @@ Habitat = Mountain
 Category = Little Bear
 Pokedex = It licks its palms that are sweetened by being soaked in honey. A Teddiursa makes its own honey by blending fruits and pollen collected by Beedrill.
 Generation = 2
-Evolutions = URSARING,Level,30
+Evolution = URSARING,Level,30
 #-------------------------------
 [URSARING]
 Name = Ursaring
@@ -5753,7 +5767,7 @@ Habitat = Mountain
 Category = Lava
 Pokedex = It is a species of Pokémon that lives in volcanic areas. If its body cools, its skin hardens and immobilizes it. To avoid that, it sleeps near magma.
 Generation = 2
-Evolutions = MAGCARGO,Level,38
+Evolution = MAGCARGO,Level,38
 #-------------------------------
 [MAGCARGO]
 Name = Magcargo
@@ -5805,7 +5819,7 @@ Habitat = Cave
 Category = Pig
 Pokedex = It roots for food by rubbing its snout against the ground. Its favorite food is a mushroom that grows under dried grass. It occasionally roots out hot springs.
 Generation = 2
-Evolutions = PILOSWINE,Level,33
+Evolution = PILOSWINE,Level,33
 #-------------------------------
 [PILOSWINE]
 Name = Piloswine
@@ -5831,7 +5845,7 @@ Habitat = Cave
 Category = Swine
 Pokedex = A Piloswine is covered by a thick coat of long hair for enduring freezing cold. It uses its tusks to dig up food that has been buried under ice.
 Generation = 2
-Evolutions = MAMOSWINE,HasMove,ANCIENTPOWER
+Evolution = MAMOSWINE,HasMove,ANCIENTPOWER
 #-------------------------------
 [CORSOLA]
 Name = Corsola
@@ -5859,7 +5873,7 @@ Category = Coral
 Pokedex = Corsola live in warm southern seas. If the sea becomes polluted, the beautiful coral stalks become discolored and crumble away in tatters.
 Generation = 2
 WildItemUncommon = LUMINOUSMOSS
-Evolutions = CURSOLA,None,
+Evolution = CURSOLA,None
 #-------------------------------
 [REMORAID]
 Name = Remoraid
@@ -5886,7 +5900,7 @@ Habitat = Sea
 Category = Jet
 Pokedex = A Remoraid uses its abdominal muscles to forcefully expel swallowed water, then shoot down flying prey. When evolution approaches, it travels down rivers.
 Generation = 2
-Evolutions = OCTILLERY,Level,25
+Evolution = OCTILLERY,Level,25
 #-------------------------------
 [OCTILLERY]
 Name = Octillery
@@ -6017,7 +6031,7 @@ Habitat = RoughTerrain
 Category = Dark
 Pokedex = Houndour communicate with each other using a variety of cries to corner their prey. This Pokémon's remarkable teamwork is simply unparalleled.
 Generation = 2
-Evolutions = HOUNDOOM,Level,24
+Evolution = HOUNDOOM,Level,24
 #-------------------------------
 [HOUNDOOM]
 Name = Houndoom
@@ -6095,7 +6109,7 @@ Habitat = RoughTerrain
 Category = Long Nose
 Pokedex = Phanpy's big ears serve as broad fans. When it becomes hot, it flaps the ears busily to cool down. Even the young are very strong.
 Generation = 2
-Evolutions = DONPHAN,Level,25
+Evolution = DONPHAN,Level,25
 #-------------------------------
 [DONPHAN]
 Name = Donphan
@@ -6146,7 +6160,7 @@ Habitat = Urban
 Category = Virtual
 Pokedex = It was created by humans using the power of science. It has been given artificial intelligence that enables it to learn new gestures and emotions on its own.
 Generation = 2
-Evolutions = PORYGONZ,TradeItem,DUBIOUSDISC
+Evolution = PORYGONZ,TradeItem,DUBIOUSDISC
 #-------------------------------
 [STANTLER]
 Name = Stantler
@@ -6223,7 +6237,9 @@ Habitat = Urban
 Category = Scuffle
 Pokedex = Tyrogue become stressed out if they do not get to train every day. When raising this Pokémon, the trainer must establish a regular training schedule.
 Generation = 2
-Evolutions = HITMONLEE,AttackGreater,20,HITMONCHAN,DefenseGreater,20,HITMONTOP,AtkDefEqual,20
+Evolution = HITMONLEE,AttackGreater,20
+Evolution = HITMONCHAN,DefenseGreater,20
+Evolution = HITMONTOP,AtkDefEqual,20
 #-------------------------------
 [HITMONTOP]
 Name = Hitmontop
@@ -6275,7 +6291,7 @@ Habitat = Urban
 Category = Kiss
 Pokedex = It actively runs about, but also falls often. Whenever it falls, it will check its reflection on a lake's surface to make sure its face hasn't become dirty.
 Generation = 2
-Evolutions = JYNX,Level,30
+Evolution = JYNX,Level,30
 #-------------------------------
 [ELEKID]
 Name = Elekid
@@ -6303,7 +6319,7 @@ Category = Electric
 Pokedex = If it touches metal and discharges the electricity it has stored in its body, an Elekid begins swinging its arms in circles to recharge itself.
 Generation = 2
 WildItemUncommon = ELECTIRIZER
-Evolutions = ELECTABUZZ,Level,30
+Evolution = ELECTABUZZ,Level,30
 #-------------------------------
 [MAGBY]
 Name = Magby
@@ -6331,7 +6347,7 @@ Category = Live Coal
 Pokedex = If a Magby is spouting yellow flames from its mouth, it is in good health. When it is fatigued, black smoke will be mixed in with the flames.
 Generation = 2
 WildItemUncommon = MAGMARIZER
-Evolutions = MAGMAR,Level,30
+Evolution = MAGMAR,Level,30
 #-------------------------------
 [MILTANK]
 Name = Miltank
@@ -6493,7 +6509,7 @@ Habitat = Mountain
 Category = Rock Skin
 Pokedex = A Larvitar is born deep under the ground. It must eat its way through the soil above and reach the surface for it to see its parents' faces.
 Generation = 2
-Evolutions = PUPITAR,Level,30
+Evolution = PUPITAR,Level,30
 #-------------------------------
 [PUPITAR]
 Name = Pupitar
@@ -6518,7 +6534,7 @@ Habitat = Mountain
 Category = Hard Shell
 Pokedex = A Pupitar creates a gas inside its body that it ejects under compression to propel itself like a jet. Its body can withstand a collision with solid steel.
 Generation = 2
-Evolutions = TYRANITAR,Level,55
+Evolution = TYRANITAR,Level,55
 #-------------------------------
 [TYRANITAR]
 Name = Tyranitar
@@ -6653,7 +6669,7 @@ Habitat = Forest
 Category = Wood Gecko
 Pokedex = It makes its nest in a giant tree in the forest. It ferociously guards against anything nearing its territory. It is said to be the protector of the trees.
 Generation = 3
-Evolutions = GROVYLE,Level,16
+Evolution = GROVYLE,Level,16
 #-------------------------------
 [GROVYLE]
 Name = Grovyle
@@ -6679,7 +6695,7 @@ Habitat = Forest
 Category = Wood Gecko
 Pokedex = Leaves grow out of this Pokémon's body. They help obscure a Grovyle from the eyes of its enemies while it is in a thickly overgrown forest.
 Generation = 3
-Evolutions = SCEPTILE,Level,36
+Evolution = SCEPTILE,Level,36
 #-------------------------------
 [SCEPTILE]
 Name = Sceptile
@@ -6731,7 +6747,7 @@ Habitat = Grassland
 Category = Chick
 Pokedex = If attacked, it strikes back by spitting balls of fire it forms in its stomach. A Torchic dislikes darkness because it can't see its surroundings.
 Generation = 3
-Evolutions = COMBUSKEN,Level,16
+Evolution = COMBUSKEN,Level,16
 #-------------------------------
 [COMBUSKEN]
 Name = Combusken
@@ -6757,7 +6773,7 @@ Habitat = Grassland
 Category = Young Fowl
 Pokedex = It lashes out with 10 kicks per second. Its strong fighting instinct compels it to keep up its offensive until the opponent gives up.
 Generation = 3
-Evolutions = BLAZIKEN,Level,36
+Evolution = BLAZIKEN,Level,36
 #-------------------------------
 [BLAZIKEN]
 Name = Blaziken
@@ -6809,7 +6825,7 @@ Habitat = WatersEdge
 Category = Mud Fish
 Pokedex = On land, it can powerfully lift large boulders by planting its four feet and heaving. It sleeps by burying itself in soil at the water's edge.
 Generation = 3
-Evolutions = MARSHTOMP,Level,16
+Evolution = MARSHTOMP,Level,16
 #-------------------------------
 [MARSHTOMP]
 Name = Marshtomp
@@ -6835,7 +6851,7 @@ Habitat = WatersEdge
 Category = Mud Fish
 Pokedex = Its toughened hind legs enable it to stand upright. Because it weakens if its skin dries out, it replenishes fluids by playing in mud.
 Generation = 3
-Evolutions = SWAMPERT,Level,36
+Evolution = SWAMPERT,Level,36
 #-------------------------------
 [SWAMPERT]
 Name = Swampert
@@ -6887,7 +6903,7 @@ Habitat = Grassland
 Category = Bite
 Pokedex = It savagely threatens foes with bared fangs. It chases after fleeing targets tenaciously. It turns tail and runs, however, if the foe strikes back.
 Generation = 3
-Evolutions = MIGHTYENA,Level,18
+Evolution = MIGHTYENA,Level,18
 #-------------------------------
 [MIGHTYENA]
 Name = Mightyena
@@ -6941,7 +6957,7 @@ Pokedex = Rubbing its nose against the ground, it always wanders about back and
 Generation = 3
 WildItemCommon = POTION
 WildItemUncommon = REVIVE
-Evolutions = LINOONE,Level,20
+Evolution = LINOONE,Level,20
 #-------------------------------
 [LINOONE]
 Name = Linoone
@@ -6969,7 +6985,7 @@ Pokedex = It is exceedingly fast if it only has to run in a straight line. When
 Generation = 3
 WildItemCommon = POTION
 WildItemUncommon = MAXREVIVE
-Evolutions = OBSTAGOON,None,
+Evolution = OBSTAGOON,None
 #-------------------------------
 [WURMPLE]
 Name = Wurmple
@@ -6997,7 +7013,8 @@ Pokedex = It sticks to tree branches and eats leaves. The thread it spits from i
 Generation = 3
 WildItemCommon = PECHABERRY
 WildItemUncommon = BRIGHTPOWDER
-Evolutions = SILCOON,Silcoon,7,CASCOON,Cascoon,7
+Evolution = SILCOON,Silcoon,7
+Evolution = CASCOON,Cascoon,7
 #-------------------------------
 [SILCOON]
 Name = Silcoon
@@ -7022,7 +7039,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = It prepares for evolution using the energy it stored while it was a Wurmple. It keeps watch over the surroundings with its two eyes.
 Generation = 3
-Evolutions = BEAUTIFLY,Level,10
+Evolution = BEAUTIFLY,Level,10
 #-------------------------------
 [BEAUTIFLY]
 Name = Beautifly
@@ -7073,7 +7090,7 @@ Habitat = Forest
 Category = Cocoon
 Pokedex = To avoid detection by its enemies, it hides motionlessly beneath large leaves and in the gaps of branches. It also attaches dead leaves to its body for camouflage.
 Generation = 3
-Evolutions = DUSTOX,Level,10
+Evolution = DUSTOX,Level,10
 #-------------------------------
 [DUSTOX]
 Name = Dustox
@@ -7127,7 +7144,7 @@ Category = Water Weed
 Pokedex = This Pokémon lives in ponds with clean water. It is known to ferry small Pokémon across ponds by carrying them on the broad leaf on its head.
 Generation = 3
 WildItemUncommon = MENTALHERB
-Evolutions = LOMBRE,Level,14
+Evolution = LOMBRE,Level,14
 #-------------------------------
 [LOMBRE]
 Name = Lombre
@@ -7154,7 +7171,7 @@ Category = Jolly
 Pokedex = In the evening, it takes great delight in popping out of rivers and startling people. It feeds on aquatic moss that grows on rocks in the riverbed.
 Generation = 3
 WildItemUncommon = MENTALHERB
-Evolutions = LUDICOLO,Item,WATERSTONE
+Evolution = LUDICOLO,Item,WATERSTONE
 #-------------------------------
 [LUDICOLO]
 Name = Ludicolo
@@ -7208,7 +7225,7 @@ Category = Acorn
 Pokedex = It hangs off branches and absorbs nutrients. When it finishes eating, its body becomes so heavy that it drops to the ground with a thump.
 Generation = 3
 WildItemUncommon = POWERHERB
-Evolutions = NUZLEAF,Level,14
+Evolution = NUZLEAF,Level,14
 #-------------------------------
 [NUZLEAF]
 Name = Nuzleaf
@@ -7235,7 +7252,7 @@ Category = Wily
 Pokedex = A forest-dwelling Pokémon that is skilled at climbing trees. Its long and pointed nose is its weak point. It loses power if the nose is gripped.
 Generation = 3
 WildItemUncommon = POWERHERB
-Evolutions = SHIFTRY,Item,LEAFSTONE
+Evolution = SHIFTRY,Item,LEAFSTONE
 #-------------------------------
 [SHIFTRY]
 Name = Shiftry
@@ -7288,7 +7305,7 @@ Habitat = Grassland
 Category = Tiny Swallow
 Pokedex = Although it is small, it is very courageous. It will take on a larger Skarmory on an equal footing. However, its will weakens if it becomes hungry.
 Generation = 3
-Evolutions = SWELLOW,Level,22
+Evolution = SWELLOW,Level,22
 #-------------------------------
 [SWELLOW]
 Name = Swellow
@@ -7341,7 +7358,7 @@ Category = Seagull
 Pokedex = It makes its nest on a sheer cliff at the edge of the sea. It has trouble keeping its wings flapping in flight. Instead, it soars on updrafts.
 Generation = 3
 WildItemCommon = PRETTYFEATHER
-Evolutions = PELIPPER,Level,25
+Evolution = PELIPPER,Level,25
 #-------------------------------
 [PELIPPER]
 Name = Pelipper
@@ -7394,7 +7411,7 @@ Habitat = Urban
 Category = Feeling
 Pokedex = A Ralts has the power to sense the emotions of people and Pokémon with the horns on its head. It takes cover if it senses any hostility.
 Generation = 3
-Evolutions = KIRLIA,Level,20
+Evolution = KIRLIA,Level,20
 #-------------------------------
 [KIRLIA]
 Name = Kirlia
@@ -7420,7 +7437,8 @@ Habitat = Urban
 Category = Emotion
 Pokedex = A Kirlia has the psychic power to create a rip in the dimensions and see into the future. It is said to dance with pleasure on sunny mornings.
 Generation = 3
-Evolutions = GARDEVOIR,Level,30,GALLADE,ItemMale,DAWNSTONE
+Evolution = GARDEVOIR,Level,30
+Evolution = GALLADE,ItemMale,DAWNSTONE
 #-------------------------------
 [GARDEVOIR]
 Name = Gardevoir
@@ -7473,7 +7491,7 @@ Category = Pond Skater
 Pokedex = They gather on puddles after evening downpours, gliding across the surface of water as if sliding. It secretes honey with a sweet aroma from its head.
 Generation = 3
 WildItemCommon = HONEY
-Evolutions = MASQUERAIN,Level,22
+Evolution = MASQUERAIN,Level,22
 #-------------------------------
 [MASQUERAIN]
 Name = Masquerain
@@ -7528,7 +7546,7 @@ Pokedex = It loves to eat damp, composted soil in forests. If you enter a forest
 Generation = 3
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = BRELOOM,Level,23
+Evolution = BRELOOM,Level,23
 #-------------------------------
 [BRELOOM]
 Name = Breloom
@@ -7581,7 +7599,7 @@ Habitat = Forest
 Category = Slacker
 Pokedex = It sleeps virtually all day and night long. It doesn't change its nest its entire life, but it sometimes travels great distances by swimming in rivers.
 Generation = 3
-Evolutions = VIGOROTH,Level,18
+Evolution = VIGOROTH,Level,18
 #-------------------------------
 [VIGOROTH]
 Name = Vigoroth
@@ -7606,7 +7624,7 @@ Habitat = Forest
 Category = Wild Monkey
 Pokedex = It can't keep still because its blood boils with energy. It runs through the fields and mountains all day to calm itself. If it doesn't, it can't sleep at night.
 Generation = 3
-Evolutions = SLAKING,Level,36
+Evolution = SLAKING,Level,36
 #-------------------------------
 [SLAKING]
 Name = Slaking
@@ -7658,7 +7676,8 @@ Category = Trainee
 Pokedex = It makes its nest at the roots of a mighty tree. Using its whiskerlike antennae, it probes its surroundings in the pitch-black darkness of soil.
 Generation = 3
 WildItemUncommon = SOFTSAND
-Evolutions = NINJASK,Ninjask,20,SHEDINJA,Shedinja,20
+Evolution = NINJASK,Ninjask,20
+Evolution = SHEDINJA,Shedinja,20
 #-------------------------------
 [NINJASK]
 Name = Ninjask
@@ -7734,7 +7753,7 @@ Habitat = Cave
 Category = Whisper
 Pokedex = Its cries equal a jet plane in volume. It inhales through its ear canals. Because of this system, it can cry continually without having to catch its breath.
 Generation = 3
-Evolutions = LOUDRED,Level,20
+Evolution = LOUDRED,Level,20
 #-------------------------------
 [LOUDRED]
 Name = Loudred
@@ -7760,7 +7779,7 @@ Habitat = Cave
 Category = Big Voice
 Pokedex = It positions the round speakers on its head to assail foes with ultrasonic waves at massive volume. It builds power by stomping the ground.
 Generation = 3
-Evolutions = EXPLOUD,Level,40
+Evolution = EXPLOUD,Level,40
 #-------------------------------
 [EXPLOUD]
 Name = Exploud
@@ -7813,7 +7832,7 @@ Category = Guts
 Pokedex = It loves to toughen up its body above all else. If you hear quaking rumbles in a cave, it is the sound of Makuhita undertaking strenuous training.
 Generation = 3
 WildItemUncommon = BLACKBELT
-Evolutions = HARIYAMA,Level,24
+Evolution = HARIYAMA,Level,24
 #-------------------------------
 [HARIYAMA]
 Name = Hariyama
@@ -7867,7 +7886,7 @@ Habitat = WatersEdge
 Category = Polka Dot
 Pokedex = Its tail, which is packed with nutrition, is very bouncy like a rubber ball. On sunny days they gather at the edge of water and splash about for fun.
 Generation = 3
-Evolutions = MARILL,Happiness,
+Evolution = MARILL,Happiness
 #-------------------------------
 [NOSEPASS]
 Name = Nosepass
@@ -7895,7 +7914,8 @@ Category = Compass
 Pokedex = Its body emits a powerful magnetism. It feeds on prey that is pulled in by the force. Its magnetism is stronger in cold seasons.
 Generation = 3
 WildItemUncommon = MAGNET
-Evolutions = PROBOPASS,LocationFlag,Magnetic,PROBOPASS,Item,THUNDERSTONE
+Evolution = PROBOPASS,LocationFlag,Magnetic
+Evolution = PROBOPASS,Item,THUNDERSTONE
 #-------------------------------
 [SKITTY]
 Name = Skitty
@@ -7922,7 +7942,7 @@ Habitat = Forest
 Category = Kitten
 Pokedex = A Skitty's adorably cute behavior makes it highly popular. In battle, it makes its tail puff out. It threatens foes with a sharp growl.
 Generation = 3
-Evolutions = DELCATTY,Item,MOONSTONE
+Evolution = DELCATTY,Item,MOONSTONE
 #-------------------------------
 [DELCATTY]
 Name = Delcatty
@@ -8029,7 +8049,7 @@ Category = Iron Armor
 Pokedex = A Pokémon that is clad in steel armor. A new suit of armor is made when it evolves. The old, discarded armor is salvaged as metal for making iron products.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = LAIRON,Level,32
+Evolution = LAIRON,Level,32
 #-------------------------------
 [LAIRON]
 Name = Lairon
@@ -8056,7 +8076,7 @@ Category = Iron Armor
 Pokedex = When two Lairon meet in the wild, they fight for territory by bashing into each other with their steel bodies. The sound of their collision carries for miles.
 Generation = 3
 WildItemUncommon = HARDSTONE
-Evolutions = AGGRON,Level,42
+Evolution = AGGRON,Level,42
 #-------------------------------
 [AGGRON]
 Name = Aggron
@@ -8109,7 +8129,7 @@ Habitat = Mountain
 Category = Meditate
 Pokedex = It continually meditates for hours every day. As a result of rigorous and dedicated yoga training, it has tempered its spiritual power so much it can fly.
 Generation = 3
-Evolutions = MEDICHAM,Level,37
+Evolution = MEDICHAM,Level,37
 #-------------------------------
 [MEDICHAM]
 Name = Medicham
@@ -8161,7 +8181,7 @@ Habitat = Grassland
 Category = Lightning
 Pokedex = It generates electricity using friction from the atmosphere. In seasons with especially arid air, its entire body blazes with violent showers of sparks.
 Generation = 3
-Evolutions = MANECTRIC,Level,26
+Evolution = MANECTRIC,Level,26
 #-------------------------------
 [MANECTRIC]
 Name = Manectric
@@ -8324,7 +8344,7 @@ Category = Thorn
 Pokedex = A Roselia that drinks nutritionally rich springwater blooms with lovely flowers. The fragrance of its flowers has the effect of making its foes careless.
 Generation = 3
 WildItemUncommon = POISONBARB
-Evolutions = ROSERADE,Item,SHINYSTONE
+Evolution = ROSERADE,Item,SHINYSTONE
 #-------------------------------
 [GULPIN]
 Name = Gulpin
@@ -8353,7 +8373,7 @@ Pokedex = This Pokémon's stomach fluid can even digest scrap iron. In one gulp,
 Generation = 3
 WildItemCommon = ORANBERRY
 WildItemUncommon = SITRUSBERRY
-Evolutions = SWALOT,Level,26
+Evolution = SWALOT,Level,26
 #-------------------------------
 [SWALOT]
 Name = Swalot
@@ -8408,7 +8428,7 @@ Category = Savage
 Pokedex = Carvanha attack ships in swarms, making them sink. Although it is said to be a very vicious Pokémon, it timidly flees as soon as it finds itself alone.
 Generation = 3
 WildItemUncommon = DEEPSEATOOTH
-Evolutions = SHARPEDO,Level,30
+Evolution = SHARPEDO,Level,30
 #-------------------------------
 [SHARPEDO]
 Name = Sharpedo
@@ -8461,7 +8481,7 @@ Habitat = Sea
 Category = Ball Whale
 Pokedex = While this Pokémon usually lives in the sea, it can survive on land, although not too long. It loses vitality if its body becomes dried out.
 Generation = 3
-Evolutions = WAILORD,Level,40
+Evolution = WAILORD,Level,40
 #-------------------------------
 [WAILORD]
 Name = Wailord
@@ -8513,7 +8533,7 @@ Habitat = Mountain
 Category = Numb
 Pokedex = A Numel stores boiling magma in the hump on its back. It is a hardy Pokémon that can transport a 220-pound load. It has served humans at work since long ago.
 Generation = 3
-Evolutions = CAMERUPT,Level,33
+Evolution = CAMERUPT,Level,33
 #-------------------------------
 [CAMERUPT]
 Name = Camerupt
@@ -8592,7 +8612,7 @@ Habitat = Mountain
 Category = Bounce
 Pokedex = A Pokémon that manipulates psychic power at will. It doesn't stop bouncing even when it is asleep. It loves eating mushrooms that grow underground.
 Generation = 3
-Evolutions = GRUMPIG,Level,32
+Evolution = GRUMPIG,Level,32
 #-------------------------------
 [GRUMPIG]
 Name = Grumpig
@@ -8671,7 +8691,7 @@ Category = Ant Pit
 Pokedex = Its big jaws crunch through boulders. Because its head is so big, it has a hard time getting back upright if it tips over onto its back.
 Generation = 3
 WildItemUncommon = SOFTSAND
-Evolutions = VIBRAVA,Level,35
+Evolution = VIBRAVA,Level,35
 #-------------------------------
 [VIBRAVA]
 Name = Vibrava
@@ -8696,7 +8716,7 @@ Habitat = RoughTerrain
 Category = Vibration
 Pokedex = It looses ultrasonic waves by rubbing its wings together. Since a Vibrava's wings are still in the process of growing, it can only fly short distances.
 Generation = 3
-Evolutions = FLYGON,Level,45
+Evolution = FLYGON,Level,45
 #-------------------------------
 [FLYGON]
 Name = Flygon
@@ -8748,7 +8768,7 @@ Category = Cactus
 Pokedex = Cacnea live in deserts with virtually no rainfall. It battles by swinging its thick, spiked arms. Once a year, a yellow flower blooms.
 Generation = 3
 WildItemUncommon = STICKYBARB
-Evolutions = CACTURNE,Level,32
+Evolution = CACTURNE,Level,32
 #-------------------------------
 [CACTURNE]
 Name = Cacturne
@@ -8801,7 +8821,7 @@ Habitat = Forest
 Category = Cotton Bird
 Pokedex = A Pokémon that has wings like cottony clouds. After enduring winter, in which little food is available, Swablu flocks move closer to towns in the spring.
 Generation = 3
-Evolutions = ALTARIA,Level,35
+Evolution = ALTARIA,Level,35
 #-------------------------------
 [ALTARIA]
 Name = Altaria
@@ -8959,7 +8979,7 @@ Habitat = WatersEdge
 Category = Whiskers
 Pokedex = Its body is covered with a slimy film. The film acts as a barrier to prevent germs in muddy water from entering the Barboach's body.
 Generation = 3
-Evolutions = WHISCASH,Level,30
+Evolution = WHISCASH,Level,30
 #-------------------------------
 [WHISCASH]
 Name = Whiscash
@@ -9011,7 +9031,7 @@ Habitat = WatersEdge
 Category = Ruffian
 Pokedex = Once it grips prey with its large pincers, it will never let go, no matter what. It is a hardy Pokémon that can thrive in any environment.
 Generation = 3
-Evolutions = CRAWDAUNT,Level,30
+Evolution = CRAWDAUNT,Level,30
 #-------------------------------
 [CRAWDAUNT]
 Name = Crawdaunt
@@ -9062,7 +9082,7 @@ Category = Clay Doll
 Pokedex = A Baltoy moves by spinning on its single foot. It has been depicted in murals adorning the walls of a once-bustling city in an ancient age.
 Generation = 3
 WildItemUncommon = LIGHTCLAY
-Evolutions = CLAYDOL,Level,36
+Evolution = CLAYDOL,Level,36
 #-------------------------------
 [CLAYDOL]
 Name = Claydol
@@ -9115,7 +9135,7 @@ Category = Sea Lily
 Pokedex = It disguises itself as seaweed by making its tentacles sway. Unsuspecting prey that come too close are swallowed whole. It became extinct 100 million years ago.
 Generation = 3
 WildItemUncommon = BIGROOT
-Evolutions = CRADILY,Level,40
+Evolution = CRADILY,Level,40
 #-------------------------------
 [CRADILY]
 Name = Cradily
@@ -9168,7 +9188,7 @@ Habitat = WatersEdge
 Category = Old Shrimp
 Pokedex = It was resurrected from a fossil using the power of science. It swims by undulating the wings at its sides. They were feet that adapted to life in the sea.
 Generation = 3
-Evolutions = ARMALDO,Level,40
+Evolution = ARMALDO,Level,40
 #-------------------------------
 [ARMALDO]
 Name = Armaldo
@@ -9220,7 +9240,8 @@ Habitat = WatersEdge
 Category = Fish
 Pokedex = Feebas live in ponds that are heavily infested with weeds. Because of its hopelessly shabby appearance, it seems as if few trainers raise it.
 Generation = 3
-Evolutions = MILOTIC,TradeItem,PRISMSCALE,MILOTIC,Beauty,170
+Evolution = MILOTIC,TradeItem,PRISMSCALE
+Evolution = MILOTIC,Beauty,170
 #-------------------------------
 [MILOTIC]
 Name = Milotic
@@ -9328,7 +9349,7 @@ Category = Puppet
 Pokedex = This Pokémon roams about deep in the night seeking such negative emotions as grudges and envy. It retreats to its nest when the sun begins to rise.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = BANETTE,Level,37
+Evolution = BANETTE,Level,37
 #-------------------------------
 [BANETTE]
 Name = Banette
@@ -9382,7 +9403,7 @@ Category = Requiem
 Pokedex = A glare from its single scarlet eye makes even burly grown-ups freeze in utter fear. It is a nocturnal Pokémon that roams about under the cloak of darkness.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = DUSCLOPS,Level,37
+Evolution = DUSCLOPS,Level,37
 #-------------------------------
 [DUSCLOPS]
 Name = Dusclops
@@ -9409,7 +9430,7 @@ Category = Beckon
 Pokedex = It is thought that its body is hollow with only a spectral ball of fire burning inside. However, no one has been able to confirm this theory as fact.
 Generation = 3
 WildItemUncommon = SPELLTAG
-Evolutions = DUSKNOIR,TradeItem,REAPERCLOTH
+Evolution = DUSKNOIR,TradeItem,REAPERCLOTH
 #-------------------------------
 [TROPIUS]
 Name = Tropius
@@ -9514,7 +9535,7 @@ Habitat = Cave
 Category = Bright
 Pokedex = A Wynaut loves to eat sweet fruits. It cleverly picks fruits using its earlike arms. They gather in fruit gardens, drawn by the fragrance.
 Generation = 3
-Evolutions = WOBBUFFET,Level,15
+Evolution = WOBBUFFET,Level,15
 #-------------------------------
 [SNORUNT]
 Name = Snorunt
@@ -9542,7 +9563,8 @@ Category = Snow Hat
 Pokedex = They tend to move about in groups of around five Snorunt. In snowy regions, it is said that when they are seen late at night, snowfall will arrive by morning.
 Generation = 3
 WildItemUncommon = SNOWBALL
-Evolutions = GLALIE,Level,42,FROSLASS,ItemFemale,DAWNSTONE
+Evolution = GLALIE,Level,42
+Evolution = FROSLASS,ItemFemale,DAWNSTONE
 #-------------------------------
 [GLALIE]
 Name = Glalie
@@ -9594,7 +9616,7 @@ Habitat = Sea
 Category = Clap
 Pokedex = It is completely covered with plushy fur. As a result, it never feels the cold even when it is rolling about on ice floes or diving in the sea.
 Generation = 3
-Evolutions = SEALEO,Level,32
+Evolution = SEALEO,Level,32
 #-------------------------------
 [SEALEO]
 Name = Sealeo
@@ -9620,7 +9642,7 @@ Habitat = Sea
 Category = Ball Roll
 Pokedex = Sealeo live in herds on ice floes. Using its powerful flippers, it shatters ice. It dives into the sea to hunt prey five times a day.
 Generation = 3
-Evolutions = WALREIN,Level,44
+Evolution = WALREIN,Level,44
 #-------------------------------
 [WALREIN]
 Name = Walrein
@@ -9674,7 +9696,8 @@ Pokedex = A Clamperl slams its shell closed on prey to prevent escape. The pearl
 Generation = 3
 WildItemCommon = PEARL
 WildItemUncommon = BIGPEARL
-Evolutions = HUNTAIL,TradeItem,DEEPSEATOOTH,GOREBYSS,TradeItem,DEEPSEASCALE
+Evolution = HUNTAIL,TradeItem,DEEPSEATOOTH
+Evolution = GOREBYSS,TradeItem,DEEPSEASCALE
 #-------------------------------
 [HUNTAIL]
 Name = Huntail
@@ -9808,7 +9831,7 @@ Category = Rock Head
 Pokedex = Although it is small, this Pokémon is very powerful because its body is a bundle of muscles. It launches head-butts with its ironlike skull.
 Generation = 3
 WildItemUncommon = DRAGONFANG
-Evolutions = SHELGON,Level,30
+Evolution = SHELGON,Level,30
 #-------------------------------
 [SHELGON]
 Name = Shelgon
@@ -9835,7 +9858,7 @@ Category = Endurance
 Pokedex = It hardly eats while it awaits evolution. It becomes hardier by enduring hunger. Its shell peels off the instant it begins to evolve.
 Generation = 3
 WildItemUncommon = DRAGONFANG
-Evolutions = SALAMENCE,Level,50
+Evolution = SALAMENCE,Level,50
 #-------------------------------
 [SALAMENCE]
 Name = Salamence
@@ -9888,7 +9911,7 @@ Category = Iron Ball
 Pokedex = When Beldum gather in a swarm, they move in perfect unison as if they were but one Pokémon. They communicate with each other using brain waves.
 Generation = 3
 WildItemUncommon = METALCOAT
-Evolutions = METANG,Level,20
+Evolution = METANG,Level,20
 #-------------------------------
 [METANG]
 Name = Metang
@@ -9915,7 +9938,7 @@ Category = Iron Claw
 Pokedex = The claws tipping its arms pack the destructive power to tear through thick iron sheets as if they were silk. It flies at over 60 miles per hour.
 Generation = 3
 WildItemUncommon = METALCOAT
-Evolutions = METAGROSS,Level,45
+Evolution = METAGROSS,Level,45
 #-------------------------------
 [METAGROSS]
 Name = Metagross
@@ -10224,7 +10247,7 @@ Shape = Quadruped
 Category = Tiny Leaf
 Pokedex = Made from soil, the shell on its back hardens when it drinks water. It lives along lakes.
 Generation = 4
-Evolutions = GROTLE,Level,18
+Evolution = GROTLE,Level,18
 #-------------------------------
 [GROTLE]
 Name = Grotle
@@ -10249,7 +10272,7 @@ Shape = Quadruped
 Category = Grove
 Pokedex = It lives along water in forests. In the daytime, it leaves the forest to sunbathe its treed shell.
 Generation = 4
-Evolutions = TORTERRA,Level,32
+Evolution = TORTERRA,Level,32
 #-------------------------------
 [TORTERRA]
 Name = Torterra
@@ -10299,7 +10322,7 @@ Shape = BipedalTail
 Category = Chimp
 Pokedex = It agilely scales sheer cliffs to live atop craggy mountains. Its fire is put out when it sleeps.
 Generation = 4
-Evolutions = MONFERNO,Level,14
+Evolution = MONFERNO,Level,14
 #-------------------------------
 [MONFERNO]
 Name = Monferno
@@ -10324,7 +10347,7 @@ Shape = BipedalTail
 Category = Playful
 Pokedex = To intimidate attackers, it stretches the fire on its tail to make itself appear bigger.
 Generation = 4
-Evolutions = INFERNAPE,Level,36
+Evolution = INFERNAPE,Level,36
 #-------------------------------
 [INFERNAPE]
 Name = Infernape
@@ -10374,7 +10397,7 @@ Shape = Bipedal
 Category = Penguin
 Pokedex = Because it is very proud, it hates accepting food from people. Its thick down guards it from cold.
 Generation = 4
-Evolutions = PRINPLUP,Level,16
+Evolution = PRINPLUP,Level,16
 #-------------------------------
 [PRINPLUP]
 Name = Prinplup
@@ -10399,7 +10422,7 @@ Shape = BipedalTail
 Category = Penguin
 Pokedex = It lives alone, away from others. Apparently, every one of them believes it is the most important.
 Generation = 4
-Evolutions = EMPOLEON,Level,36
+Evolution = EMPOLEON,Level,36
 #-------------------------------
 [EMPOLEON]
 Name = Empoleon
@@ -10449,7 +10472,7 @@ Shape = Winged
 Category = Starling
 Pokedex = They flock in great numbers. Though small, they flap their wings with great power.
 Generation = 4
-Evolutions = STARAVIA,Level,14
+Evolution = STARAVIA,Level,14
 #-------------------------------
 [STARAVIA]
 Name = Staravia
@@ -10474,7 +10497,7 @@ Shape = Winged
 Category = Starling
 Pokedex = It flies around forests and fields in search of bug Pokémon. It stays within a huge flock.
 Generation = 4
-Evolutions = STARAPTOR,Level,34
+Evolution = STARAPTOR,Level,34
 #-------------------------------
 [STARAPTOR]
 Name = Staraptor
@@ -10524,7 +10547,7 @@ Shape = Quadruped
 Category = Plump Mouse
 Pokedex = With nerves of steel, nothing can perturb it. It is more agile and active than it appears.
 Generation = 4
-Evolutions = BIBAREL,Level,15
+Evolution = BIBAREL,Level,15
 #-------------------------------
 [BIBAREL]
 Name = Bibarel
@@ -10574,7 +10597,7 @@ Category = Cricket
 Pokedex = It shakes its head back to front, causing its antennae to hit each other and sound like a xylophone.
 Generation = 4
 WildItemUncommon = METRONOME
-Evolutions = KRICKETUNE,Level,10
+Evolution = KRICKETUNE,Level,10
 #-------------------------------
 [KRICKETUNE]
 Name = Kricketune
@@ -10625,7 +10648,7 @@ Shape = Quadruped
 Category = Flash
 Pokedex = All of its fur dazzles if danger is sensed. It flees while the foe is momentarily blinded.
 Generation = 4
-Evolutions = LUXIO,Level,15
+Evolution = LUXIO,Level,15
 #-------------------------------
 [LUXIO]
 Name = Luxio
@@ -10650,7 +10673,7 @@ Shape = Quadruped
 Category = Spark
 Pokedex = Its claws loose electricity with enough amperage to cause fainting. They live in small groups.
 Generation = 4
-Evolutions = LUXRAY,Level,30
+Evolution = LUXRAY,Level,30
 #-------------------------------
 [LUXRAY]
 Name = Luxray
@@ -10702,7 +10725,7 @@ Category = Bud
 Pokedex = Over the winter, it closes its bud and endures the cold. In spring, the bud opens and releases pollen.
 Generation = 4
 WildItemUncommon = POISONBARB
-Evolutions = ROSELIA,HappinessDay,
+Evolution = ROSELIA,HappinessDay
 #-------------------------------
 [ROSERADE]
 Name = Roserade
@@ -10753,7 +10776,7 @@ Shape = BipedalTail
 Category = Head Butt
 Pokedex = It lived in jungles around 100 million years ago. Its skull is as hard as iron.
 Generation = 4
-Evolutions = RAMPARDOS,Level,30
+Evolution = RAMPARDOS,Level,30
 #-------------------------------
 [RAMPARDOS]
 Name = Rampardos
@@ -10803,7 +10826,7 @@ Shape = Quadruped
 Category = Shield
 Pokedex = A Pokémon that lived in jungles around 100 million years ago. Its facial hide is extremely hard.
 Generation = 4
-Evolutions = BASTIODON,Level,30
+Evolution = BASTIODON,Level,30
 #-------------------------------
 [BASTIODON]
 Name = Bastiodon
@@ -10854,7 +10877,8 @@ Category = Bagworm
 Pokedex = To shelter itself from cold, wintry winds, it covers itself with a cloak made of twigs and leaves.
 Generation = 4
 Flags = InheritFormFromMother
-Evolutions = WORMADAM,LevelFemale,20,MOTHIM,LevelMale,20
+Evolution = WORMADAM,LevelFemale,20
+Evolution = MOTHIM,LevelMale,20
 #-------------------------------
 [WORMADAM]
 Name = Wormadam
@@ -10933,7 +10957,7 @@ Category = Tiny Bee
 Pokedex = A Pokémon formed by three others. It busily carries sweet floral honey to Vespiquen.
 Generation = 4
 WildItemUncommon = HONEY
-Evolutions = VESPIQUEN,LevelFemale,21
+Evolution = VESPIQUEN,LevelFemale,21
 #-------------------------------
 [VESPIQUEN]
 Name = Vespiquen
@@ -11009,7 +11033,7 @@ Shape = Quadruped
 Category = Sea Weasel
 Pokedex = It has a flotation sac that is like an inflatable collar. It floats on water with its head out.
 Generation = 4
-Evolutions = FLOATZEL,Level,26
+Evolution = FLOATZEL,Level,26
 #-------------------------------
 [FLOATZEL]
 Name = Floatzel
@@ -11059,7 +11083,7 @@ Category = Cherry
 Pokedex = The small ball holds the nutrients needed for evolution. Apparently, it is very sweet and tasty.
 Generation = 4
 WildItemUncommon = MIRACLESEED
-Evolutions = CHERRIM,Level,25
+Evolution = CHERRIM,Level,25
 #-------------------------------
 [CHERRIM]
 Name = Cherrim
@@ -11112,7 +11136,7 @@ Category = Sea Slug
 Pokedex = This Pokémon's habitat shapes its physique. According to some theories, life in warm ocean waters causes this variation to develop.
 Generation = 4
 Flags = InheritFormFromMother
-Evolutions = GASTRODON,Level,30
+Evolution = GASTRODON,Level,30
 #-------------------------------
 [GASTRODON]
 Name = Gastrodon
@@ -11188,7 +11212,7 @@ Shape = HeadArms
 Category = Balloon
 Pokedex = A Pokémon formed by the spirits of people and Pokémon. It loves damp, humid seasons.
 Generation = 4
-Evolutions = DRIFBLIM,Level,28
+Evolution = DRIFBLIM,Level,28
 #-------------------------------
 [DRIFBLIM]
 Name = Drifblim
@@ -11238,7 +11262,7 @@ Shape = BipedalTail
 Category = Rabbit
 Pokedex = It slams foes by sharply uncoiling its rolled ears. It stings enough to make a grown-up cry in pain.
 Generation = 4
-Evolutions = LOPUNNY,Happiness,
+Evolution = LOPUNNY,Happiness
 #-------------------------------
 [LOPUNNY]
 Name = Lopunny
@@ -11335,7 +11359,7 @@ Shape = Quadruped
 Category = Catty
 Pokedex = It claws if displeased and purrs when affectionate. Its fickleness is very popular among some.
 Generation = 4
-Evolutions = PURUGLY,Level,38
+Evolution = PURUGLY,Level,38
 #-------------------------------
 [PURUGLY]
 Name = Purugly
@@ -11386,7 +11410,7 @@ Category = Bell
 Pokedex = It emits cries by agitating an orb at the back of its throat. It moves with flouncing hops.
 Generation = 4
 WildItemUncommon = CLEANSETAG
-Evolutions = CHIMECHO,HappinessNight,
+Evolution = CHIMECHO,HappinessNight
 #-------------------------------
 [STUNKY]
 Name = Stunky
@@ -11412,7 +11436,7 @@ Shape = Quadruped
 Category = Skunk
 Pokedex = It protects itself by spraying a noxious fluid from its rear. The stench lingers for 24 hours.
 Generation = 4
-Evolutions = SKUNTANK,Level,34
+Evolution = SKUNTANK,Level,34
 #-------------------------------
 [SKUNTANK]
 Name = Skuntank
@@ -11462,7 +11486,7 @@ Category = Bronze
 Pokedex = Implements shaped like it were discovered in ancient tombs. It is unknown if they are related.
 Generation = 4
 WildItemUncommon = METALCOAT
-Evolutions = BRONZONG,Level,33
+Evolution = BRONZONG,Level,33
 #-------------------------------
 [BRONZONG]
 Name = Bronzong
@@ -11514,7 +11538,7 @@ Shape = HeadLegs
 Category = Bonsai
 Pokedex = It looks as if it is always crying. It is actually adjusting its body's fluid levels by eliminating excess.
 Generation = 4
-Evolutions = SUDOWOODO,HasMove,MIMIC
+Evolution = SUDOWOODO,HasMove,MIMIC
 #-------------------------------
 [MIMEJR]
 Name = Mime Jr.
@@ -11541,7 +11565,7 @@ Shape = Bipedal
 Category = Mime
 Pokedex = It habitually mimics foes. Once mimicked, the foe cannot take its eyes off this Pokémon.
 Generation = 4
-Evolutions = MRMIME,HasMove,MIMIC
+Evolution = MRMIME,HasMove,MIMIC
 #-------------------------------
 [HAPPINY]
 Name = Happiny
@@ -11569,7 +11593,7 @@ Category = Playhouse
 Pokedex = It loves round white things. It carries an egg-shaped rock in imitation of Chansey.
 Generation = 4
 WildItemCommon = OVALSTONE
-Evolutions = CHANSEY,DayHoldItem,OVALSTONE
+Evolution = CHANSEY,DayHoldItem,OVALSTONE
 #-------------------------------
 [CHATOT]
 Name = Chatot
@@ -11646,7 +11670,7 @@ Shape = BipedalTail
 Category = Land Shark
 Pokedex = It nests in small, horizontal holes in cave walls. It pounces to catch prey that stray too close.
 Generation = 4
-Evolutions = GABITE,Level,24
+Evolution = GABITE,Level,24
 #-------------------------------
 [GABITE]
 Name = Gabite
@@ -11671,7 +11695,7 @@ Shape = BipedalTail
 Category = Cave
 Pokedex = There is a long-held belief that medicine made from its scales will heal even incurable illnesses.
 Generation = 4
-Evolutions = GARCHOMP,Level,48
+Evolution = GARCHOMP,Level,48
 #-------------------------------
 [GARCHOMP]
 Name = Garchomp
@@ -11725,7 +11749,7 @@ Generation = 4
 WildItemCommon = LEFTOVERS
 WildItemUncommon = LEFTOVERS
 WildItemRare = LEFTOVERS
-Evolutions = SNORLAX,Happiness,
+Evolution = SNORLAX,Happiness
 #-------------------------------
 [RIOLU]
 Name = Riolu
@@ -11751,7 +11775,7 @@ Shape = BipedalTail
 Category = Emanation
 Pokedex = The aura that emanates from its body intensifies to alert others if it is afraid or sad.
 Generation = 4
-Evolutions = LUCARIO,HappinessDay,
+Evolution = LUCARIO,HappinessDay
 #-------------------------------
 [LUCARIO]
 Name = Lucario
@@ -11801,7 +11825,7 @@ Shape = Quadruped
 Category = Hippo
 Pokedex = It lives in arid places. Instead of perspiration, it expels grainy sand from its body.
 Generation = 4
-Evolutions = HIPPOWDON,Level,34
+Evolution = HIPPOWDON,Level,34
 #-------------------------------
 [HIPPOWDON]
 Name = Hippowdon
@@ -11852,7 +11876,7 @@ Category = Scorpion
 Pokedex = It grips prey with its tail claws and injects poison. It tenaciously hangs on until the poison takes.
 Generation = 4
 WildItemUncommon = POISONBARB
-Evolutions = DRAPION,Level,40
+Evolution = DRAPION,Level,40
 #-------------------------------
 [DRAPION]
 Name = Drapion
@@ -11904,7 +11928,7 @@ Category = Toxic Mouth
 Pokedex = Its cheeks hold poison sacs. It tries to catch foes off guard to jab them with toxic fingers.
 Generation = 4
 WildItemUncommon = BLACKSLUDGE
-Evolutions = TOXICROAK,Level,37
+Evolution = TOXICROAK,Level,37
 #-------------------------------
 [TOXICROAK]
 Name = Toxicroak
@@ -11979,7 +12003,7 @@ Shape = Finned
 Category = Wing Fish
 Pokedex = After long exposure to sunlight, the patterns on its tail fins shine vividly when darkness arrives.
 Generation = 4
-Evolutions = LUMINEON,Level,31
+Evolution = LUMINEON,Level,31
 #-------------------------------
 [LUMINEON]
 Name = Lumineon
@@ -12030,7 +12054,7 @@ Shape = Winged
 Category = Kite
 Pokedex = A friendly Pokémon that captures the subtle flows of seawater using its two antennae.
 Generation = 4
-Evolutions = MANTINE,HasInParty,REMORAID
+Evolution = MANTINE,HasInParty,REMORAID
 #-------------------------------
 [SNOVER]
 Name = Snover
@@ -12057,7 +12081,7 @@ Category = Frost Tree
 Pokedex = It lives on snowy mountains. Having had little contact with humans, it is boldly inquisitive.
 Generation = 4
 WildItemUncommon = NEVERMELTICE
-Evolutions = ABOMASNOW,Level,40
+Evolution = ABOMASNOW,Level,40
 #-------------------------------
 [ABOMASNOW]
 Name = Abomasnow
@@ -12943,7 +12967,7 @@ Shape = BipedalTail
 Category = Grass Snake
 Pokedex = They photosynthesize by bathing their tails in sunlight. When they are not feeling well, their tails droop.
 Generation = 5
-Evolutions = SERVINE,Level,17
+Evolution = SERVINE,Level,17
 #-------------------------------
 [SERVINE]
 Name = Servine
@@ -12968,7 +12992,7 @@ Shape = BipedalTail
 Category = Grass Snake
 Pokedex = They avoid attacks by sinking into the shadows of thick foliage. They retaliate with masterful whipping techniques.
 Generation = 5
-Evolutions = SERPERIOR,Level,36
+Evolution = SERPERIOR,Level,36
 #-------------------------------
 [SERPERIOR]
 Name = Serperior
@@ -13018,7 +13042,7 @@ Shape = Quadruped
 Category = Fire Pig
 Pokedex = It blows fire through its nose. When it catches a cold, the fire becomes pitch-black smoke instead.
 Generation = 5
-Evolutions = PIGNITE,Level,17
+Evolution = PIGNITE,Level,17
 #-------------------------------
 [PIGNITE]
 Name = Pignite
@@ -13043,7 +13067,7 @@ Shape = BipedalTail
 Category = Fire Pig
 Pokedex = Whatever it eats becomes fuel for the flame in its stomach. When it is angered, the intensity of the flame increases.
 Generation = 5
-Evolutions = EMBOAR,Level,36
+Evolution = EMBOAR,Level,36
 #-------------------------------
 [EMBOAR]
 Name = Emboar
@@ -13093,7 +13117,7 @@ Shape = BipedalTail
 Category = Sea Otter
 Pokedex = The scalchop on its stomach is made from the same elements as claws. It detaches the scalchop for use as a blade.
 Generation = 5
-Evolutions = DEWOTT,Level,17
+Evolution = DEWOTT,Level,17
 #-------------------------------
 [DEWOTT]
 Name = Dewott
@@ -13118,7 +13142,7 @@ Shape = BipedalTail
 Category = Discipline
 Pokedex = Scalchop techniques differ from one Dewott to another. It never neglects maintaining its scalchops.
 Generation = 5
-Evolutions = SAMUROTT,Level,36
+Evolution = SAMUROTT,Level,36
 #-------------------------------
 [SAMUROTT]
 Name = Samurott
@@ -13168,7 +13192,7 @@ Shape = Quadruped
 Category = Scout
 Pokedex = Extremely cautious, they take shifts to maintain a constant watch of their nest. They feel insecure without a lookout.
 Generation = 5
-Evolutions = WATCHOG,Level,20
+Evolution = WATCHOG,Level,20
 #-------------------------------
 [WATCHOG]
 Name = Watchog
@@ -13218,7 +13242,7 @@ Shape = Quadruped
 Category = Puppy
 Pokedex = The long hair around its face provides an amazing radar that lets it sense subtle changes in its surroundings.
 Generation = 5
-Evolutions = HERDIER,Level,16
+Evolution = HERDIER,Level,16
 #-------------------------------
 [HERDIER]
 Name = Herdier
@@ -13243,7 +13267,7 @@ Shape = Quadruped
 Category = Loyal Dog
 Pokedex = It loyally follows its Trainer's orders. For ages, they have helped Trainers raise Pokémon.
 Generation = 5
-Evolutions = STOUTLAND,Level,32
+Evolution = STOUTLAND,Level,32
 #-------------------------------
 [STOUTLAND]
 Name = Stoutland
@@ -13293,7 +13317,7 @@ Shape = Quadruped
 Category = Devious
 Pokedex = Its cute act is a ruse. When victims let down their guard, they find their items taken. It attacks with sharp claws.
 Generation = 5
-Evolutions = LIEPARD,Level,20
+Evolution = LIEPARD,Level,20
 #-------------------------------
 [LIEPARD]
 Name = Liepard
@@ -13343,7 +13367,7 @@ Shape = BipedalTail
 Category = Grass Monkey
 Pokedex = It shares the leaf on its head with weary-looking Pokémon. These leaves are known to relieve stress.
 Generation = 5
-Evolutions = SIMISAGE,Item,LEAFSTONE
+Evolution = SIMISAGE,Item,LEAFSTONE
 #-------------------------------
 [SIMISAGE]
 Name = Simisage
@@ -13393,7 +13417,7 @@ Shape = BipedalTail
 Category = High Temp
 Pokedex = This Pokémon lives in caves in volcanoes. The fire within the tuft on its head can reach 600º F.
 Generation = 5
-Evolutions = SIMISEAR,Item,FIRESTONE
+Evolution = SIMISEAR,Item,FIRESTONE
 #-------------------------------
 [SIMISEAR]
 Name = Simisear
@@ -13443,7 +13467,7 @@ Shape = BipedalTail
 Category = Spray
 Pokedex = It does not thrive in dry environments. It keeps itself damp by shooting water stored in its head tuft from its tail.
 Generation = 5
-Evolutions = SIMIPOUR,Item,WATERSTONE
+Evolution = SIMIPOUR,Item,WATERSTONE
 #-------------------------------
 [SIMIPOUR]
 Name = Simipour
@@ -13493,7 +13517,7 @@ Shape = Quadruped
 Category = Dream Eater
 Pokedex = It eats the dreams of people and Pokémon. When it eats a pleasant dreams, it expels pink-colored mist.
 Generation = 5
-Evolutions = MUSHARNA,Item,MOONSTONE
+Evolution = MUSHARNA,Item,MOONSTONE
 #-------------------------------
 [MUSHARNA]
 Name = Musharna
@@ -13543,7 +13567,7 @@ Shape = Winged
 Category = Tiny Pigeon
 Pokedex = These Pokémon live in cities. They are accustomed to people. Flocks often gather in parks and plazas.
 Generation = 5
-Evolutions = TRANQUILL,Level,21
+Evolution = TRANQUILL,Level,21
 #-------------------------------
 [TRANQUILL]
 Name = Tranquill
@@ -13568,7 +13592,7 @@ Shape = Winged
 Category = Wild Pigeon
 Pokedex = Many people believe that, deep in the forest where Tranquill live, there is a peaceful place where there is no war.
 Generation = 5
-Evolutions = UNFEZANT,Level,32
+Evolution = UNFEZANT,Level,32
 #-------------------------------
 [UNFEZANT]
 Name = Unfezant
@@ -13618,7 +13642,7 @@ Shape = Quadruped
 Category = Electrified
 Pokedex = When thunderclouds cover the sky, it will appear. It can catch lightning with its mane and store the electricity.
 Generation = 5
-Evolutions = ZEBSTRIKA,Level,27
+Evolution = ZEBSTRIKA,Level,27
 #-------------------------------
 [ZEBSTRIKA]
 Name = Zebstrika
@@ -13670,7 +13694,7 @@ Pokedex = They were discovered a hundred years ago in an earthquake fissure. Ins
 Generation = 5
 WildItemCommon = EVERSTONE
 WildItemUncommon = HARDSTONE
-Evolutions = BOLDORE,Level,25
+Evolution = BOLDORE,Level,25
 #-------------------------------
 [BOLDORE]
 Name = Boldore
@@ -13697,7 +13721,7 @@ Pokedex = Because its energy was too great to be contained, the energy leaked an
 Generation = 5
 WildItemCommon = EVERSTONE
 WildItemUncommon = HARDSTONE
-Evolutions = GIGALITH,Trade,
+Evolution = GIGALITH,Trade
 #-------------------------------
 [GIGALITH]
 Name = Gigalith
@@ -13749,7 +13773,7 @@ Shape = Winged
 Category = Bat
 Pokedex = Suction from its nostrils enables it to stick to cave walls during sleep. It leaves a heart-shaped mark behind.
 Generation = 5
-Evolutions = SWOOBAT,Happiness,
+Evolution = SWOOBAT,Happiness
 #-------------------------------
 [SWOOBAT]
 Name = Swoobat
@@ -13799,7 +13823,7 @@ Shape = BipedalTail
 Category = Mole
 Pokedex = It makes its way swiftly through the soil by putting both claws together and rotating at high speed.
 Generation = 5
-Evolutions = EXCADRILL,Level,31
+Evolution = EXCADRILL,Level,31
 #-------------------------------
 [EXCADRILL]
 Name = Excadrill
@@ -13876,7 +13900,7 @@ Shape = Bipedal
 Category = Muscular
 Pokedex = These Pokémon appear at building sites and help out with construction. They always carry squared logs.
 Generation = 5
-Evolutions = GURDURR,Level,25
+Evolution = GURDURR,Level,25
 #-------------------------------
 [GURDURR]
 Name = Gurdurr
@@ -13901,7 +13925,7 @@ Shape = Bipedal
 Category = Muscular
 Pokedex = They strengthen their bodies by carrying steel beams. They show off their big muscles to their friends.
 Generation = 5
-Evolutions = CONKELDURR,Trade,
+Evolution = CONKELDURR,Trade
 #-------------------------------
 [CONKELDURR]
 Name = Conkeldurr
@@ -13951,7 +13975,7 @@ Shape = Finned
 Category = Tadpole
 Pokedex = By vibrating its cheeks, it emits sound waves imperceptible to humans. It uses the rhythm of these sounds to talk.
 Generation = 5
-Evolutions = PALPITOAD,Level,25
+Evolution = PALPITOAD,Level,25
 #-------------------------------
 [PALPITOAD]
 Name = Palpitoad
@@ -13976,7 +14000,7 @@ Shape = BipedalTail
 Category = Vibration
 Pokedex = It lives in the water and on land. It uses its long, sticky tongue to capture prey.
 Generation = 5
-Evolutions = SEISMITOAD,Level,36
+Evolution = SEISMITOAD,Level,36
 #-------------------------------
 [SEISMITOAD]
 Name = Seismitoad
@@ -14077,7 +14101,7 @@ Category = Sewing
 Pokedex = This Pokémon makes clothes for itself. It chews up leaves and sews them with sticky thread extruded from its mouth.
 Generation = 5
 WildItemUncommon = MENTALHERB
-Evolutions = SWADLOON,Level,20
+Evolution = SWADLOON,Level,20
 #-------------------------------
 [SWADLOON]
 Name = Swadloon
@@ -14103,7 +14127,7 @@ Category = Leaf-Wrapped
 Pokedex = It protects itself from the cold by wrapping up in leaves. It stays on the move, eating leaves in forests.
 Generation = 5
 WildItemUncommon = MENTALHERB
-Evolutions = LEAVANNY,Happiness,
+Evolution = LEAVANNY,Happiness
 #-------------------------------
 [LEAVANNY]
 Name = Leavanny
@@ -14155,7 +14179,7 @@ Category = Centipede
 Pokedex = It discovers what is going on around it by using the feelers on its head and tail. It is brutally aggresive.
 Generation = 5
 WildItemUncommon = POISONBARB
-Evolutions = WHIRLIPEDE,Level,22
+Evolution = WHIRLIPEDE,Level,22
 #-------------------------------
 [WHIRLIPEDE]
 Name = Whirlipede
@@ -14181,7 +14205,7 @@ Category = Curlipede
 Pokedex = It is usually motionless, but when attacked, it rotates at high speed and then crashes into its opponent.
 Generation = 5
 WildItemUncommon = POISONBARB
-Evolutions = SCOLIPEDE,Level,30
+Evolution = SCOLIPEDE,Level,30
 #-------------------------------
 [SCOLIPEDE]
 Name = Scolipede
@@ -14233,7 +14257,7 @@ Category = Cotton Puff
 Pokedex = They go wherever the wind takes them. On rainy days, their bodies are heavier, so they take shelter beneath big trees.
 Generation = 5
 WildItemUncommon = ABSORBBULB
-Evolutions = WHIMSICOTT,Item,SUNSTONE
+Evolution = WHIMSICOTT,Item,SUNSTONE
 #-------------------------------
 [WHIMSICOTT]
 Name = Whimsicott
@@ -14285,7 +14309,7 @@ Category = Bulb
 Pokedex = Since they prefer moist, nutrient-rich soil, the areas where Petilil live are known to be good for growing plants.
 Generation = 5
 WildItemUncommon = ABSORBBULB
-Evolutions = LILLIGANT,Item,SUNSTONE
+Evolution = LILLIGANT,Item,SUNSTONE
 #-------------------------------
 [LILLIGANT]
 Name = Lilligant
@@ -14365,7 +14389,7 @@ Category = Desert Croc
 Pokedex = It moves along below the sand's surface, except for its nose and eyes. A dark membrane shields its eyes from the sun.
 Generation = 5
 WildItemUncommon = BLACKGLASSES
-Evolutions = KROKOROK,Level,29
+Evolution = KROKOROK,Level,29
 #-------------------------------
 [KROKOROK]
 Name = Krokorok
@@ -14391,7 +14415,7 @@ Category = Desert Croc
 Pokedex = The special membrane covering its eyes can sense the heat of objects, so it can see its surroundings, even in darkness.
 Generation = 5
 WildItemUncommon = BLACKGLASSES
-Evolutions = KROOKODILE,Level,40
+Evolution = KROOKODILE,Level,40
 #-------------------------------
 [KROOKODILE]
 Name = Krookodile
@@ -14442,7 +14466,7 @@ Shape = Bipedal
 Category = Zen Charm
 Pokedex = Darumaka's droppings are hot, so people used to put them in their clothes to keep themselves warm.
 Generation = 5
-Evolutions = DARMANITAN,Level,35
+Evolution = DARMANITAN,Level,35
 #-------------------------------
 [DARMANITAN]
 Name = Darmanitan
@@ -14520,7 +14544,7 @@ Category = Rock Inn
 Pokedex = It makes a hole in a suitable rock. If that rock breaks, the Pokémon remains agitated until it locates a replacement.
 Generation = 5
 WildItemUncommon = HARDSTONE
-Evolutions = CRUSTLE,Level,34
+Evolution = CRUSTLE,Level,34
 #-------------------------------
 [CRUSTLE]
 Name = Crustle
@@ -14572,7 +14596,7 @@ Category = Shedding
 Pokedex = It immediately headbutts anyone that makes eye contact with it. Its skull is massively thick.
 Generation = 5
 WildItemUncommon = SHEDSHELL
-Evolutions = SCRAFTY,Level,39
+Evolution = SCRAFTY,Level,39
 #-------------------------------
 [SCRAFTY]
 Name = Scrafty
@@ -14648,7 +14672,8 @@ Category = Spirit
 Pokedex = These Pokémon arose from the spirits of people interred in graves in past ages. Each retains memories of its former life.
 Generation = 5
 WildItemUncommon = SPELLTAG
-Evolutions = COFAGRIGUS,Level,34,RUNERIGUS,None,
+Evolution = COFAGRIGUS,Level,34
+Evolution = RUNERIGUS,None
 #-------------------------------
 [COFAGRIGUS]
 Name = Cofagrigus
@@ -14698,7 +14723,7 @@ Shape = Quadruped
 Category = Prototurtle
 Pokedex = About 100 million years ago, these Pokémon swam in oceans. It is thought they also went on land to attack prey.
 Generation = 5
-Evolutions = CARRACOSTA,Level,37
+Evolution = CARRACOSTA,Level,37
 #-------------------------------
 [CARRACOSTA]
 Name = Carracosta
@@ -14747,7 +14772,7 @@ Shape = Winged
 Category = First Bird
 Pokedex = Revived from a fossil, this Pokémon is thought to be the ancestor of all bird Pokémon.
 Generation = 5
-Evolutions = ARCHEOPS,Level,37
+Evolution = ARCHEOPS,Level,37
 #-------------------------------
 [ARCHEOPS]
 Name = Archeops
@@ -14797,7 +14822,7 @@ Category = Trash Bag
 Pokedex = The combination of garbage bags and industrial waste caused the chemical reaction that crated this Pokémon.
 Generation = 5
 WildItemUncommon = SILKSCARF
-Evolutions = GARBODOR,Level,36
+Evolution = GARBODOR,Level,36
 #-------------------------------
 [GARBODOR]
 Name = Garbodor
@@ -14848,7 +14873,7 @@ Shape = Quadruped
 Category = Tricky Fox
 Pokedex = To protect themselves from danger, they hide their true identities by transforming into people and Pokémon.
 Generation = 5
-Evolutions = ZOROARK,Level,30
+Evolution = ZOROARK,Level,30
 #-------------------------------
 [ZOROARK]
 Name = Zoroark
@@ -14897,7 +14922,7 @@ Shape = Quadruped
 Category = Chinchilla
 Pokedex = These Pokémon prefer a tidy habitat. They are always sweeping and dusting, using their tails as brooms.
 Generation = 5
-Evolutions = CINCCINO,Item,SHINYSTONE
+Evolution = CINCCINO,Item,SHINYSTONE
 #-------------------------------
 [CINCCINO]
 Name = Cinccino
@@ -14947,7 +14972,7 @@ Shape = Bipedal
 Category = Fixation
 Pokedex = They intently observe both Trainers and Pokémon. Apparently, they are looking at something that only Gothita can see.
 Generation = 5
-Evolutions = GOTHORITA,Level,32
+Evolution = GOTHORITA,Level,32
 #-------------------------------
 [GOTHORITA]
 Name = Gothorita
@@ -14972,7 +14997,7 @@ Shape = Bipedal
 Category = Manipulate
 Pokedex = Starlight is the source of their power. At night, they mark star positions by using psychic power to float stones.
 Generation = 5
-Evolutions = GOTHITELLE,Level,41
+Evolution = GOTHITELLE,Level,41
 #-------------------------------
 [GOTHITELLE]
 Name = Gothitelle
@@ -15022,7 +15047,7 @@ Shape = Head
 Category = Cell
 Pokedex = Because their bodies are enveloped in a special liquid, they can survive in any environment.
 Generation = 5
-Evolutions = DUOSION,Level,32
+Evolution = DUOSION,Level,32
 #-------------------------------
 [DUOSION]
 Name = Duosion
@@ -15047,7 +15072,7 @@ Shape = Head
 Category = Mitosis
 Pokedex = When their brains, now divided in two, are thinking the same thoughts, these Pokémon exhibit their maximum power.
 Generation = 5
-Evolutions = REUNICLUS,Level,41
+Evolution = REUNICLUS,Level,41
 #-------------------------------
 [REUNICLUS]
 Name = Reuniclus
@@ -15097,7 +15122,7 @@ Shape = Winged
 Category = Water Bird
 Pokedex = When attacked, it uses its feathers to splash water, escaping under cover of the spray.
 Generation = 5
-Evolutions = SWANNA,Level,35
+Evolution = SWANNA,Level,35
 #-------------------------------
 [SWANNA]
 Name = Swanna
@@ -15148,7 +15173,7 @@ Category = Fresh Snow
 Pokedex = This Pokémon formed from icicles bathed in energy from the morning sun. It sleeps buried in snow.
 Generation = 5
 WildItemUncommon = NEVERMELTICE
-Evolutions = VANILLISH,Level,35
+Evolution = VANILLISH,Level,35
 #-------------------------------
 [VANILLISH]
 Name = Vanillish
@@ -15174,7 +15199,7 @@ Category = Icy Snow
 Pokedex = It conceals itself from enemy eyes by creating many small ice particles and hiding among them.
 Generation = 5
 WildItemUncommon = NEVERMELTICE
-Evolutions = VANILLUXE,Level,47
+Evolution = VANILLUXE,Level,47
 #-------------------------------
 [VANILLUXE]
 Name = Vanilluxe
@@ -15226,7 +15251,7 @@ Shape = Quadruped
 Category = Season
 Pokedex = The turning of the seasons changes the color and scent of this Pokémon's fur. People use it to mark the seasons.
 Generation = 5
-Evolutions = SAWSBUCK,Level,34
+Evolution = SAWSBUCK,Level,34
 #-------------------------------
 [SAWSBUCK]
 Name = Sawsbuck
@@ -15302,7 +15327,7 @@ Shape = Bipedal
 Category = Clamping
 Pokedex = When they feel threatened, they spit an acidic liquid to drive attackers away. This Pokémon targets Shelmet.
 Generation = 5
-Evolutions = ESCAVALIER,TradeSpecies,SHELMET
+Evolution = ESCAVALIER,TradeSpecies,SHELMET
 #-------------------------------
 [ESCAVALIER]
 Name = Escavalier
@@ -15354,7 +15379,7 @@ Pokedex = For some reason, this Pokémon resembles a Poké Ball. They release po
 Generation = 5
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = AMOONGUSS,Level,39
+Evolution = AMOONGUSS,Level,39
 #-------------------------------
 [AMOONGUSS]
 Name = Amoonguss
@@ -15406,7 +15431,7 @@ Shape = Multiped
 Category = Floating
 Pokedex = They paralyze prey with poison, then drag them down to their lairs, five miles below the surface.
 Generation = 5
-Evolutions = JELLICENT,Level,40
+Evolution = JELLICENT,Level,40
 #-------------------------------
 [JELLICENT]
 Name = Jellicent
@@ -15481,7 +15506,7 @@ Shape = Insectoid
 Category = Attaching
 Pokedex = They attach themselves to large-bodied Pokémon and absorb static electricity, which they store in an electric pouch.
 Generation = 5
-Evolutions = GALVANTULA,Level,36
+Evolution = GALVANTULA,Level,36
 #-------------------------------
 [GALVANTULA]
 Name = Galvantula
@@ -15531,7 +15556,7 @@ Category = Thorn Seed
 Pokedex = They stick their spikes into cave walls and absorb the minerals they find in the rock.
 Generation = 5
 WildItemUncommon = STICKYBARB
-Evolutions = FERROTHORN,Level,40
+Evolution = FERROTHORN,Level,40
 #-------------------------------
 [FERROTHORN]
 Name = Ferrothorn
@@ -15581,7 +15606,7 @@ Shape = MultiBody
 Category = Gear
 Pokedex = Interlocking two bodies and spinning around generates the energy they need to live.
 Generation = 5
-Evolutions = KLANG,Level,38
+Evolution = KLANG,Level,38
 #-------------------------------
 [KLANG]
 Name = Klang
@@ -15606,7 +15631,7 @@ Shape = MultiBody
 Category = Gear
 Pokedex = Spinning minigears are rotated at high speed and repeatedly fired away. It is dangerous if the gears don't return.
 Generation = 5
-Evolutions = KLINKLANG,Level,49
+Evolution = KLINKLANG,Level,49
 #-------------------------------
 [KLINKLANG]
 Name = Klinklang
@@ -15654,7 +15679,7 @@ Shape = Finned
 Category = EleFish
 Pokedex = These Pokémon move in schools. They have an electricity-generating organ, so they discharge electricity if in danger.
 Generation = 5
-Evolutions = EELEKTRIK,Level,39
+Evolution = EELEKTRIK,Level,39
 #-------------------------------
 [EELEKTRIK]
 Name = Eelektrik
@@ -15678,7 +15703,7 @@ Shape = Finned
 Category = EleFish
 Pokedex = These Pokémon have a big appetite. When they spot their prey, they attack it and paralyze it with electricity.
 Generation = 5
-Evolutions = EELEKTROSS,Item,THUNDERSTONE
+Evolution = EELEKTROSS,Item,THUNDERSTONE
 #-------------------------------
 [EELEKTROSS]
 Name = Eelektross
@@ -15727,7 +15752,7 @@ Shape = BipedalTail
 Category = Cerebral
 Pokedex = This Pokémon had never been seen until it appeared from far in the desert 50 years ago.
 Generation = 5
-Evolutions = BEHEEYEM,Level,42
+Evolution = BEHEEYEM,Level,42
 #-------------------------------
 [BEHEEYEM]
 Name = Beheeyem
@@ -15777,7 +15802,7 @@ Shape = HeadBase
 Category = Candle
 Pokedex = While shining a light and pretending to be a guide, it leeches off the life force of any who follow it.
 Generation = 5
-Evolutions = LAMPENT,Level,41
+Evolution = LAMPENT,Level,41
 #-------------------------------
 [LAMPENT]
 Name = Lampent
@@ -15802,7 +15827,7 @@ Shape = HeadArms
 Category = Lamp
 Pokedex = It arrives near the moment of death and steals spirit from the body.
 Generation = 5
-Evolutions = CHANDELURE,Item,DUSKSTONE
+Evolution = CHANDELURE,Item,DUSKSTONE
 #-------------------------------
 [CHANDELURE]
 Name = Chandelure
@@ -15852,7 +15877,7 @@ Shape = BipedalTail
 Category = Tusk
 Pokedex = They mark their territory by leaving gashes in trees with their tusks. If a tusk breaks, a new one grows in quickly.
 Generation = 5
-Evolutions = FRAXURE,Level,38
+Evolution = FRAXURE,Level,38
 #-------------------------------
 [FRAXURE]
 Name = Fraxure
@@ -15877,7 +15902,7 @@ Shape = BipedalTail
 Category = Axe Jaw
 Pokedex = Their tusks can shatter rocks. Territory battles between Fraxure can be intensely violent.
 Generation = 5
-Evolutions = HAXORUS,Level,48
+Evolution = HAXORUS,Level,48
 #-------------------------------
 [HAXORUS]
 Name = Haxorus
@@ -15927,7 +15952,7 @@ Shape = BipedalTail
 Category = Chill
 Pokedex = Its nose is always running. It sniffs the snot back up because the mucus provides the raw material for its moves.
 Generation = 5
-Evolutions = BEARTIC,Level,37
+Evolution = BEARTIC,Level,37
 #-------------------------------
 [BEARTIC]
 Name = Beartic
@@ -16001,7 +16026,7 @@ Shape = Head
 Category = Snail
 Pokedex = It evolves when bathed in an electric-like energy along with Karrablast. The reason is still unknown.
 Generation = 5
-Evolutions = ACCELGOR,TradeSpecies,KARRABLAST
+Evolution = ACCELGOR,TradeSpecies,KARRABLAST
 #-------------------------------
 [ACCELGOR]
 Name = Accelgor
@@ -16077,7 +16102,7 @@ Shape = BipedalTail
 Category = Martial Arts
 Pokedex = They have mastered elegant combos. As they concentrate, their battle moves become swifter and more precise.
 Generation = 5
-Evolutions = MIENSHAO,Level,50
+Evolution = MIENSHAO,Level,50
 #-------------------------------
 [MIENSHAO]
 Name = Mienshao
@@ -16153,7 +16178,7 @@ Category = Automaton
 Pokedex = These Pokémon are thought to have been created by the science of an ancient and mysterious civilization.
 Generation = 5
 WildItemUncommon = LIGHTCLAY
-Evolutions = GOLURK,Level,43
+Evolution = GOLURK,Level,43
 #-------------------------------
 [GOLURK]
 Name = Golurk
@@ -16204,7 +16229,7 @@ Shape = Bipedal
 Category = Sharp Blade
 Pokedex = They fight at Bisharp's command. They cling to their prey and inflict damage by sinking their blades into it.
 Generation = 5
-Evolutions = BISHARP,Level,52
+Evolution = BISHARP,Level,52
 #-------------------------------
 [BISHARP]
 Name = Bisharp
@@ -16278,7 +16303,7 @@ Shape = Winged
 Category = Eaglet
 Pokedex = They will challenge anything, even strong opponents, without fear. Their frequent fights help them become stronger.
 Generation = 5
-Evolutions = BRAVIARY,Level,54
+Evolution = BRAVIARY,Level,54
 #-------------------------------
 [BRAVIARY]
 Name = Braviary
@@ -16328,7 +16353,7 @@ Shape = Winged
 Category = Diapered
 Pokedex = They tend to guard their posteriors with suitable bones they have found. They pursue weak Pokémon.
 Generation = 5
-Evolutions = MANDIBUZZ,Level,54
+Evolution = MANDIBUZZ,Level,54
 #-------------------------------
 [MANDIBUZZ]
 Name = Mandibuzz
@@ -16427,7 +16452,7 @@ Shape = Quadruped
 Category = Irate
 Pokedex = They cannot see, so they tackle and bite to learn about their surroundings. Their bodies are covered in wounds.
 Generation = 5
-Evolutions = ZWEILOUS,Level,50
+Evolution = ZWEILOUS,Level,50
 #-------------------------------
 [ZWEILOUS]
 Name = Zweilous
@@ -16451,7 +16476,7 @@ Shape = Quadruped
 Category = Hostile
 Pokedex = Since their two heads do not get along and compete with each other for food, they always eat too much.
 Generation = 5
-Evolutions = HYDREIGON,Level,64
+Evolution = HYDREIGON,Level,64
 #-------------------------------
 [HYDREIGON]
 Name = Hydreigon
@@ -16500,7 +16525,7 @@ Shape = Insectoid
 Category = Torch
 Pokedex = The base of volcanoes is where they make their homes. They shoot fire from their five horns to repel attacking enemies.
 Generation = 5
-Evolutions = VOLCARONA,Level,59
+Evolution = VOLCARONA,Level,59
 #-------------------------------
 [VOLCARONA]
 Name = Volcarona
@@ -16853,7 +16878,7 @@ Shape = BipedalTail
 Category = Spiny Nut
 Pokedex = The quills on its head are usually soft. When it flexes them, the points become so hard and sharp that they can pierce rock.
 Generation = 6
-Evolutions = QUILLADIN,Level,16
+Evolution = QUILLADIN,Level,16
 #-------------------------------
 [QUILLADIN]
 Name = Quilladin
@@ -16878,7 +16903,7 @@ Shape = BipedalTail
 Category = Spiny Armor
 Pokedex = They strengthen their lower bodies by running into one another. They are very kind and won't start fights.
 Generation = 6
-Evolutions = CHESNAUGHT,Level,36
+Evolution = CHESNAUGHT,Level,36
 #-------------------------------
 [CHESNAUGHT]
 Name = Chesnaught
@@ -16928,7 +16953,7 @@ Shape = Quadruped
 Category = Fox
 Pokedex = As it walks, it munches on a twig in place of a snack. It intimidates opponents by puffing hot air out of its ears.
 Generation = 6
-Evolutions = BRAIXEN,Level,16
+Evolution = BRAIXEN,Level,16
 #-------------------------------
 [BRAIXEN]
 Name = Braixen
@@ -16953,7 +16978,7 @@ Shape = BipedalTail
 Category = Fox
 Pokedex = When the twig is plucked from its tail, friction sets the twig alight. The flame is used to send signals to its allies.
 Generation = 6
-Evolutions = DELPHOX,Level,36
+Evolution = DELPHOX,Level,36
 #-------------------------------
 [DELPHOX]
 Name = Delphox
@@ -17003,7 +17028,7 @@ Shape = Quadruped
 Category = Bubble Frog
 Pokedex = It protects its skin by covering its body in delicate bubbles. Beneath its happy-go-lucky air, it keeps a watchful eye on its surroundings.
 Generation = 6
-Evolutions = FROGADIER,Level,16
+Evolution = FROGADIER,Level,16
 #-------------------------------
 [FROGADIER]
 Name = Frogadier
@@ -17028,7 +17053,7 @@ Shape = Bipedal
 Category = Bubble Frog
 Pokedex = It can throw bubble-covered pebbles with precise control, hitting empty cans up to a hundred feet away.
 Generation = 6
-Evolutions = GRENINJA,Level,36
+Evolution = GRENINJA,Level,36
 #-------------------------------
 [GRENINJA]
 Name = Greninja
@@ -17078,7 +17103,7 @@ Shape = BipedalTail
 Category = Digging
 Pokedex = It has ears like shovels. Digging holes strengthens its ears so much that they can sever thick roots effortlessly.
 Generation = 6
-Evolutions = DIGGERSBY,Level,20
+Evolution = DIGGERSBY,Level,20
 #-------------------------------
 [DIGGERSBY]
 Name = Diggersby
@@ -17128,7 +17153,7 @@ Shape = Winged
 Category = Tiny Robin
 Pokedex = These friendly Pokémon send signals to one another with beautiful chirps and tail-feather movements.
 Generation = 6
-Evolutions = FLETCHINDER,Level,17
+Evolution = FLETCHINDER,Level,17
 #-------------------------------
 [FLETCHINDER]
 Name = Fletchinder
@@ -17153,7 +17178,7 @@ Shape = Winged
 Category = Ember
 Pokedex = From its beak, it expels embers that set the tall grass on fire. Then it pounces on the bewildered prey that pop out of the grass.
 Generation = 6
-Evolutions = TALONFLAME,Level,35
+Evolution = TALONFLAME,Level,35
 #-------------------------------
 [TALONFLAME]
 Name = Talonflame
@@ -17203,7 +17228,7 @@ Shape = Insectoid
 Category = Scatterdust
 Pokedex = When under attack from bird Pokémon, it spews a poisonous black powder that causes paralysis on contact.
 Generation = 6
-Evolutions = SPEWPA,Level,9
+Evolution = SPEWPA,Level,9
 #-------------------------------
 [SPEWPA]
 Name = Spewpa
@@ -17228,7 +17253,7 @@ Shape = HeadBase
 Category = Scatterdust
 Pokedex = It lives hidden within thicket shadows. When predators attack, it quickly bristles the fur covering its body in an effort to threaten them.
 Generation = 6
-Evolutions = VIVILLON,Level,12
+Evolution = VIVILLON,Level,12
 #-------------------------------
 [VIVILLON]
 Name = Vivillon
@@ -17279,7 +17304,7 @@ Shape = Quadruped
 Category = Lion Cub
 Pokedex = They set off on their own from their pride and live by themselves to become stronger. These hot-blooded Pokémon are quick to fight.
 Generation = 6
-Evolutions = PYROAR,Level,35
+Evolution = PYROAR,Level,35
 #-------------------------------
 [PYROAR]
 Name = Pyroar
@@ -17331,7 +17356,7 @@ Category = Single Bloom
 Pokedex = When it finds a flower it likes, it dwells on that flower its whole life long. It floats in the wind's embrace with an untroubled heart.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = FLOETTE,Level,19
+Evolution = FLOETTE,Level,19
 #-------------------------------
 [FLOETTE]
 Name = Floette
@@ -17358,7 +17383,7 @@ Category = Single Bloom
 Pokedex = It flutters around fields of flowers and cares for flowers that are starting to wilt. It draws out the power of flowers to battle.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = FLORGES,Item,SHINYSTONE
+Evolution = FLORGES,Item,SHINYSTONE
 #-------------------------------
 [FLORGES]
 Name = Florges
@@ -17410,7 +17435,7 @@ Shape = Quadruped
 Category = Mount
 Pokedex = If it has sunshine and water, it doesn't need to eat, because it can generate energy from the leaves on its back.
 Generation = 6
-Evolutions = GOGOAT,Level,32
+Evolution = GOGOAT,Level,32
 #-------------------------------
 [GOGOAT]
 Name = Gogoat
@@ -17461,7 +17486,7 @@ Category = Playful
 Pokedex = It does its best to be taken seriously by its enemies, but its glare is not sufficiently intimidating. Chewing on a leaf is its trademark.
 Generation = 6
 WildItemUncommon = MENTALHERB
-Evolutions = PANGORO,LevelDarkInParty,32
+Evolution = PANGORO,LevelDarkInParty,32
 #-------------------------------
 [PANGORO]
 Name = Pangoro
@@ -17537,7 +17562,7 @@ Shape = BipedalTail
 Category = Restraint
 Pokedex = The organ that emits its intense psychic power is sheltered by its ears to keep power from leaking out.
 Generation = 6
-Evolutions = MEOWSTIC,Level,25
+Evolution = MEOWSTIC,Level,25
 #-------------------------------
 [MEOWSTIC]
 Name = Meowstic
@@ -17587,7 +17612,7 @@ Shape = HeadBase
 Category = Sword
 Pokedex = Apparently this Pokémon is born when a departed spirit inhabits a sword. It attaches itself to people and drinks their life force.
 Generation = 6
-Evolutions = DOUBLADE,Level,35
+Evolution = DOUBLADE,Level,35
 #-------------------------------
 [DOUBLADE]
 Name = Doublade
@@ -17611,7 +17636,7 @@ Shape = MultiBody
 Category = Sword
 Pokedex = The complex attack patterns of its two swords are unstoppable, even for an opponent greatly accomplished at swordplay.
 Generation = 6
-Evolutions = AEGISLASH,Item,DUSKSTONE
+Evolution = AEGISLASH,Item,DUSKSTONE
 #-------------------------------
 [AEGISLASH]
 Name = Aegislash
@@ -17661,7 +17686,7 @@ Shape = HeadArms
 Category = Perfume
 Pokedex = It emits a scent that enraptures those who smell it. This fragrance changes depending on what it has eaten.
 Generation = 6
-Evolutions = AROMATISSE,TradeItem,SACHET
+Evolution = AROMATISSE,TradeItem,SACHET
 #-------------------------------
 [AROMATISSE]
 Name = Aromatisse
@@ -17711,7 +17736,7 @@ Shape = HeadLegs
 Category = Cotton Candy
 Pokedex = To entangle its opponents in battle, it extrudes white threads as sweet and sticky as cotton candy.
 Generation = 6
-Evolutions = SLURPUFF,TradeItem,WHIPPEDDREAM
+Evolution = SLURPUFF,TradeItem,WHIPPEDDREAM
 #-------------------------------
 [SLURPUFF]
 Name = Slurpuff
@@ -17761,7 +17786,7 @@ Shape = Multiped
 Category = Revolving
 Pokedex = It flashes the light-emitting spots on its body, which drains its opponent's will to fight. It takes the opportunity to scuttle away and hide.
 Generation = 6
-Evolutions = MALAMAR,Level,30
+Evolution = MALAMAR,Level,30
 #-------------------------------
 [MALAMAR]
 Name = Malamar
@@ -17811,7 +17836,7 @@ Shape = MultiBody
 Category = Two-Handed
 Pokedex = They stretch and then contract, yanking their rocks along with them in bold hops. They eat seaweed that washes up on the shoreline.
 Generation = 6
-Evolutions = BARBARACLE,Level,39
+Evolution = BARBARACLE,Level,39
 #-------------------------------
 [BARBARACLE]
 Name = Barbaracle
@@ -17861,7 +17886,7 @@ Shape = HeadBase
 Category = Mock Kelp
 Pokedex = Camouflaged as rotten kelp, they spray liquid poison on prey that approaches unawares and then finish it off.
 Generation = 6
-Evolutions = DRAGALGE,Level,48
+Evolution = DRAGALGE,Level,48
 #-------------------------------
 [DRAGALGE]
 Name = Dragalge
@@ -17910,7 +17935,7 @@ Shape = Insectoid
 Category = Water Gun
 Pokedex = Through controlled expulsions of internal gas, it can expel water like a pistol shot. At close distances, it can shatter rock.
 Generation = 6
-Evolutions = CLAWITZER,Level,37
+Evolution = CLAWITZER,Level,37
 #-------------------------------
 [CLAWITZER]
 Name = Clawitzer
@@ -17959,7 +17984,7 @@ Shape = BipedalTail
 Category = Generator
 Pokedex = They make their home in deserts. They can generate their energy from basking in the sun, so eating food is not a requirement.
 Generation = 6
-Evolutions = HELIOLISK,Item,SUNSTONE
+Evolution = HELIOLISK,Item,SUNSTONE
 #-------------------------------
 [HELIOLISK]
 Name = Heliolisk
@@ -18009,7 +18034,7 @@ Shape = BipedalTail
 Category = Royal Heir
 Pokedex = Its immense jaws have enough destructive force that it can chew up an automobile. It lived 100 million years ago.
 Generation = 6
-Evolutions = TYRANTRUM,LevelDay,39
+Evolution = TYRANTRUM,LevelDay,39
 #-------------------------------
 [TYRANTRUM]
 Name = Tyrantrum
@@ -18059,7 +18084,7 @@ Shape = Quadruped
 Category = Tundra
 Pokedex = This ancient Pokémon was restored from part of its body that had been frozen in ice for over 100 million years.
 Generation = 6
-Evolutions = AURORUS,LevelNight,39
+Evolution = AURORUS,LevelNight,39
 #-------------------------------
 [AURORUS]
 Name = Aurorus
@@ -18209,7 +18234,7 @@ Category = Soft Tissue
 Pokedex = Its source of protection is its slimy, germ-laden mucous membrane. Anyone who touches it needs some thorough hand-washing.
 Generation = 6
 WildItemUncommon = SHEDSHELL
-Evolutions = SLIGGOO,Level,40
+Evolution = SLIGGOO,Level,40
 #-------------------------------
 [SLIGGOO]
 Name = Sliggoo
@@ -18235,7 +18260,7 @@ Category = Soft Tissue
 Pokedex = This Pokémon's mucous can dissolve anything. Toothless, it sprays mucous on its prey. Once they're nicely dissolved, it slurps them up.
 Generation = 6
 WildItemUncommon = SHEDSHELL
-Evolutions = GOODRA,LevelRain,50
+Evolution = GOODRA,LevelRain,50
 #-------------------------------
 [GOODRA]
 Name = Goodra
@@ -18310,7 +18335,7 @@ Shape = HeadArms
 Category = Stump
 Pokedex = These Pokémon are stumps possessed by the spirits of children who died in the forest. Their cries sound like eerie screams.
 Generation = 6
-Evolutions = TREVENANT,Trade,
+Evolution = TREVENANT,Trade
 #-------------------------------
 [TREVENANT]
 Name = Trevenant
@@ -18361,7 +18386,7 @@ Category = Pumpkin
 Pokedex = When taking spirits to the afterlife, small Pumpkaboo prefer the spirits of children to those of adults.
 Generation = 6
 Flags = InheritFormFromMother
-Evolutions = GOURGEIST,Trade,
+Evolution = GOURGEIST,Trade
 #-------------------------------
 [GOURGEIST]
 Name = Gourgeist
@@ -18412,7 +18437,7 @@ Shape = Quadruped
 Category = Ice Chunk
 Pokedex = It blocks opponents' attacks with the ice that shields its body. It uses cold air to repair any cracks with new ice.
 Generation = 6
-Evolutions = AVALUGG,Level,37
+Evolution = AVALUGG,Level,37
 #-------------------------------
 [AVALUGG]
 Name = Avalugg
@@ -18462,7 +18487,7 @@ Shape = Winged
 Category = Sound Wave
 Pokedex = Even a robust wrestler will become dizzy and unable to stand when exposed to its 200,000-hertz ultrasonic waves.
 Generation = 6
-Evolutions = NOIVERN,Level,48
+Evolution = NOIVERN,Level,48
 #-------------------------------
 [NOIVERN]
 Name = Noivern
@@ -18659,7 +18684,7 @@ Shape = Winged
 Category = Grass Quill
 Pokedex = It sends its feathers, which are as sharp as blades, flying in attack. Its legs are strong, so its kicks are also formidable.
 Generation = 7
-Evolutions = DARTRIX,Level,17
+Evolution = DARTRIX,Level,17
 #-------------------------------
 [DARTRIX]
 Name = Dartrix
@@ -18684,7 +18709,7 @@ Shape = Winged
 Category = Blade Quill
 Pokedex = A bit of a dandy, it spends its free time preening its wings. Its preoccupation with any dirt on its plumage can leave it unable to battle.
 Generation = 7
-Evolutions = DECIDUEYE,Level,34
+Evolution = DECIDUEYE,Level,34
 #-------------------------------
 [DECIDUEYE]
 Name = Decidueye
@@ -18734,7 +18759,7 @@ Shape = Quadruped
 Category = Fire Cat
 Pokedex = Its coat regrows twice a year. When the time comes, Litten sets its own body on fire and burns away the old fur.
 Generation = 7
-Evolutions = TORRACAT,Level,17
+Evolution = TORRACAT,Level,17
 #-------------------------------
 [TORRACAT]
 Name = Torracat
@@ -18759,7 +18784,7 @@ Shape = Quadruped
 Category = Fire Cat
 Pokedex = It can act spoiled if it grows close to its Trainer. A powerful Pokémon, its sharp claws can leave its Trainer's whole body covered in scratches.
 Generation = 7
-Evolutions = INCINEROAR,Level,34
+Evolution = INCINEROAR,Level,34
 #-------------------------------
 [INCINEROAR]
 Name = Incineroar
@@ -18809,7 +18834,7 @@ Shape = Finned
 Category = Sea Lion
 Pokedex = This Pokémon snorts body fluids from its nose, blowing balloons to smash into its foes. It's famous for being a hard worker.
 Generation = 7
-Evolutions = BRIONNE,Level,17
+Evolution = BRIONNE,Level,17
 #-------------------------------
 [BRIONNE]
 Name = Brionne
@@ -18834,7 +18859,7 @@ Shape = Finned
 Category = Pop Star
 Pokedex = It gets excited when it sees a dance it doesn't know. This hard worker practices diligently until it can learn that dance.
 Generation = 7
-Evolutions = PRIMARINA,Level,34
+Evolution = PRIMARINA,Level,34
 #-------------------------------
 [PRIMARINA]
 Name = Primarina
@@ -18885,7 +18910,7 @@ Category = Woodpecker
 Pokedex = It pecks at trees with its hard beak. You can get some idea of its mood or condition from the rhythm of its pecking.
 Generation = 7
 WildItemUncommon = ORANBERRY
-Evolutions = TRUMBEAK,Level,14
+Evolution = TRUMBEAK,Level,14
 #-------------------------------
 [TRUMBEAK]
 Name = Trumbeak
@@ -18911,7 +18936,7 @@ Category = Bugle Beak
 Pokedex = It eats berries and stores their seeds in its beak. When it encounters enemies or prey, it fires off all the seeds in a burst.
 Generation = 7
 WildItemUncommon = SITRUSBERRY
-Evolutions = TOUCANNON,Level,28
+Evolution = TOUCANNON,Level,28
 #-------------------------------
 [TOUCANNON]
 Name = Toucannon
@@ -18963,7 +18988,7 @@ Category = Loitering
 Pokedex = Its stomach takes up most of its long torso. It's a big eater, so the amount Trainers have to spend on its food is no laughing matter.
 Generation = 7
 WildItemUncommon = PECHABERRY
-Evolutions = GUMSHOOS,LevelDay,20
+Evolution = GUMSHOOS,LevelDay,20
 #-------------------------------
 [GUMSHOOS]
 Name = Gumshoos
@@ -19013,7 +19038,7 @@ Shape = Insectoid
 Category = Larva
 Pokedex = It spits a sticky thread to stop opponents in their tracks, and then it grabs them in its sharp, sturdy mandibles to take them down.
 Generation = 7
-Evolutions = CHARJABUG,Level,20
+Evolution = CHARJABUG,Level,20
 #-------------------------------
 [CHARJABUG]
 Name = Charjabug
@@ -19038,7 +19063,8 @@ Category = Battery
 Pokedex = It buries itself in fallen leaves and barely moves, munching away on humus. If you accidentally step on one, you'll get a shock!
 Generation = 7
 WildItemUncommon = CELLBATTERY
-Evolutions = VIKAVOLT,Item,THUNDERSTONE,VIKAVOLT,LocationFlag,Magnetic
+Evolution = VIKAVOLT,Item,THUNDERSTONE
+Evolution = VIKAVOLT,LocationFlag,Magnetic
 #-------------------------------
 [VIKAVOLT]
 Name = Vikavolt
@@ -19088,7 +19114,7 @@ Category = Boxing
 Pokedex = It punches so much, its pincers often come off from overuse, but they grow back quickly. What little meat they contain is rich and delicious.
 Generation = 7
 WildItemUncommon = ASPEARBERRY
-Evolutions = CRABOMINABLE,LocationFlag,IceRock
+Evolution = CRABOMINABLE,LocationFlag,IceRock
 #-------------------------------
 [CRABOMINABLE]
 Name = Crabominable
@@ -19167,7 +19193,7 @@ Category = Bee Fly
 Pokedex = It feeds on the nectar and pollen of flowers. Because it's able to sense auras, it can identify which flowers are about to bloom.
 Generation = 7
 WildItemUncommon = HONEY
-Evolutions = RIBOMBEE,Level,25
+Evolution = RIBOMBEE,Level,25
 #-------------------------------
 [RIBOMBEE]
 Name = Ribombee
@@ -19218,7 +19244,7 @@ Shape = Quadruped
 Category = Puppy
 Pokedex = This Pokémon has lived with people since times long ago. It can sense when its Trainer is in the dumps and will stick close by its Trainer's side.
 Generation = 7
-Evolutions = LYCANROC,Level,25
+Evolution = LYCANROC,Level,25
 #-------------------------------
 [LYCANROC]
 Name = Lycanroc
@@ -19295,7 +19321,7 @@ Category = Brutal Star
 Pokedex = It plunges the poison spike on its head into its prey. When the prey has weakened, Mareanie deals the finishing blow with its 10 tentacles.
 Generation = 7
 WildItemUncommon = POISONBARB
-Evolutions = TOXAPEX,Level,38
+Evolution = TOXAPEX,Level,38
 #-------------------------------
 [TOXAPEX]
 Name = Toxapex
@@ -19347,7 +19373,7 @@ Category = Donkey
 Pokedex = It loves playing in the mud. If it isn't showered with mud on a daily basis, it gets stressed out and stops listening to its Trainer.
 Generation = 7
 WildItemUncommon = LIGHTCLAY
-Evolutions = MUDSDALE,Level,30
+Evolution = MUDSDALE,Level,30
 #-------------------------------
 [MUDSDALE]
 Name = Mudsdale
@@ -19399,7 +19425,7 @@ Category = Water Bubble
 Pokedex = When two Dewpider meet, they display their water bubbles to each other. Then the one with the smaller bubble gets out of the other's way.
 Generation = 7
 WildItemUncommon = MYSTICWATER
-Evolutions = ARAQUANID,Level,22
+Evolution = ARAQUANID,Level,22
 #-------------------------------
 [ARAQUANID]
 Name = Araquanid
@@ -19451,7 +19477,7 @@ Category = Sickle Grass
 Pokedex = When the sun rises, Fomantis spreads its four leaves and bathes in the sunlight. The tip of its head has a pleasant aroma.
 Generation = 7
 WildItemUncommon = MIRACLESEED
-Evolutions = LURANTIS,LevelDay,34
+Evolution = LURANTIS,LevelDay,34
 #-------------------------------
 [LURANTIS]
 Name = Lurantis
@@ -19504,7 +19530,7 @@ Pokedex = It scatters its shining spores around itself. Even though they're dang
 Generation = 7
 WildItemCommon = TINYMUSHROOM
 WildItemUncommon = BIGMUSHROOM
-Evolutions = SHIINOTIC,Level,24
+Evolution = SHIINOTIC,Level,24
 #-------------------------------
 [SHIINOTIC]
 Name = Shiinotic
@@ -19557,7 +19583,7 @@ Category = Toxic Lizard
 Pokedex = It burns its bodily fluids to create a poisonous gas. When its enemies become disoriented from inhaling the gas, it attacks them.
 Generation = 7
 WildItemUncommon = SMOKEBALL
-Evolutions = SALAZZLE,LevelFemale,33
+Evolution = SALAZZLE,LevelFemale,33
 #-------------------------------
 [SALAZZLE]
 Name = Salazzle
@@ -19608,7 +19634,7 @@ Shape = Quadruped
 Category = Flailing
 Pokedex = Despite its adorable appearance, when it gets angry and flails about, its arms and legs could knock a pro wrestler sprawling.
 Generation = 7
-Evolutions = BEWEAR,Level,27
+Evolution = BEWEAR,Level,27
 #-------------------------------
 [BEWEAR]
 Name = Bewear
@@ -19659,7 +19685,7 @@ Category = Fruit
 Pokedex = Because of its sweet, delicious aroma, bird Pokémon are always after it, but it's not intelligent enough to care.
 Generation = 7
 WildItemUncommon = GRASSYSEED
-Evolutions = STEENEE,Level,18
+Evolution = STEENEE,Level,18
 #-------------------------------
 [STEENEE]
 Name = Steenee
@@ -19685,7 +19711,7 @@ Category = Fruit
 Pokedex = It's protected by its hard sepals, so it plays with bird Pokémon without worry. They peck it relentlessly, but it doesn't care.
 Generation = 7
 WildItemUncommon = GRASSYSEED
-Evolutions = TSAREENA,HasMove,STOMP
+Evolution = TSAREENA,HasMove,STOMP
 #-------------------------------
 [TSAREENA]
 Name = Tsareena
@@ -19811,7 +19837,7 @@ Shape = Multiped
 Category = Turn Tail
 Pokedex = This Pokémon is a coward. As it desperately dashes off, the flailing of its many legs leaves a sparkling clean path in its wake.
 Generation = 7
-Evolutions = GOLISOPOD,Level,30
+Evolution = GOLISOPOD,Level,30
 #-------------------------------
 [GOLISOPOD]
 Name = Golisopod
@@ -19861,7 +19887,7 @@ Category = Sand Heap
 Pokedex = It likes the shovel on its head, so Sandygast will get serious and fight any children who come to take it back.
 Generation = 7
 WildItemUncommon = SPELLTAG
-Evolutions = PALOSSAND,Level,42
+Evolution = PALOSSAND,Level,42
 #-------------------------------
 [PALOSSAND]
 Name = Palossand
@@ -19936,7 +19962,7 @@ Category = Synthetic
 Pokedex = The heavy control mask it wears suppresses its intrinsic capabilities. This Pokémon has some hidden special power.
 Generation = 7
 Flags = Legendary
-Evolutions = SILVALLY,Happiness,
+Evolution = SILVALLY,Happiness
 #-------------------------------
 [SILVALLY]
 Name = Silvally
@@ -20189,7 +20215,7 @@ Category = Scaly
 Pokedex = It expresses its feelings by smacking its scales. Metallic sounds echo through the tall mountains where Jangmo-o lives.
 Generation = 7
 WildItemUncommon = RAZORCLAW
-Evolutions = HAKAMOO,Level,35
+Evolution = HAKAMOO,Level,35
 #-------------------------------
 [HAKAMOO]
 Name = Hakamo-o
@@ -20215,7 +20241,7 @@ Category = Scaly
 Pokedex = It sheds and regrows its scales on a continuous basis. The scales become harder and sharper each time they're regrown.
 Generation = 7
 WildItemUncommon = RAZORCLAW
-Evolutions = KOMMOO,Level,45
+Evolution = KOMMOO,Level,45
 #-------------------------------
 [KOMMOO]
 Name = Kommo-o
@@ -20364,7 +20390,7 @@ Category = Nebula
 Pokedex = Whether or not it's a Pokémon from this world is a mystery. When it's in a jam, it warps away to a safe place to hide.
 Generation = 7
 Flags = Legendary
-Evolutions = COSMOEM,Level,43
+Evolution = COSMOEM,Level,43
 #-------------------------------
 [COSMOEM]
 Name = Cosmoem
@@ -20389,7 +20415,8 @@ Category = Protostar
 Pokedex = Motionless as if dead, its body is faintly warm to the touch. In the distant past, it was called the cocoon of the stars.
 Generation = 7
 Flags = Legendary
-Evolutions = SOLGALEO,LevelDay,53,LUNALA,LevelNight,53
+Evolution = SOLGALEO,LevelDay,53
+Evolution = LUNALA,LevelNight,53
 #-------------------------------
 [SOLGALEO]
 Name = Solgaleo
@@ -20702,7 +20729,7 @@ Category = Poison Pin
 Pokedex = An Ultra Beast that lives in a different world, it cackles wildly as it sprays its opponents with poison from the needles on its head.
 Generation = 7
 Flags = UltraBeast
-Evolutions = NAGANADEL,HasMove,DRAGONPULSE
+Evolution = NAGANADEL,HasMove,DRAGONPULSE
 #-------------------------------
 [NAGANADEL]
 Name = Naganadel
@@ -20823,7 +20850,7 @@ Category = Hex Nut
 Pokedex = It melts particles of iron and other metals found in the subsoil, so it can absorb them into its body of molten steel.
 Generation = 7
 Flags = Mythical
-Evolutions = MELMETAL,Level,45
+Evolution = MELMETAL,Level,45
 #-------------------------------
 [MELMETAL]
 Name = Melmetal
@@ -20873,7 +20900,7 @@ Shape = BipedalTail
 Category = Chimp
 Pokedex = When it uses its special stick to strike up a beat, the sound waves produced carry revitalizing energy to the plants and flowers in the area.
 Generation = 8
-Evolutions = THWACKEY,Level,16
+Evolution = THWACKEY,Level,16
 #-------------------------------
 [THWACKEY]
 Name = Thwackey
@@ -20898,7 +20925,7 @@ Shape = BipedalTail
 Category = Beat
 Pokedex = When it's drumming out rapid beats in battle, it gets so caught up in the rhythm that it won't even notice that it's already knocked out its opponent.
 Generation = 8
-Evolutions = RILLABOOM,Level,35
+Evolution = RILLABOOM,Level,35
 #-------------------------------
 [RILLABOOM]
 Name = Rillaboom
@@ -20948,7 +20975,7 @@ Shape = BipedalTail
 Category = Rabbit
 Pokedex = A warm-up of running around gets fire energy coursing through this Pokémon's body. Once that happens, it's ready to fight at full power.
 Generation = 8
-Evolutions = RABOOT,Level,16
+Evolution = RABOOT,Level,16
 #-------------------------------
 [RABOOT]
 Name = Raboot
@@ -20973,7 +21000,7 @@ Shape = BipedalTail
 Category = Rabbit
 Pokedex = It kicks berries right off the branches of trees and then juggles them with its feet, practicing its footwork.
 Generation = 8
-Evolutions = CINDERACE,Level,35
+Evolution = CINDERACE,Level,35
 #-------------------------------
 [CINDERACE]
 Name = Cinderace
@@ -21023,7 +21050,7 @@ Shape = Quadruped
 Category = Water Lizard
 Pokedex = When scared, this Pokémon cries. Its tears pack the chemical punch of 100 onions, and attackers won't be able to resist weeping.
 Generation = 8
-Evolutions = DRIZZILE,Level,16
+Evolution = DRIZZILE,Level,16
 #-------------------------------
 [DRIZZILE]
 Name = Drizzile
@@ -21048,7 +21075,7 @@ Shape = BipedalTail
 Category = Water Lizard
 Pokedex = A clever combatant, this Pokémon battles using water balloons created with moisture secreted from its palms.
 Generation = 8
-Evolutions = INTELEON,Level,35
+Evolution = INTELEON,Level,35
 #-------------------------------
 [INTELEON]
 Name = Inteleon
@@ -21099,7 +21126,7 @@ Category = Cheeky
 Pokedex = It eats berries nonstop—a habit that has made it more resilient than it looks. It'll show up on farms, searching for yet more berries.
 Generation = 8
 WildItemUncommon = ORANBERRY
-Evolutions = GREEDENT,Level,24
+Evolution = GREEDENT,Level,24
 #-------------------------------
 [GREEDENT]
 Name = Greedent
@@ -21150,7 +21177,7 @@ Shape = Winged
 Category = Tiny Bird
 Pokedex = Jumping nimbly about, this small-bodied Pokémon takes advantage of even the slightest opportunity to disorient larger opponents.
 Generation = 8
-Evolutions = CORVISQUIRE,Level,18
+Evolution = CORVISQUIRE,Level,18
 #-------------------------------
 [CORVISQUIRE]
 Name = Corvisquire
@@ -21175,7 +21202,7 @@ Shape = Winged
 Category = Raven
 Pokedex = Smart enough to use tools in battle, these Pokémon have been seen picking up rocks and flinging them or using ropes to wrap up enemies.
 Generation = 8
-Evolutions = CORVIKNIGHT,Level,38
+Evolution = CORVIKNIGHT,Level,38
 #-------------------------------
 [CORVIKNIGHT]
 Name = Corviknight
@@ -21224,7 +21251,7 @@ Shape = Insectoid
 Category = Larva
 Pokedex = Often found in gardens, this Pokémon has hairs on its body that it uses to assess its surroundings.
 Generation = 8
-Evolutions = DOTTLER,Level,10
+Evolution = DOTTLER,Level,10
 #-------------------------------
 [DOTTLER]
 Name = Dottler
@@ -21250,7 +21277,7 @@ Category = Radome
 Pokedex = It barely moves, but it's still alive. Hiding in its shell without food or water seems to have awakened its psychic powers.
 Generation = 8
 WildItemUncommon = PSYCHICSEED
-Evolutions = ORBEETLE,Level,30
+Evolution = ORBEETLE,Level,30
 #-------------------------------
 [ORBEETLE]
 Name = Orbeetle
@@ -21301,7 +21328,7 @@ Shape = Quadruped
 Category = Fox
 Pokedex = Aided by the soft pads on its feet, it silently raids the food stores of other Pokémon. It survives off its ill-gotten gains.
 Generation = 8
-Evolutions = THIEVUL,Level,18
+Evolution = THIEVUL,Level,18
 #-------------------------------
 [THIEVUL]
 Name = Thievul
@@ -21351,7 +21378,7 @@ Shape = HeadBase
 Category = Flowering
 Pokedex = It anchors itself in the ground with its single leg, then basks in the sun. After absorbing enough sunlight, its petals spread as it blooms brilliantly.
 Generation = 8
-Evolutions = ELDEGOSS,Level,20
+Evolution = ELDEGOSS,Level,20
 #-------------------------------
 [ELDEGOSS]
 Name = Eldegoss
@@ -21401,7 +21428,7 @@ Shape = Quadruped
 Category = Sheep
 Pokedex = Its curly fleece is such an effective cushion that this Pokémon could fall off a cliff and stand right back up at the bottom, unharmed.
 Generation = 8
-Evolutions = DUBWOOL,Level,24
+Evolution = DUBWOOL,Level,24
 #-------------------------------
 [DUBWOOL]
 Name = Dubwool
@@ -21451,7 +21478,7 @@ Shape = Quadruped
 Category = Snapping
 Pokedex = It starts off battles by attacking with its rock-hard horn, but as soon as the opponent flinches, this Pokémon bites down and never lets go.
 Generation = 8
-Evolutions = DREDNAW,Level,22
+Evolution = DREDNAW,Level,22
 #-------------------------------
 [DREDNAW]
 Name = Drednaw
@@ -21501,7 +21528,7 @@ Shape = Quadruped
 Category = Puppy
 Pokedex = This gluttonous Pokémon only assists people with their work because it wants treats. As it runs, it crackles with electricity.
 Generation = 8
-Evolutions = BOLTUND,Level,25
+Evolution = BOLTUND,Level,25
 #-------------------------------
 [BOLTUND]
 Name = Boltund
@@ -21551,7 +21578,7 @@ Shape = Head
 Category = Coal
 Pokedex = Most of its body has the same composition as coal. Fittingly, this Pokémon was first discovered in coal mines about 400 years ago.
 Generation = 8
-Evolutions = CARKOL,Level,18
+Evolution = CARKOL,Level,18
 #-------------------------------
 [CARKOL]
 Name = Carkol
@@ -21576,7 +21603,7 @@ Shape = HeadLegs
 Category = Coal
 Pokedex = By rapidly rolling its legs, it can travel at over 18 mph. The temperature of the flames it breathes exceeds 1,000 degrees Celsius.
 Generation = 8
-Evolutions = COALOSSAL,Level,34
+Evolution = COALOSSAL,Level,34
 #-------------------------------
 [COALOSSAL]
 Name = Coalossal
@@ -21626,7 +21653,8 @@ Shape = Serpentine
 Category = Apple Core
 Pokedex = It spends its entire life inside an apple. It hides from its natural enemies, bird Pokémon, by pretending it's just an apple and nothing more.
 Generation = 8
-Evolutions = FLAPPLE,Item,TARTAPPLE,APPLETUN,Item,SWEETAPPLE
+Evolution = FLAPPLE,Item,TARTAPPLE
+Evolution = APPLETUN,Item,SWEETAPPLE
 #-------------------------------
 [FLAPPLE]
 Name = Flapple
@@ -21700,7 +21728,7 @@ Shape = Serpentine
 Category = Sand Snake
 Pokedex = It spews sand from its nostrils. While the enemy is blinded, it burrows into the ground to hide.
 Generation = 8
-Evolutions = SANDACONDA,Level,36
+Evolution = SANDACONDA,Level,36
 #-------------------------------
 [SANDACONDA]
 Name = Sandaconda
@@ -21774,7 +21802,7 @@ Shape = Finned
 Category = Rush
 Pokedex = If it sees any movement around it, this Pokémon charges for it straightaway, leading with its sharply pointed jaw. It's very proud of that jaw.
 Generation = 8
-Evolutions = BARRASKEWDA,Level,26
+Evolution = BARRASKEWDA,Level,26
 #-------------------------------
 [BARRASKEWDA]
 Name = Barraskewda
@@ -21824,7 +21852,7 @@ Shape = BipedalTail
 Category = Baby
 Pokedex = It manipulates the chemical makeup of its poison to produce electricity. The voltage is weak, but it can cause a tingling paralysis.
 Generation = 8
-Evolutions = TOXTRICITY,Level,30
+Evolution = TOXTRICITY,Level,30
 #-------------------------------
 [TOXTRICITY]
 Name = Toxtricity
@@ -21875,7 +21903,7 @@ Shape = Multiped
 Category = Radiator
 Pokedex = It stores flammable gas in its body and uses it to generate heat. The yellow sections on its belly get particularly hot.
 Generation = 8
-Evolutions = CENTISKORCH,Level,28
+Evolution = CENTISKORCH,Level,28
 #-------------------------------
 [CENTISKORCH]
 Name = Centiskorch
@@ -21925,7 +21953,7 @@ Shape = Multiped
 Category = Tantrum
 Pokedex = It's very curious, but its means of investigating things is to try to punch them with its tentacles. The search for food is what brings it onto land.
 Generation = 8
-Evolutions = GRAPPLOCT,HasMove,TAUNT
+Evolution = GRAPPLOCT,HasMove,TAUNT
 #-------------------------------
 [GRAPPLOCT]
 Name = Grapploct
@@ -21975,7 +22003,7 @@ Shape = Head
 Category = Black Tea
 Pokedex = The teacup in which this Pokémon makes its home is a famous piece of antique tableware. Many forgeries are in circulation.
 Generation = 8
-Evolutions = POLTEAGEIST,Item,CRACKEDPOT
+Evolution = POLTEAGEIST,Item,CRACKEDPOT
 #-------------------------------
 [POLTEAGEIST]
 Name = Polteageist
@@ -22026,7 +22054,7 @@ Shape = HeadLegs
 Category = Calm
 Pokedex = Via the protrusion on its head, it senses other creatures' emotions. If you don't have a calm disposition, it will never warm up to you.
 Generation = 8
-Evolutions = HATTREM,Level,32
+Evolution = HATTREM,Level,32
 #-------------------------------
 [HATTREM]
 Name = Hattrem
@@ -22051,7 +22079,7 @@ Shape = Bipedal
 Category = Serene
 Pokedex = Using the braids on its head, it pummels foes to get them to quiet down. One blow from those braids would knock out a professional boxer.
 Generation = 8
-Evolutions = HATTERENE,Level,42
+Evolution = HATTERENE,Level,42
 #-------------------------------
 [HATTERENE]
 Name = Hatterene
@@ -22100,7 +22128,7 @@ Shape = Bipedal
 Category = Wily
 Pokedex = Through its nose, it sucks in the emanations produced by people and Pokémon when they feel annoyed. It thrives off this negative energy.
 Generation = 8
-Evolutions = MORGREM,Level,32
+Evolution = MORGREM,Level,32
 #-------------------------------
 [MORGREM]
 Name = Morgrem
@@ -22125,7 +22153,7 @@ Shape = Bipedal
 Category = Devious
 Pokedex = With sly cunning, it tries to lure people into the woods. Some believe it to have the power to make crops grow.
 Generation = 8
-Evolutions = GRIMMSNARL,Level,42
+Evolution = GRIMMSNARL,Level,42
 #-------------------------------
 [GRIMMSNARL]
 Name = Grimmsnarl
@@ -22331,7 +22359,13 @@ Shape = Head
 Category = Cream
 Pokedex = This Pokémon was born from sweet-smelling particles in the air. Its body is made of cream.
 Generation = 8
-Evolutions = ALCREMIE,HoldItem,STRAWBERRYSWEET,ALCREMIE,HoldItem,BERRYSWEET,ALCREMIE,HoldItem,LOVESWEET,ALCREMIE,HoldItem,STARSWEET,ALCREMIE,HoldItem,CLOVERSWEET,ALCREMIE,HoldItem,FLOWERSWEET,ALCREMIE,HoldItem,RIBBONSWEET
+Evolution = ALCREMIE,HoldItem,STRAWBERRYSWEET
+Evolution = ALCREMIE,HoldItem,BERRYSWEET
+Evolution = ALCREMIE,HoldItem,LOVESWEET
+Evolution = ALCREMIE,HoldItem,STARSWEET
+Evolution = ALCREMIE,HoldItem,CLOVERSWEET
+Evolution = ALCREMIE,HoldItem,FLOWERSWEET
+Evolution = ALCREMIE,HoldItem,RIBBONSWEET
 #-------------------------------
 [ALCREMIE]
 Name = Alcremie
@@ -22432,7 +22466,7 @@ Category = Worm
 Pokedex = It spits out thread imbued with a frigid sort of energy and uses it to tie its body to branches, disguising itself as an icicle while it sleeps.
 Generation = 8
 WildItemUncommon = SNOWBALL
-Evolutions = FROSMOTH,HappinessNight,
+Evolution = FROSMOTH,HappinessNight
 #-------------------------------
 [FROSMOTH]
 Name = Frosmoth
@@ -22583,7 +22617,7 @@ Category = Copperderm
 Pokedex = It digs up the ground with its trunk. It's also very strong, being able to carry loads of over five tons without any problem at all.
 Generation = 8
 WildItemUncommon = LAGGINGTAIL
-Evolutions = COPPERAJAH,Level,34
+Evolution = COPPERAJAH,Level,34
 #-------------------------------
 [COPPERAJAH]
 Name = Copperajah
@@ -22755,7 +22789,7 @@ Shape = Serpentine
 Category = Lingering
 Pokedex = After being reborn as a ghost Pokémon, Dreepy wanders the areas it used to inhabit back when it was alive in prehistoric seas.
 Generation = 8
-Evolutions = DRAKLOAK,Level,50
+Evolution = DRAKLOAK,Level,50
 #-------------------------------
 [DRAKLOAK]
 Name = Drakloak
@@ -22780,7 +22814,7 @@ Shape = HeadArms
 Category = Caretaker
 Pokedex = It's capable of flying faster than 120 mph. It battles alongside Dreepy and dotes on them until they successfully evolve.
 Generation = 8
-Evolutions = DRAGAPULT,Level,60
+Evolution = DRAGAPULT,Level,60
 #-------------------------------
 [DRAGAPULT]
 Name = Dragapult
@@ -22909,7 +22943,7 @@ Category = Wushu
 Pokedex = Kubfu trains hard to perfect its moves. The moves it masters will determine which form it takes when it evolves.
 Generation = 8
 Flags = Legendary
-Evolutions = URSHIFU,Event,1
+Evolution = URSHIFU,Event,1
 #-------------------------------
 [URSHIFU]
 Name = Urshifu
diff --git a/PBS/pokemon_forms.txt b/PBS/pokemon_forms.txt
index 5865b9713..08ae264e4 100644
--- a/PBS/pokemon_forms.txt
+++ b/PBS/pokemon_forms.txt
@@ -82,9 +82,9 @@ Weight = 3.8
 Color = Black
 Pokedex = With its incisors, it gnaws through doors and infiltrates people's homes. Then, with a twitch of its whiskers, it steals whatever food it finds.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = PECHABERRY
-Evolutions = RATICATE,LevelNight,20
+Evolution = RATICATE,LevelNight,20
 #-------------------------------
 [RATICATE,1]
 FormName = Alolan
@@ -97,7 +97,7 @@ Weight = 25.5
 Color = Black
 Pokedex = It forms a group of Rattata, which it assumes command of. Each group has its own territory, and disputes over food happen often.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = PECHABERRY
 #-------------------------------
 [RAICHU,1]
@@ -128,8 +128,8 @@ Weight = 40.0
 Color = White
 Pokedex = The skin on its back is as hard as steel. Predators go after its soft belly, so it clings to the ground desperately.
 Generation = 7
-Flags = InheritFormWithEverStone
-Evolutions = SANDSLASH,Item,ICESTONE
+Flags = InheritFormWithEverstone
+Evolution = SANDSLASH,Item,ICESTONE
 #-------------------------------
 [SANDSLASH,1]
 FormName = Alolan
@@ -144,7 +144,7 @@ Weight = 55.0
 Color = Blue
 Pokedex = It runs across snow-covered plains at high speeds. It developed thick, sharp claws to plow through the snow.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [VULPIX,1]
 FormName = Alolan
@@ -157,9 +157,9 @@ EggMoves = AGILITY,CHARM,DISABLE,ENCORE,EXTRASENSORY,FLAIL,FREEZEDRY,HOWL,HYPNOS
 Color = White
 Pokedex = In hot weather, this Pokémon makes ice shards with its six tails and sprays them around to cool itself off.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = SNOWBALL
-Evolutions = NINETALES,Item,ICESTONE
+Evolution = NINETALES,Item,ICESTONE
 #-------------------------------
 [NINETALES,1]
 FormName = Alolan
@@ -173,7 +173,7 @@ TutorMoves = AGILITY,AQUATAIL,ATTRACT,AURORAVEIL,AVALANCHE,BLIZZARD,BODYSLAM,CAL
 Color = Blue
 Pokedex = It lives on mountains perpetually covered in snow and is revered as a deity incarnate. It appears draped in a blizzard.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = SNOWBALL
 #-------------------------------
 [DIGLETT,1]
@@ -187,7 +187,7 @@ EggMoves = ANCIENTPOWER,BEATUP,ENDURE,FEINTATTACK,FINALGAMBIT,HEADBUTT,MEMENTO,M
 Weight = 1.0
 Pokedex = Its head sports an altered form of whiskers made of metal. When in communication with its comrades, its whiskers wobble to and fro.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [DUGTRIO,1]
 FormName = Alolan
@@ -200,7 +200,7 @@ TutorMoves = AERIALACE,AGILITY,ALLYSWITCH,ASSURANCE,ATTRACT,BEATUP,BODYSLAM,BULL
 Weight = 66.6
 Pokedex = Its shining gold hair provides it with protection. It's reputed that keeping any of its fallen hairs will bring bad luck.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [MEOWTH,1]
 FormName = Alolan
@@ -213,8 +213,8 @@ EggMoves = AMNESIA,ASSIST,CHARM,COVET,FLAIL,FLATTER,FOULPLAY,HYPNOSIS,PARTINGSHO
 Color = Blue
 Pokedex = It's impulsive, selfish, and fickle. It's very popular with some Trainers who like giving it the attention it needs.
 Generation = 7
-Flags = InheritFormWithEverStone
-Evolutions = PERSIAN,Happiness,
+Flags = InheritFormWithEverstone
+Evolution = PERSIAN,Happiness
 #-------------------------------
 [MEOWTH,2]
 FormName = Galarian
@@ -229,8 +229,8 @@ Color = Brown
 Shape = BipedalTail
 Pokedex = Living with a savage, seafaring people has toughened this Pokémon's body so much that parts of it have turned to iron.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = PERRSERKER,Level,28
+Flags = InheritFormWithEverstone
+Evolution = PERRSERKER,Level,28
 #-------------------------------
 [PERSIAN,1]
 FormName = Alolan
@@ -245,7 +245,7 @@ Weight = 33.0
 Color = Blue
 Pokedex = Its round face is a symbol of wealth. Persian that have bigger, plumper faces are considered more beautiful.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [ALAKAZAM,1]
 FormName = Mega Alakazam
@@ -270,7 +270,7 @@ Weight = 20.3
 Color = Gray
 Pokedex = Geodude compete against each other with headbutts. The iron sand on their heads will stick to whichever one has stronger magnetism.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GRAVELER,1]
@@ -284,7 +284,7 @@ Weight = 110.0
 Color = Gray
 Pokedex = They eat rocks and often get into a scrap over them. The shock of Graveler smashing together causes a flash of light and a booming noise.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemUncommon = CELLBATTERY
 #-------------------------------
 [GOLEM,1]
@@ -299,7 +299,7 @@ Weight = 316.0
 Color = Gray
 Pokedex = It fires rocks charged with electricity. Even if the rock isn't fired that accurately, just grazing an opponent will cause numbness and fainting.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemCommon = CELLBATTERY
 #-------------------------------
 [PONYTA,1]
@@ -315,7 +315,7 @@ Color = White
 Category = Unique Horn
 Pokedex = Its small horn hides a healing power. With a few rubs from this Pokémon's horn, any slight wound you have will be healed.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [RAPIDASH,1]
 FormName = Galarian
@@ -329,7 +329,7 @@ Color = White
 Category = Unique Horn
 Pokedex = Little can stand up to its psycho cut. Unleashed from this Pokémon's horn, the move will punch a hole right through a thick metal sheet.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [SLOWPOKE,1]
 FormName = Galarian
@@ -339,8 +339,9 @@ Moves = 1,TACKLE,1,CURSE,3,GROWL,6,ACID,9,YAWN,12,CONFUSION,15,DISABLE,18,WATERP
 TutorMoves = AMNESIA,ATTRACT,BLIZZARD,BODYSLAM,BRINE,BULLDOZE,CALMMIND,CAPTIVATE,CONFIDE,DIG,DIVE,DOUBLEEDGE,DOUBLETEAM,EARTHQUAKE,ENDURE,EXPANDINGFORCE,FACADE,FIREBLAST,FLAMETHROWER,FOULPLAY,FRUSTRATION,FUTURESIGHT,GRASSKNOT,HAIL,HIDDENPOWER,HYDROPUMP,ICEBEAM,ICYWIND,IMPRISON,IRONTAIL,LIGHTSCREEN,LIQUIDATION,MIMIC,MUDSHOT,NATURALGIFT,PAYDAY,PROTECT,PSYCHIC,PSYCHICTERRAIN,PSYSHOCK,RAINDANCE,REST,RETURN,ROUND,SAFEGUARD,SCALD,SECRETPOWER,SHADOWBALL,SKILLSWAP,SLEEPTALK,SNORE,STOREDPOWER,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,SWIFT,THUNDERWAVE,TRIATTACK,TRICK,TRICKROOM,WEATHERBALL,WHIRLPOOL,WONDERROOM,ZENHEADBUTT
 Pokedex = Although this Pokémon is normally zoned out, its expression abruptly sharpens on occasion. The cause for this seems to lie in Slowpoke's diet.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = SLOWBRO,Item,GALARICACUFF,SLOWKING,Item,GALARICAWREATH
+Flags = InheritFormWithEverstone
+Evolution = SLOWBRO,Item,GALARICACUFF
+Evolution = SLOWKING,Item,GALARICAWREATH
 #-------------------------------
 [SLOWBRO,1]
 FormName = Galarian
@@ -352,7 +353,7 @@ TutorMoves = AMNESIA,ATTRACT,AVALANCHE,BLIZZARD,BODYSLAM,BRICKBREAK,BRINE,BRUTAL
 Weight = 70.5
 Pokedex = If this Pokémon squeezes the tongue of the Shellder biting it, the Shellder will launch a toxic liquid from the tip of its shell.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [SLOWBRO,2]
 FormName = Mega Slowbro
@@ -379,9 +380,9 @@ EggMoves = COUNTER,COVET,CURSE,DOUBLEEDGE,FEINT,FLAIL,NIGHTSLASH,QUICKATTACK,QUI
 Weight = 42.0
 Pokedex = The stalks of leeks are thicker and longer in the Galar region. Farfetch'd that adapted to these stalks took on a unique form.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 WildItemCommon = LEEK
-Evolutions = SIRFETCHD,BattleDealCriticalHit,3
+Evolution = SIRFETCHD,BattleDealCriticalHit,3
 #-------------------------------
 [GRIMER,1]
 FormName = Alolan
@@ -396,7 +397,7 @@ Weight = 42.0
 Color = Green
 Pokedex = A Grimer, which had been brought in to solve a problem with garbage, developed over time into this form.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [MUK,1]
 FormName = Alolan
@@ -410,7 +411,7 @@ Weight = 52.0
 Color = Green
 Pokedex = The garbage it eats causes continuous chemical changes in its body, which produce its exceedingly vivid coloration.
 Generation = 7
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [GENGAR,1]
 FormName = Mega Gengar
@@ -437,7 +438,7 @@ Generation = 7
 #-------------------------------
 [CUBONE,1]
 Generation = 7
-Evolutions = MAROWAK,LevelNight,28
+Evolution = MAROWAK,LevelNight,28
 #-------------------------------
 [MAROWAK,1]
 FormName = Alolan
@@ -490,8 +491,8 @@ Color = White
 Category = Dancing
 Pokedex = Its talent is tap-dancing. It can also manipulate temperatures to create a floor of ice, which this Pokémon can kick up to use as a barrier.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = MRRIME,Level,42
+Flags = InheritFormWithEverstone
+Evolution = MRRIME,Level,42
 #-------------------------------
 [PINSIR,1]
 FormName = Mega Pinsir
@@ -603,7 +604,7 @@ Generation = 6
 [PICHU,2]
 FormName = Spiky-Eared
 Generation = 4
-Evolutions = PIKACHU,None,
+Evolution = PIKACHU,None
 #-------------------------------
 [AMPHAROS,1]
 FormName = Mega Ampharos
@@ -627,7 +628,7 @@ Height = 1.8
 Category = Hexpert
 Pokedex = While chanting strange spells, this Pokémon combines its internal toxins with what it's eaten, creating strange potions.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [UNOWN,1]
 FormName = B
@@ -760,8 +761,8 @@ Weight = 0.5
 Color = White
 Pokedex = Sudden climate change wiped out this ancient kind of Corsola. This Pokémon absorbs others' life-force through its branches.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = CURSOLA,Level,38
+Flags = InheritFormWithEverstone
+Evolution = CURSOLA,Level,38
 #-------------------------------
 [HOUNDOOM,1]
 FormName = Mega Houndoom
@@ -826,7 +827,7 @@ EggMoves = KNOCKOFF,PARTINGSHOT,QUICKGUARD
 Color = White
 Pokedex = Its restlessness has it constantly running around. If it sees another Pokémon, it will purposely run into them in order to start a fight.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [LINOONE,1]
 FormName = Galarian
@@ -835,8 +836,8 @@ Moves = 0,NIGHTSLASH,1,SWITCHEROO,1,PINMISSILE,1,BABYDOLLEYES,1,TACKLE,1,LEER,1,
 TutorMoves = ASSURANCE,ATTRACT,BLIZZARD,BODYPRESS,BODYSLAM,CAPTIVATE,CONFIDE,DIG,DOUBLEEDGE,DOUBLETEAM,ENDURE,FACADE,FAKETEARS,FLING,FRUSTRATION,GIGAIMPACT,GRASSKNOT,GUNKSHOT,HELPINGHAND,HIDDENPOWER,HYPERBEAM,HYPERVOICE,ICEBEAM,ICYWIND,IRONTAIL,LASHOUT,MIMIC,MUDSHOT,NATURALGIFT,PAYBACK,PINMISSILE,PROTECT,RAINDANCE,REST,RETALIATE,RETURN,ROUND,SCARYFACE,SCREECH,SECRETPOWER,SEEDBOMB,SHADOWBALL,SHADOWCLAW,SLEEPTALK,SNARL,SNORE,STOMPINGTANTRUM,SUBSTITUTE,SUNNYDAY,SURF,SWAGGER,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.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = OBSTAGOON,LevelNight,35
+Flags = InheritFormWithEverstone
+Evolution = OBSTAGOON,LevelNight,35
 #-------------------------------
 [GARDEVOIR,1]
 FormName = Mega Gardevoir
@@ -1339,8 +1340,8 @@ Weight = 40.0
 Color = White
 Pokedex = The colder they get, the more energetic they are. They freeze their breath to make snowballs, using them as ammo for playful snowball fights.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = DARMANITAN,Item,ICESTONE
+Flags = InheritFormWithEverstone
+Evolution = DARMANITAN,Item,ICESTONE
 #-------------------------------
 [DARMANITAN,1]
 FormName = Zen Mode
@@ -1363,7 +1364,7 @@ Color = White
 Category = Zen Charm
 Pokedex = On days when blizzards blow through, it comes down to where people live. It stashes food in the snowball on its head, taking it home for later.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [DARMANITAN,3]
 FormName = Galarian Zen Mode
@@ -1390,8 +1391,8 @@ Moves = 1,ASTONISH,1,PROTECT,4,HAZE,8,NIGHTSHADE,12,DISABLE,16,BRUTALSWING,20,CR
 TutorMoves = ALLYSWITCH,ATTRACT,BRUTALSWING,CALMMIND,CAPTIVATE,CONFIDE,DARKPULSE,DOUBLEEDGE,DOUBLETEAM,EARTHPOWER,EARTHQUAKE,ENDURE,ENERGYBALL,FACADE,FAKETEARS,FRUSTRATION,HEX,HIDDENPOWER,IMPRISON,IRONDEFENSE,MIMIC,NASTYPLOT,NATURALGIFT,PAYBACK,POLTERGEIST,PROTECT,PSYCHIC,RAINDANCE,REST,RETURN,ROCKSLIDE,ROCKTOMB,ROUND,SAFEGUARD,SANDSTORM,SECRETPOWER,SHADOWBALL,SKILLSWAP,SLEEPTALK,SNORE,SUBSTITUTE,SWAGGER,THIEF,TOXIC,TOXICSPIKES,TRICK,TRICKROOM,WILLOWISP,WONDERROOM,ZENHEADBUTT
 Pokedex = A clay slab with cursed engravings took possession of a Yamask. The slab is said to be absorbing the Yamask's dark power.
 Generation = 8
-Flags = InheritFormWithEverStone
-Evolutions = RUNERIGUS,EventAfterDamageTaken,2
+Flags = InheritFormWithEverstone
+Evolution = RUNERIGUS,EventAfterDamageTaken,2
 #-------------------------------
 [DEERLING,1]
 FormName = Summer Form
@@ -1427,7 +1428,7 @@ Weight = 20.5
 Color = Green
 Pokedex = Its conspicuous lips lure prey in as it lies in wait in the mud. When prey gets close, Stunfisk clamps its jagged steel fins down on them.
 Generation = 8
-Flags = InheritFormWithEverStone
+Flags = InheritFormWithEverstone
 #-------------------------------
 [TORNADUS,1]
 FormName = Therian Forme
@@ -1617,7 +1618,7 @@ BaseExp = 243
 Moves = 1,TACKLE,1,VINEWHIP,1,FAIRYWIND,6,FAIRYWIND,10,LUCKYCHANT,15,RAZORLEAF,20,WISH,25,MAGICALLEAF,27,GRASSYTERRAIN,33,PETALBLIZZARD,38,AROMATHERAPY,43,MISTYTERRAIN,46,MOONBLAST,50,LIGHTOFRUIN,51,PETALDANCE,58,SOLARBEAM
 EggGroups = Undiscovered
 Pokedex = The flower it's holding can no longer be found blooming anywhere. It's also thought to contain terrifying power.
-Evolutions = FLORGES,None,
+Evolution = FLORGES,None
 #-------------------------------
 [FLORGES,1]
 FormName = Yellow Flower
@@ -1803,7 +1804,7 @@ Pokedex = It summons the dead with its dreamy dancing. From their malice, it dra
 Abilities = OWNTEMPO
 HiddenAbilities = OWNTEMPO
 Flags = InheritFormFromMother
-Evolutions = LYCANROC,LevelEvening,25
+Evolution = LYCANROC,LevelEvening,25
 #-------------------------------
 [LYCANROC,1]
 FormName = Midnight Form
@@ -2049,7 +2050,7 @@ Pokedex = Capable of generating 15,000 volts of electricity, this Pokémon looks
 [SINISTEA,1]
 FormName = Antique Form
 Pokedex = The swirl pattern in this Pokémon's body is its weakness. If it gets stirred, the swirl loses its shape, and Sinistea gets dizzy.
-Evolutions = POLTEAGEIST,Item,CHIPPEDPOT
+Evolution = POLTEAGEIST,Item,CHIPPEDPOT
 #-------------------------------
 [POLTEAGEIST,1]
 FormName = Antique Form
diff --git a/README.md b/README.md
index a685d154b..24232ce69 100644
--- a/README.md
+++ b/README.md
@@ -33,10 +33,10 @@ You will need Ruby installed to run these scripts. The intention is to replace t
 
 The .gitignore file lists the files that will not be included in this repo. These are:
 
-* The Audio/, Graphics/ and Plugins/ folders and everything in them.
+* The Audio/, Graphics/, Plugins/ and Screenshots/ folders and everything in them.
 * Everything in the Data/ folder, except for:
   * The Data/Scripts/ folder and everything in there.
   * Scripts.rxdata (a special version that just loads the individual script files).
   * messages_core.dat, which contains common messages and is useful for translation projects.
-* A few files in the main project folder (two of the Game.xxx files, and the RGSS dll file).
+* A few files in the main project folder (two of the Game.xxx files, the RGSS dll file and errorlog.txt).
 * Temporary files.
diff --git a/scripts_combine.rb b/scripts_combine.rb
index c4da7497d..56773c9d9 100644
--- a/scripts_combine.rb
+++ b/scripts_combine.rb
@@ -15,10 +15,8 @@ module Scripts
       p "Scripts look like they're already extracted. Not doing so again."
       return
     end
-	
     create_directory(path)
     clear_directory(path)
-	
     folder_id = [1, 1]   # Can only have two layers of folders
     file_id = 1
     level = 0   # 0=main path, 1=subfolder, 2=sub-subfolder
@@ -29,7 +27,6 @@ module Scripts
       title = title_to_filename(title).strip
       script = Zlib::Inflate.inflate(script).delete("\r")
       next if title.empty? && script.empty?
-
       section_name = nil
       if title[/\[\[\s*(.+)\s*\]\]$/]   # Make a folder
         section_name = $~[1].strip
@@ -70,10 +67,7 @@ module Scripts
   end
 
   def self.createLoaderScripts(rxdata)
-#    loader_scripts = File.open("Data/ScriptsLoader.rxdata", 'rb') { |f| Marshal.load(f) }
-#    p loader_scripts
-	txt = "x\x9C}SM\x8F\xDA0\x10\xBD#\xF1\x1F\x86,Rb-2\xCB\xB1\x95\xE8\x1E\xBAm\xD5S\xAB\x85\e\xA0\xC8$\x13p7\xD8\x91\xED\x94n\t\xFF\xBD\xB6C0\xE9\xD7\xC5\xF2\xCCx\xDE\xCC\xBCy\xBE\x83\xE5\x9Ek\xC8%j\x10\xD2\xC0Q\xAA\x17\xE0\x05\x98=\xC2\x8E\x1D\x10l\x10E\xA6^+\x83\xF9h8\x18\x0Er\xB4Q\xC52\xDC\xB2\xEC%UXIe\x86\x03\x00gz?\xCCa<\xA2W\x93f\xA5\x14\xD8{A\x91e\xFB\x134[\xD38\xBF\x8D\x18\xAA\xEB\xED(\x99\xAEO\xC9:\xBF'\xEB\xF3\x94\xC0)Z\xDD\x9D\xC6\xB3\xF3\xC6\x9E\xCF\x9F\x16\x8Bt\xF1\xFE\xF9\xF3\xD7\xE5b5\x9EQ#S\xBEY\xCD6\xE7\xE8\xEC\x10\xFC\xA1\xD0\xD4J\xB8\xDA\a\xD4\x9A\xED\x10\xEE!Z\x8B\xB5\x88\xEC%\xD4\xFE&\xB9H\xAC?\"\xC3\x01\x8A\xBC\eI1\xAE1\r\x83\xA1RR9XKF\x80\xA4\x9A\xFFDx7\x877\x0F\x0Fm\xEB\x1Fy\x89TV(\x92\xF8\x9ALK\xB9\x8B'\x10\x1Fc;\x054E\x03\x05=*n0\x19\x8FH\xDB,\xB4\x05!^vI\x8Ei#%l\xF9\x8E\xC2\x97\xDAT\xB5\x01.\xA0\x0F\xEAR\xB1\xD4x\x03\xE1]n\x8E\x9BaJ\xC9\xF2Tg\x8AWF\xA7\x85\x92\x87\xB4\x90e\x8E*\xA9\x98\xD9\x13\x97Q\xD8\xB6\xB5\x85\x98\xC3j\xE3m\x1F\xD7W\xFB\x89+ZH\xE5\x16\xD5&Y\x89\xB8I\xDA\xC2\x02\x7F\x18GL\x01\xF39\xC44\x86\xA6\xE9\xEE4n\x9F$\x9E\x98\x9C+\xCC\x8CT\xAF\x8F\x1E\xC5md\xEA\xD6Q\x10\x02\x8F]QZ\xD5z\x9F\x14\x04\xDE^\xFA\xEA\x1C\xD7\xD1:\xBF\xB6Z\e\x05\xD3u\xD7\xEB+\x93\xB9\x93_\xD8I\xBF\xE8\x04\"\x15\xB5+\xB1/\x1A\x8FB\xED\x8Cy\xB7\x93-\xEE\xB8h\xAF\xB6\xF2wV&\x0Eq\x02\x82\x97\x13h\xFBq:\xD3Y\x8D\xB0\xF0\xF4~\xE8d\x12Vz\x13\xA0\x02\x8FIPO\x0F\xA0K\xBA\x15\x97\xFB\x03\xC1\x9E\xFC\xF1\xCFH\xAF\xD2\xDF\xD4z%\xAC\xE3\xEDBq`\xEE\xE2\b\xDCy\xC7\x85\xC0\xFF\n'\x10\xE9}\xE4w\xE5\xFD39zb\x86M[^tD~\x01LYX\x94"
-	
+	txt = "x\x9C}SM\x8F\x9B0\x10\xBDG\xCA\x7F\x18\xD8H\x8062\x9Bc\x0Fi\x0F\xDD\xB6\xEA\xA9\xD5&7H\x11\x1FC\xE2.\xB1\x91m\x9AnC\xFE{m\b8t\xDB^\x80\xF9z3\xF3\xE6q\a\xDB\x03\x95Pp\x94\xC0\xB8\x82\x13\x17\xCF@KP\a\x84}zD\xD0Ad\xB9x\xA9\x15\x16\xCE|6\x9F\x15\xA8\xA3\"\xCD1K\xF3\xE7D`\xCD\x85\x9A\xCF\x00\x8C\xD9\xF9a\r\v\x87\x8C&\xC9+\xCEp\x92A0\xCD\x0Fgh3\xD5\x1A\xBF\x8E(\"\x9B\xCC\xF1\xC3\xF8\xEC\xC7\xC5}\x10_\xC2\x00\xCEntw^\xAC.;\xFD|\xFA\xB4\xD9$\x9B\xF7O\x9F\xBFn7\xD1bE\x14O\xE8.Z\xED.\xEE\xC5 t\x0F\x81\xAA\x11\xCC\xF4>\xA2\x94\xE9\x1E\xE1\x1E\xDC\x98\xC5\xCC\xD5\x1F\xB6\xF7wN\x99\xAF\xFDn0\x9F!+\x86\x95DJ%&v1\x14\x82\v\x03\xAB\xC9\xB0\x90D\xD2_\bo\xD7\xF0\xE6\xE1\xA1\x1F\xFD#\xAD\x90\xF0\x1A\x99\xEF\x8D\xC5\xA4\xE2{o\t\xDE\xC9\xD3[@[\xB6P\x92\x93\xA0\n\xFD\x85\x13\xF4\xC3B\xDF\x10\xBC\xEDPd\x98V\x9CCF\xF7\x04\xBE4\xAAn\x14P\x06SPS\x8A\x95\xC4\e\x88\xCEe\xF6\xB8Y\xA6\xE2i\x91\xC8\\\xD0Z\xC9\xA4\x14\xFC\x98\x94\xBC*P\xF8u\xAA\x0E\x81\xA9(\xF5\xD8RC\xAC!\xDAuv\x17\x97\xA3\xFDH\x05)\xB90\x87\xEA\x8B\xB4D\xCC&}c\x86?\x95!\xA6\x84\xF5\x1A<\xE2A\xDB\x0E\xDF\xC4\xEBSt\xB4\xA3\xA6\xA0\x02s\xC5\xC5\xCB\xBB\x0E\xC7\xDC$4\a)\x83>olM\xEAF\x1E\xFC20\x95N\x19\x85\xDFb\x12\xEE\xFA\x1C\xBB\xF1u\xF0\xDB\\\x9D\x1A\x13\x91-B:d\e\x1E\xC6W\x9F/\xB5H\x1Dk\x9A\xB5&\v\xE5\xBC0\xBA\xB5\xC7\x9C\xCE\xBA\x04W\xB8\xFD-uF\xDB\xA1\x10MN1\x1C3\xC3=e\xC3\x88\xF8#\xAD|\x83\xB8\x04F\xAB\xE5\xB8\xAA@\x997\b\x9B\xEE.\x1F\x06}Y-\xDC\x04\b\xC3\x93oe7\x01\x18\x8AnUi~\x1Ek/_\xFD\xA0\xC1\xA4\xD3\xDFd\xFE\x8A\xB7\xEBU,sW\x87\xE5\xAEs\\\t\xFC\xAF\xE2,\x91\x9D/\xF8S\xB2\xFF,v\x1FS\x95\x86=/\xD2\r~\x03\x01\xDDe\xDF"
     File.open(rxdata, "wb") do |f|
       Marshal.dump([[62054200, "Main", txt]], f)
     end
@@ -85,7 +79,6 @@ module Scripts
       p "Scripts.rxdata already has a bunch of scripts in it. Won't consolidate script files."
       return
     end
-
     scripts = []
     aggregate_from_folder(path, scripts)
     # Save scripts to file
@@ -99,11 +92,10 @@ module Scripts
     folders = []
     Dir.foreach(path) do |f|
       next if f == '.' || f == '..'
-
       if File.directory?(path + "/" + f)
-        folders.push(f)
+        folders.push(f) if !f[/^\./]
       else
-        files.push(f)
+        files.push(f) if f[/\.rb$/i]
       end
     end
     # Aggregate individual script files into Scripts.rxdata
@@ -187,7 +179,5 @@ module Scripts
   end
 end
 
-#Scripts.dump("D:/Desktop/Scripts", "D:/Desktop/Main Essentials/Data/Scripts.rxdata")
-#Scripts.from_folder("D:/Desktop/Scripts", "D:/Desktop/Main Essentials/Data/Scripts.rxdata")
 #Scripts.dump
 Scripts.from_folder
diff --git a/scripts_extract.rb b/scripts_extract.rb
index 824f13783..094c156e8 100644
--- a/scripts_extract.rb
+++ b/scripts_extract.rb
@@ -15,10 +15,8 @@ module Scripts
       p "Scripts look like they're already extracted. Not doing so again."
       return
     end
-	
     create_directory(path)
     clear_directory(path)
-	
     folder_id = [1, 1]   # Can only have two layers of folders
     file_id = 1
     level = 0   # 0=main path, 1=subfolder, 2=sub-subfolder
@@ -29,7 +27,6 @@ module Scripts
       title = title_to_filename(title).strip
       script = Zlib::Inflate.inflate(script).delete("\r")
       next if title.empty? && script.empty?
-
       section_name = nil
       if title[/\[\[\s*(.+)\s*\]\]$/]   # Make a folder
         section_name = $~[1].strip
@@ -70,10 +67,7 @@ module Scripts
   end
 
   def self.createLoaderScripts(rxdata)
-#    loader_scripts = File.open("Data/ScriptsLoader.rxdata", 'rb') { |f| Marshal.load(f) }
-#    p loader_scripts
-	txt = "x\x9C}SM\x8F\xDA0\x10\xBD#\xF1\x1F\x86,Rb-2\xCB\xB1\x95\xE8\x1E\xBAm\xD5S\xAB\x85\e\xA0\xC8$\x13p7\xD8\x91\xED\x94n\t\xFF\xBD\xB6C0\xE9\xD7\xC5\xF2\xCCx\xDE\xCC\xBCy\xBE\x83\xE5\x9Ek\xC8%j\x10\xD2\xC0Q\xAA\x17\xE0\x05\x98=\xC2\x8E\x1D\x10l\x10E\xA6^+\x83\xF9h8\x18\x0Er\xB4Q\xC52\xDC\xB2\xEC%UXIe\x86\x03\x00gz?\xCCa<\xA2W\x93f\xA5\x14\xD8{A\x91e\xFB\x134[\xD38\xBF\x8D\x18\xAA\xEB\xED(\x99\xAEO\xC9:\xBF'\xEB\xF3\x94\xC0)Z\xDD\x9D\xC6\xB3\xF3\xC6\x9E\xCF\x9F\x16\x8Bt\xF1\xFE\xF9\xF3\xD7\xE5b5\x9EQ#S\xBEY\xCD6\xE7\xE8\xEC\x10\xFC\xA1\xD0\xD4J\xB8\xDA\a\xD4\x9A\xED\x10\xEE!Z\x8B\xB5\x88\xEC%\xD4\xFE&\xB9H\xAC?\"\xC3\x01\x8A\xBC\eI1\xAE1\r\x83\xA1RR9XKF\x80\xA4\x9A\xFFDx7\x877\x0F\x0Fm\xEB\x1Fy\x89TV(\x92\xF8\x9ALK\xB9\x8B'\x10\x1Fc;\x054E\x03\x05=*n0\x19\x8FH\xDB,\xB4\x05!^vI\x8Ei#%l\xF9\x8E\xC2\x97\xDAT\xB5\x01.\xA0\x0F\xEAR\xB1\xD4x\x03\xE1]n\x8E\x9BaJ\xC9\xF2Tg\x8AWF\xA7\x85\x92\x87\xB4\x90e\x8E*\xA9\x98\xD9\x13\x97Q\xD8\xB6\xB5\x85\x98\xC3j\xE3m\x1F\xD7W\xFB\x89+ZH\xE5\x16\xD5&Y\x89\xB8I\xDA\xC2\x02\x7F\x18GL\x01\xF39\xC44\x86\xA6\xE9\xEE4n\x9F$\x9E\x98\x9C+\xCC\x8CT\xAF\x8F\x1E\xC5md\xEA\xD6Q\x10\x02\x8F]QZ\xD5z\x9F\x14\x04\xDE^\xFA\xEA\x1C\xD7\xD1:\xBF\xB6Z\e\x05\xD3u\xD7\xEB+\x93\xB9\x93_\xD8I\xBF\xE8\x04\"\x15\xB5+\xB1/\x1A\x8FB\xED\x8Cy\xB7\x93-\xEE\xB8h\xAF\xB6\xF2wV&\x0Eq\x02\x82\x97\x13h\xFBq:\xD3Y\x8D\xB0\xF0\xF4~\xE8d\x12Vz\x13\xA0\x02\x8FIPO\x0F\xA0K\xBA\x15\x97\xFB\x03\xC1\x9E\xFC\xF1\xCFH\xAF\xD2\xDF\xD4z%\xAC\xE3\xEDBq`\xEE\xE2\b\xDCy\xC7\x85\xC0\xFF\n'\x10\xE9}\xE4w\xE5\xFD39zb\x86M[^tD~\x01LYX\x94"
-	
+	txt = "x\x9C}SM\x8F\x9B0\x10\xBDG\xCA\x7F\x18\xD8H\x8062\x9Bc\x0Fi\x0F\xDD\xB6\xEA\xA9\xD5&7H\x11\x1FC\xE2.\xB1\x91m\x9AnC\xFE{m\b8t\xDB^\x80\xF9z3\xF3\xE6q\a\xDB\x03\x95Pp\x94\xC0\xB8\x82\x13\x17\xCF@KP\a\x84}zD\xD0Ad\xB9x\xA9\x15\x16\xCE|6\x9F\x15\xA8\xA3\"\xCD1K\xF3\xE7D`\xCD\x85\x9A\xCF\x00\x8C\xD9\xF9a\r\v\x87\x8C&\xC9+\xCEp\x92A0\xCD\x0Fgh3\xD5\x1A\xBF\x8E(\"\x9B\xCC\xF1\xC3\xF8\xEC\xC7\xC5}\x10_\xC2\x00\xCEntw^\xAC.;\xFD|\xFA\xB4\xD9$\x9B\xF7O\x9F\xBFn7\xD1bE\x14O\xE8.Z\xED.\xEE\xC5 t\x0F\x81\xAA\x11\xCC\xF4>\xA2\x94\xE9\x1E\xE1\x1E\xDC\x98\xC5\xCC\xD5\x1F\xB6\xF7wN\x99\xAF\xFDn0\x9F!+\x86\x95DJ%&v1\x14\x82\v\x03\xAB\xC9\xB0\x90D\xD2_\bo\xD7\xF0\xE6\xE1\xA1\x1F\xFD#\xAD\x90\xF0\x1A\x99\xEF\x8D\xC5\xA4\xE2{o\t\xDE\xC9\xD3[@[\xB6P\x92\x93\xA0\n\xFD\x85\x13\xF4\xC3B\xDF\x10\xBC\xEDPd\x98V\x9CCF\xF7\x04\xBE4\xAAn\x14P\x06SPS\x8A\x95\xC4\e\x88\xCEe\xF6\xB8Y\xA6\xE2i\x91\xC8\\\xD0Z\xC9\xA4\x14\xFC\x98\x94\xBC*P\xF8u\xAA\x0E\x81\xA9(\xF5\xD8RC\xAC!\xDAuv\x17\x97\xA3\xFDH\x05)\xB90\x87\xEA\x8B\xB4D\xCC&}c\x86?\x95!\xA6\x84\xF5\x1A<\xE2A\xDB\x0E\xDF\xC4\xEBSt\xB4\xA3\xA6\xA0\x02s\xC5\xC5\xCB\xBB\x0E\xC7\xDC$4\a)\x83>olM\xEAF\x1E\xFC20\x95N\x19\x85\xDFb\x12\xEE\xFA\x1C\xBB\xF1u\xF0\xDB\\\x9D\x1A\x13\x91-B:d\e\x1E\xC6W\x9F/\xB5H\x1Dk\x9A\xB5&\v\xE5\xBC0\xBA\xB5\xC7\x9C\xCE\xBA\x04W\xB8\xFD-uF\xDB\xA1\x10MN1\x1C3\xC3=e\xC3\x88\xF8#\xAD|\x83\xB8\x04F\xAB\xE5\xB8\xAA@\x997\b\x9B\xEE.\x1F\x06}Y-\xDC\x04\b\xC3\x93oe7\x01\x18\x8AnUi~\x1Ek/_\xFD\xA0\xC1\xA4\xD3\xDFd\xFE\x8A\xB7\xEBU,sW\x87\xE5\xAEs\\\t\xFC\xAF\xE2,\x91\x9D/\xF8S\xB2\xFF,v\x1FS\x95\x86=/\xD2\r~\x03\x01\xDDe\xDF"
     File.open(rxdata, "wb") do |f|
       Marshal.dump([[62054200, "Main", txt]], f)
     end
@@ -85,7 +79,6 @@ module Scripts
       p "Scripts.rxdata already has a bunch of scripts in it. Won't consolidate script files."
       return
     end
-
     scripts = []
     aggregate_from_folder(path, scripts)
     # Save scripts to file
@@ -99,11 +92,10 @@ module Scripts
     folders = []
     Dir.foreach(path) do |f|
       next if f == '.' || f == '..'
-
       if File.directory?(path + "/" + f)
-        folders.push(f)
+        folders.push(f) if !f[/^\./]
       else
-        files.push(f)
+        files.push(f) if f[/\.rb$/i]
       end
     end
     # Aggregate individual script files into Scripts.rxdata
@@ -187,7 +179,5 @@ module Scripts
   end
 end
 
-#Scripts.dump("D:/Desktop/Scripts", "D:/Desktop/Main Essentials/Data/Scripts.rxdata")
-#Scripts.from_folder("D:/Desktop/Scripts", "D:/Desktop/Main Essentials/Data/Scripts.rxdata")
 Scripts.dump
 #Scripts.from_folder
diff --git a/townmapgen.html b/townmapgen.html
index 804d2282b..6bffe3fc6 100644
--- a/townmapgen.html
+++ b/townmapgen.html
@@ -1,49 +1,80 @@
 <body>
-<div id="map">
-  <img name="map" src="Graphics/Pictures/mapRegion0.png" alt="" width="480" height="320"/>
+<div>
+  <u>Town Map Generator</u>
 </div>
 <form name="mf" action="javascript:void(null)">
-  <div>
-    Map Filename (in Graphics/Pictures/): <input type="text" name="filename" value="mapRegion0.png"/>&nbsp;
-    <input type="button" name="btnChange" value="Change"/><br/ >
-    Square width: <input type="text" name="sqwidth" size="4" min="1" max="16" value="16"/>&nbsp;
-    Square height: <input type="text" name="sqheight" size="4" min="1" max="16" value="16"/>&nbsp;
-    <input type="button" name="btnRefresh" value="Refresh"/><br/ >
-    Region Name: <input type="text" name="name" value="Sample Region"/>&nbsp;
-    <input type="button" name="btnChange2" value="Change"/>
-  </div>
-</form>
-<hr/>
-<form name="f" action="javascript:void(null)">
   <table>
     <tr>
-      <td>Current Position:</td>
-	  <td><input type="text" name="curpos" readonly="readonly"/></td>
+      <td>Filename:</td>
+	  <td><input type="text" name="filename" value="mapRegion0.png"/></td>
+      <td><input type="button" name="btnChange" value="Change"/></td>
+      <td>Name of the region graphic (in Graphics/UI/Town Map/)</td>
 	</tr>
     <tr>
       <td>Name:</td>
-	  <td><input type="text" name="locname"/><td>
+	  <td><input type="text" name="name" value="Sample Region"/></td>
+      <td><input type="button" name="btnChange2" value="Change"/></td>
+      <td>Name of the region</td>
 	</tr>
     <tr>
-      <td>Point of Interest:</td>
-	  <td><input type="text" name="poi"/><td>
+      <td>Square width:</td>
+	  <td><input type="text" name="sqwidth" size="4" min="1" max="16" value="16"/></td>
+      <td><input type="button" name="btnRefreshWidth" value="Refresh"/></td>
+      <td>Width of each point in the Town Map (in pixels)</td>
 	</tr>
     <tr>
-      <td>Fly Destination:</td>
-	  <td><input type="text" name="healing"/><td>
+      <td>Square height:</td>
+	  <td><input type="text" name="sqheight" size="4" min="1" max="16" value="16"/></td>
+      <td><input type="button" name="btnRefreshHeight" value="Refresh"/></td>
+      <td>Height of each point in the Town Map (in pixels)</td>
+	</tr>
+  </table>
+</form>
+<hr/>
+<div>
+  <u>Edit point properties</u><br />
+  Click on a point in the Town Map to edit its properties.
+</div>
+<div id="map">
+  <img name="map" src="Graphics/UI/Town Map/mapRegion0.png" alt="" width="480" height="320"/>
+</div>
+<form name="f" action="javascript:void(null)">
+  <table>
+    <tr>
+      <td>Co-ordinates:</td>
+	  <td><input type="text" name="curpos" readonly="readonly"/></td>
+      <td>X and Y co-ordinates of this point in the Town Map (click in the map above)</td>
+	</tr>
+    <tr>
+      <td>Name:</td>
+	  <td><input type="text" name="locname"/></td>
+      <td>Name of this location</td>
+	</tr>
+    <tr>
+      <td>Landmark:</td>
+	  <td><input type="text" name="poi"/></td>
+      <td>Name of a landmark found in this location</td>
+	</tr>
+    <tr>
+      <td>Fly destination:</td>
+	  <td><input type="text" name="healing"/></td>
+      <td>Map ID, X and Y tile co-ordinates the player will appear at when Flying to this location</td>
 	</tr>
     <tr>
       <td>Switch:</td>
-	  <td><input type="text" name="swtch"/><td>
+	  <td><input type="text" name="swtch"/></td>
+      <td>Number of a Game Switch that needs to be ON to see this point's name/landmark and to Fly to this location</td>
 	</tr>
   </table>
   <div>
     <input type="button" name="btnSave" value="Save" disabled="disabled"/> 
     <input type="button" name="btnCancel" value="Cancel"/><br/ >
-    Single section from townmap.txt (without section heading):<br/ >
+    <hr/>
+    <u>PBS file "town_map.txt" text for this region</u><br />
     <textarea name="data" rows="10" cols="70"></textarea><br/ >
-    <input type="button" name="btnLoad" value="Load"/> (To load data into the editor)<br/ >
-    Copy the data above into townmap.txt when you're done.
+    <input type="button" name="btnLoad" value="Load into map"/>&nbsp;
+    Apply the data in this box to the map above<br/ >
+    When you're done, copy this text into "town_map.txt". Remember that it needs a section line (a number in square brackets).
   </div>
 </form>
 <script type="text/javascript">
@@ -188,13 +219,18 @@
     for(var i=0;i<lines.length;i++){
       lines[i]=lines[i].replace(/\s+$/,"")
       if(!/^\#/.test(lines[i])&&!/^\s*$/.test(lines[i])){
+        esec=/^\s*\[\s*\d+\s*\]\s*$/.exec(lines[i])
+        if(esec){
+          continue;
+        }
         e=/^\s*(\w+)\s*=\s*(.*)$/.exec(lines[i])
         if(!e){
           alert("Bad line syntax in line "+(i+1))
         }
         if(e[1]=="Filename"){
           o=document.getElementById("map")
-          o.innerHTML='<img name="map" src="Graphics/Pictures/'+e[2]+'" alt="" width="480" height="320"/'+'>' 
+          o.innerHTML='<img name="map" src="Graphics/UI/Town Map/'+e[2]+'" alt="" width="480" height="320"/'+'>' 
+          document.mf.filename.value=e[2]
         } else if(e[1]=="Name"){
           document.mf.name.value=e[2]
         } else if(e[1]=="Point"){
@@ -356,7 +392,7 @@
       showMapPoints()
     })
     attachEvent(document.mf.btnChange,"click",function(e){
-      document.images.map.src="Graphics/Pictures/"+document.mf.filename.value
+      document.images.map.src="Graphics/UI/Town Map/"+document.mf.filename.value
       genMapPoints()
       showMapPoints()
     })
@@ -364,7 +400,12 @@
       genMapPoints()
       showMapPoints()
     })
-    attachEvent(document.mf.btnRefresh,"click",function(e){
+    attachEvent(document.mf.btnRefreshWidth,"click",function(e){
+      choiceX=choiceY=-1
+      document.f.curpos.value=""
+      showMapPoints()
+    })
+    attachEvent(document.mf.btnRefreshHeight,"click",function(e){
       choiceX=choiceY=-1
       document.f.curpos.value=""
       showMapPoints()