diff --git a/Data/Scripts/021_Debug/005_Editor_SaveData.rb b/Data/Scripts/021_Debug/005_Editor_SaveData.rb
index 9cad5cde2..288eee001 100644
--- a/Data/Scripts/021_Debug/005_Editor_SaveData.rb
+++ b/Data/Scripts/021_Debug/005_Editor_SaveData.rb
@@ -788,7 +788,7 @@ def pbSavePokemonData
       has_param = !PBEvolution.hasFunction?(method, "parameterType") || param_type != nil
       if has_param
         if param_type
-          if [:Ability, :Item, :Move, :TrainerType, :Type].include?(param_type)
+          if GameData.const_defined?(param_type.to_sym)
             pokedata.write("#{parameter.to_s}")
           else
             cparameter = (getConstantName(param_type, parameter) rescue parameter)
@@ -1236,7 +1236,7 @@ def pbSavePokemonFormsData
         has_param = !PBEvolution.hasFunction?(method, "parameterType") || param_type != nil
         if has_param
           if param_type
-            if [:Ability, :Item, :Move, :TrainerType, :Type].include?(param_type)
+            if GameData.const_defined?(param_type.to_sym)
               pokedata.write("#{parameter.to_s}")
             else
               cparameter = (getConstantName(param_type, parameter) rescue parameter)
diff --git a/Data/Scripts/022_Compiler/002_Compiler.rb b/Data/Scripts/022_Compiler/002_Compiler.rb
index 1f88a61a8..665dae38d 100644
--- a/Data/Scripts/022_Compiler/002_Compiler.rb
+++ b/Data/Scripts/022_Compiler/002_Compiler.rb
@@ -311,7 +311,7 @@ module Compiler
       end
       return enumer.const_get(ret.to_sym)
     elsif enumer.is_a?(Symbol) || enumer.is_a?(String)
-      if [:Ability, :Item, :Move, :TrainerType, :Type].include?(enumer)
+      if GameData.const_defined?(enumer.to_sym)
         enumer = GameData.const_get(enumer.to_sym)
         begin
           if ret == "" || !enumer.exists?(ret.to_sym)
@@ -322,7 +322,6 @@ module Compiler
         end
         return ret.to_sym
       end
-
       enumer = Object.const_get(enumer.to_sym)
       begin
         if ret=="" || !enumer.const_defined?(ret)
@@ -353,12 +352,11 @@ module Compiler
       return nil if ret=="" || !(enumer.const_defined?(ret) rescue false)
       return enumer.const_get(ret.to_sym)
     elsif enumer.is_a?(Symbol) || enumer.is_a?(String)
-      if [:Ability, :Item, :Move, :TrainerType, :Type].include?(enumer)
+      if GameData.const_defined?(enumer.to_sym)
         enumer = GameData.const_get(enumer.to_sym)
         return nil if ret == "" || !enumer.exists?(ret.to_sym)
         return ret.to_sym
       end
-
       enumer = Object.const_get(enumer.to_sym)
       return nil if ret=="" || !(enumer.const_defined?(ret) rescue false)
       return enumer.const_get(ret.to_sym)