ability evolution fix

Data/Scripts/001_Settings.rb

@@ -6,7 +6,7 @@
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
   GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "5.0.31 - beta"
+  GAME_VERSION_NUMBER = "5.0.32 - beta"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18

Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb

@@ -602,6 +602,12 @@ class PokemonEvolutionScene
     @sprites["msgwindow"].text = ""
     # Check for consumed item and check if Pokémon should be duplicated
     pbEvolutionMethodAfterEvolution
+
+    oldAbility = @pokemon.ability.id
+    newSpecies = GameData::Species.get(@newspecies)
+
+    allNewPossibleAbilities = newSpecies.abilities + newSpecies.hidden_abilities
+
     # Modify Pokémon to make it evolved
     @pokemon.species = @newspecies
     @pokemon.form    = 0 if @pokemon.isSpecies?(:MOTHIM)
@@ -609,6 +615,11 @@ class PokemonEvolutionScene
     # See and own evolved species
     $Trainer.pokedex.register(@pokemon)
     $Trainer.pokedex.set_owned(@newspecies)
+
+    if allNewPossibleAbilities.include?(oldAbility)
+      @pokemon.ability=oldAbility
+    end
+
     # Learn moves upon evolution for evolved species
     movelist = @pokemon.getMoveList
     for i in movelist

PBS/types.txt

@@ -1,115 +1,117 @@
-[0]
+# See the documentation on the wiki to learn how to edit this file.
+#-------------------------------
+[0]
 Name = Normal
 InternalName = NORMAL
 Weaknesses = FIGHTING
 Immunities = GHOST
-
+#-------------------------------
 [1]
 Name = Fighting
 InternalName = FIGHTING
 Weaknesses = FLYING,PSYCHIC,FAIRY
 Resistances = ROCK,BUG,DARK
-
+#-------------------------------
 [2]
 Name = Flying
 InternalName = FLYING
-Weaknesses=ROCK,ELECTRIC,ICE,ICEFIREELECTRIC
+Weaknesses = ROCK,ELECTRIC,ICE
 Resistances = FIGHTING,BUG,GRASS
 Immunities = GROUND
-
+#-------------------------------
 [3]
 Name = Poison
 InternalName = POISON
 Weaknesses = GROUND,PSYCHIC
 Resistances = FIGHTING,POISON,BUG,GRASS,FAIRY
-
+#-------------------------------
 [4]
 Name = Ground
 InternalName = GROUND
 Weaknesses = WATER,GRASS,ICE
 Resistances = POISON,ROCK
 Immunities = ELECTRIC
-
+#-------------------------------
 [5]
 Name = Rock
 InternalName = ROCK
 Weaknesses = FIGHTING,GROUND,STEEL,WATER,GRASS
 Resistances = NORMAL,FLYING,POISON,FIRE
-
+#-------------------------------
 [6]
 Name = Bug
 InternalName = BUG
-Weaknesses=FLYING,ROCK,FIRE,ICEFIREELECTRIC
+Weaknesses = FLYING,ROCK,FIRE
 Resistances = FIGHTING,GROUND,GRASS
-
+#-------------------------------
 [7]
 Name = Ghost
 InternalName = GHOST
 Weaknesses = GHOST,DARK
 Resistances = POISON,BUG
 Immunities = NORMAL,FIGHTING
-
+#-------------------------------
 [8]
 Name = Steel
 InternalName = STEEL
 Weaknesses = FIGHTING,GROUND,FIRE
-Resistances=NORMAL,FLYING,ROCK,BUG,GHOST,STEEL,GRASS,PSYCHIC,ICE,DRAGON,DARK,FAIRY
+Resistances = NORMAL,FLYING,ROCK,BUG,STEEL,GRASS,PSYCHIC,ICE,DRAGON,FAIRY
 Immunities = POISON
-
+#-------------------------------
 [9]
 Name = ???
 InternalName = QMARKS
 IsPseudoType = true
-
+#-------------------------------
 [10]
 Name = Fire
 InternalName = FIRE
 IsSpecialType = true
 Weaknesses = GROUND,ROCK,WATER
 Resistances = BUG,STEEL,FIRE,GRASS,ICE,FAIRY
-
+#-------------------------------
 [11]
 Name = Water
 InternalName = WATER
 IsSpecialType = true
 Weaknesses = GRASS,ELECTRIC
 Resistances = STEEL,FIRE,WATER,ICE
-
+#-------------------------------
 [12]
 Name = Grass
 InternalName = GRASS
 IsSpecialType = true
 Weaknesses = FLYING,POISON,BUG,FIRE,ICE
 Resistances = GROUND,WATER,GRASS,ELECTRIC
-
+#-------------------------------
 [13]
 Name = Electric
 InternalName = ELECTRIC
 IsSpecialType = true
 Weaknesses = GROUND
 Resistances = FLYING,STEEL,ELECTRIC
-
+#-------------------------------
 [14]
 Name = Psychic
 InternalName = PSYCHIC
 IsSpecialType = true
 Weaknesses = BUG,GHOST,DARK
 Resistances = FIGHTING,PSYCHIC
-
+#-------------------------------
 [15]
 Name = Ice
 InternalName = ICE
 IsSpecialType = true
 Weaknesses = FIGHTING,ROCK,STEEL,FIRE
 Resistances = ICE
-
+#-------------------------------
 [16]
 Name = Dragon
 InternalName = DRAGON
 IsSpecialType = true
 Weaknesses = ICE,DRAGON,FAIRY
 Resistances = FIRE,WATER,GRASS,ELECTRIC
-
+#-------------------------------
 [17]
 Name = Dark
 InternalName = DARK
@@ -117,13 +119,13 @@ IsSpecialType=true
 Weaknesses = FIGHTING,BUG,FAIRY
 Resistances = GHOST,DARK
 Immunities = PSYCHIC
-
+#-------------------------------
 [18]
 Name = Fairy
 InternalName = FAIRY
 IsSpecialType = true
 Weaknesses = POISON,STEEL
-Resistances=BUG,DARK,FIGHTING
+Resistances = FIGHTING,BUG,DARK
 Immunities = DRAGON
 
 [19]