Update tool sources and binaries from pokeemeraldHEADmaster

1 files changed, 13 insertions, 6 deletions

diff --git a/tools/scaninc/scaninc.cpp b/tools/scaninc/scaninc.cpp
index b95cbd0..a3e40c5 100644
--- a/tools/scaninc/scaninc.cpp
+++ b/tools/scaninc/scaninc.cpp
@@ -97,19 +97,26 @@ int main(int argc, char **argv)
         }
         for (auto include : file.GetIncludes())
         {
+            bool exists = false;
+            std::string path("");
             for (auto includeDir : includeDirs)
             {
-                std::string path(includeDir + include);
+                path = includeDir + include;
                 if (CanOpenFile(path))
                 {
-                    bool inserted = dependencies.insert(path).second;
-                    if (inserted)
-                    {
-                        filesToProcess.push(path);
-                    }
+                    exists = true;
                     break;
                 }
             }
+            if (!exists && file.FileType() == SourceFileType::Asm)
+            {
+                path = include;
+            }
+            bool inserted = dependencies.insert(path).second;
+            if (inserted && exists)
+            {
+                filesToProcess.push(path);
+            }
         }
         includeDirs.pop_back();
     }