Merge pull request #55 from fig02/master

Fix make setup

Jenkinsfile

@@ -6,7 +6,6 @@ pipeline {
             steps {
                 echo 'Setting up...'
                 sh 'cp /usr/local/etc/roms/baserom_oot.z64 baserom_original.z64'
-                sh 'git submodule update --init --recursive'
                 sh 'cp -r /usr/local/etc/ido/ido7.1_compiler tools/ido7.1_compiler'
                 sh 'chmod +x -R tools/ido*'
                 sh 'make -j`nproc` setup'

fixbaserom.py

@@ -48,10 +48,10 @@ print("Patching header...")
 strippedContent[0x3E] = 0x50
 
 # Check to see if the ROM is a "vanilla" Debug ROM
-md5Hash = hashlib.md5(bytearray(strippedContent)).hexdigest()
+md5Hash = hashlib.md5(bytes(strippedContent)).hexdigest()
 
 if (str(md5Hash) != "f0b7f35375f9cc8ca1b2d59d78e35405"):
-    print("Error: Expected a hash of f0b7f35375f9cc8ca1b2d59d78e35405 but got " + str(md5Hash) + ". The baserom is probably not \"vanilla\"")
+    print("Error: Expected a hash of f0b7f35375f9cc8ca1b2d59d78e35405 but got " + str(md5Hash) + ". The baserom has probably been tampered, find a new one")
     sys.exit(1)
 
 # Write out our new ROM

makefile

@@ -130,6 +130,7 @@ clean:
 	$(RM) $(ROM) $(ELF) -r build
 
 setup:
+	git submodule update --init --recursive
 	make -C tools
 	python3 fixbaserom.py
 	python3 extract_baserom.py