diff --git a/Makefile b/Makefile
index fe57a335b..9219eca07 100644
--- a/Makefile
+++ b/Makefile
@@ -895,7 +895,7 @@ $(BUILD_DIR)/sm64_prelim.elf: $(BUILD_DIR)/sm64_prelim.ld
 
 $(BUILD_DIR)/goddard.txt: $(BUILD_DIR)/sm64_prelim.elf
 	$(call print,Getting Goddard size...)
-	$(V)python3 tools/getGoddardSize.py $(BUILD_DIR)/sm64_prelim.map $(VERSION)
+	$(V)python3 tools/getGoddardSize.py $(BUILD_DIR)/sm64_prelim.map $(BUILD_DIR)
 
 $(BUILD_DIR)/asm/debug/map.o: asm/debug/map.s $(BUILD_DIR)/sm64_prelim.elf
 	$(call print,Assembling:,$<,$@)
diff --git a/tools/getGoddardSize.py b/tools/getGoddardSize.py
index a3e528a69..23c1541cb 100644
--- a/tools/getGoddardSize.py
+++ b/tools/getGoddardSize.py
@@ -1,12 +1,17 @@
-import sys, os
+import os
+import sys
 
-with open(sys.argv[1]) as f:
-	for line in f:
-		if "GODDARD_SIZE" in line:
-			tokens=line.split()
-			with open("build/%s_n64/goddard.txt" % sys.argv[2], "w+") as f:
-				sz = int(tokens[0], 16)
-				sz += 16
-				sz &= 0xFFFFFFF0
-				f.write("GODDARD_SIZE = 0x%X;" % sz)
-				
\ No newline at end of file
+preliminaryMapPath: str = sys.argv[1]
+buildFolder: str = sys.argv[2]
+
+with open(preliminaryMapPath) as mapFile:
+    line: str
+    for line in mapFile:
+        if "GODDARD_SIZE" in line:
+            tokens: list[str] = line.split()
+            with open(f"{buildFolder}/goddard.txt", "w+") as outputFile:
+                sz: int = int(tokens[0], 16)
+                sz += 16
+                sz &= 0xFFFFFFF0
+                outputFile.write(f"GODDARD_SIZE = 0x{sz:X};\n")
+                sys.exit(0)