Merge branch 'master' into Unbound

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).

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())

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():