From e7d1e80f30af7dad36314d884db42660d43ade9a Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Sun, 29 Sep 2019 00:49:54 -0400
Subject: [PATCH] Fix Tutor Compatability Issue

---
 README.md        | 2 +-
 scripts/build.py | 3 ++-
 scripts/make.py  | 8 ++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 77e07a3..41c3670 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ A dynamic data insertion tool for expanding Pokemon data in FireRed.
 ```
 1. Download devkitpro. Follow the instructions.
 (Note: you can only install devkitARM)
-For Windows users, follows steps 4-6 from this tutorial:
+For Windows users, follow steps 4-6 from this tutorial:
 https://www.pokecommunity.com/showpost.php?p=8825585&postcount=96
 
 2. Download the latest version of python (3.7.2).
diff --git a/scripts/build.py b/scripts/build.py
index 4bd4421..7c04c6b 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -9,7 +9,7 @@ import subprocess
 import sys
 from datetime import datetime
 from string import StringFileConverter
-from tm_tutor import TMDataBuilder
+from tm_tutor import TMDataBuilder, TutorDataBuilder
 
 if sys.platform.startswith('win'):
     PathVar = os.environ.get('Path')
@@ -397,6 +397,7 @@ def main():
 
         ProcessSpriteGraphics()
         TMDataBuilder()
+        TutorDataBuilder()
 
         # Gather source files and process them
         objects = itertools.starmap(RunGlob, globs.items())
diff --git a/scripts/make.py b/scripts/make.py
index 626a997..707d604 100644
--- a/scripts/make.py
+++ b/scripts/make.py
@@ -2,6 +2,7 @@
 
 import os
 import shutil
+import sys
 
 ############
 #Options go here.
@@ -74,9 +75,12 @@ def EditInsert(offset: int):
 
 def BuildCode():
     if shutil.which('python3') is not None:
-        os.system("python3 scripts/build.py")
+        result = os.system("python3 scripts/build.py")
     else:
-        os.system("python scripts/build.py")
+        result = os.system("python scripts/build.py")
+
+    if result != 0:  # Build wasn't sucessful
+        sys.exit(1)
 
 
 def InsertCode():