diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/021_Compiler/001_Compiler.rb
index a50c303a4..2592adeb9 100644
--- a/Data/Scripts/021_Compiler/001_Compiler.rb
+++ b/Data/Scripts/021_Compiler/001_Compiler.rb
@@ -959,7 +959,7 @@ module Compiler
       return ret
     end
     @@categories.each_pair do |category, procs|
-      ret.push(category) if procs[:should_compile]&.call
+      ret.push(category) if procs[:should_compile]&.call(ret)
     end
     return ret
   end
diff --git a/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb b/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
index 96b3f7f05..df5a5945d 100644
--- a/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
+++ b/Data/Scripts/021_Compiler/002_Compiler_CompilePBS.rb
@@ -1,6 +1,6 @@
 module Compiler
   @@categories[:pbs_files] = {
-    :should_compile => proc { next should_compile_pbs_files? },
+    :should_compile => proc { |compiling| next should_compile_pbs_files? },
     :header_text    => proc { next _INTL("Compiling PBS files") },
     :skipped_text   => proc { next _INTL("Not compiled") },
     :compile        => proc {
diff --git a/Data/Scripts/021_Compiler/004_Compiler_Animations.rb b/Data/Scripts/021_Compiler/004_Compiler_Animations.rb
index 51fa20562..af2e9d409 100644
--- a/Data/Scripts/021_Compiler/004_Compiler_Animations.rb
+++ b/Data/Scripts/021_Compiler/004_Compiler_Animations.rb
@@ -1,6 +1,6 @@
 module Compiler
   @@categories[:animations] = {
-    :should_compile => proc { next false },
+    :should_compile => proc { |compiling| next false },
     :header_text    => proc { next _INTL("Compiling animations") },
     :skipped_text   => proc { next _INTL("Not compiled") },
     :compile        => proc { compile_animations }
diff --git a/Data/Scripts/021_Compiler/005_Compiler_MapsAndEvents.rb b/Data/Scripts/021_Compiler/005_Compiler_MapsAndEvents.rb
index 91e6207a7..5e3ac0587 100644
--- a/Data/Scripts/021_Compiler/005_Compiler_MapsAndEvents.rb
+++ b/Data/Scripts/021_Compiler/005_Compiler_MapsAndEvents.rb
@@ -38,14 +38,14 @@ module Compiler
   ]
 
   @@categories[:map_data] = {
-    :should_compile => proc { next import_new_maps },
+    :should_compile => proc { |compiling| next import_new_maps },
     :header_text    => proc { next _INTL("Modifying map data") },
     :skipped_text   => proc { next _INTL("Not modified") },
     :compile        => proc { compile_trainer_events }
   }
 
   @@categories[:messages] = {
-    :should_compile => proc { next false },
+    :should_compile => proc { |compiling| next compiling.include?(:pbs_files) || compiling.include?(:map_data) },
     :header_text    => proc { next _INTL("Gathering messages for translations") },
     :skipped_text   => proc { next _INTL("Not gathered") },
     :compile        => proc {