diff --git a/Data/Scripts/001_Technical/003_Intl_Messages.rb b/Data/Scripts/001_Technical/003_Intl_Messages.rb
index 7aec32454..7f8b21799 100644
--- a/Data/Scripts/001_Technical/003_Intl_Messages.rb
+++ b/Data/Scripts/001_Technical/003_Intl_Messages.rb
@@ -32,6 +32,19 @@ def pbSetTextMessages
       scr=Zlib::Inflate.inflate(script[2])
       pbAddRgssScriptTexts(texts,scr)
     end
+    if safeExists?("Data/PluginScripts.rxdata")
+      plugin_scripts = load_data("Data/PluginScripts.rxdata")
+      for plugin in plugin_scripts
+        for script in plugin[2]
+          if Time.now.to_i - t >= 5
+            t = Time.now.to_i
+            Graphics.update
+          end
+          scr = Zlib::Inflate.inflate(script[1]).force_encoding(Encoding::UTF_8)
+          pbAddRgssScriptTexts(texts,scr)
+        end
+      end
+    end
     # Must add messages because this code is used by both game system and Editor
     MessageTypes.addMessagesAsHash(MessageTypes::ScriptTexts,texts)
     commonevents = load_data("Data/CommonEvents.rxdata")
@@ -250,7 +263,8 @@ def pbGetText(infile)
           raise _INTL("Section {1} has an odd number of entries (section was recognized as a hash because its first line is not a number)",name)
         end
       end
-      i=0;loop do break unless i<section.length
+      i=0
+      loop do break unless i<section.length
         if itemlength==3
           if !section[i][/^\d+$/]
             raise _INTL("Expected a number in section {1}, got {2} instead",name,section[i])
diff --git a/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb b/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb
index edb11374f..7c5ab3970 100644
--- a/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb
+++ b/Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb
@@ -489,10 +489,12 @@ class PokeBattle_Move_096 < PokeBattle_Move
   def pbBaseType(user)
     item = user.item
     ret = :NORMAL
-    @typeArray.each do |type, items|
-      next if !items.include?(item.id)
-      ret = type if GameData::Type.exists?(type)
-      break
+    if item
+      @typeArray.each do |type, items|
+        next if !items.include?(item.id)
+        ret = type if GameData::Type.exists?(type)
+        break
+      end
     end
     return ret
   end
diff --git a/Data/Scripts/015_Trainers and player/001_Trainer.rb b/Data/Scripts/015_Trainers and player/001_Trainer.rb
index ab08ac0aa..a05dd36c7 100644
--- a/Data/Scripts/015_Trainers and player/001_Trainer.rb	
+++ b/Data/Scripts/015_Trainers and player/001_Trainer.rb	
@@ -152,7 +152,7 @@ class Trainer
   def has_pokemon_of_type?(type)
     return false if !GameData::Type.exists?(type)
     type = GameData::Type.get(type).id
-    return pokemon_party.any? { |p| p && p.hasType(type) }
+    return pokemon_party.any? { |p| p && p.hasType?(type) }
   end
 
   # Checks whether any Pokémon in the party knows the given move, and returns