diff --git a/Makefile b/Makefile
index 50100618b6..6cf2218531 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ submodules:
 	git submodule update --init --recursive
 
 split:
-	rm -rf $(DATA_DIRS) && ./tools/n64splat/split.py baserom.z64 tools/splat.yaml .
+	rm -rf $(DATA_DIRS) && ./tools/n64splat/split.py baserom.z64 tools/splat.yaml . --modes ld bin
 
 setup: clean submodules split
 
diff --git a/tools/mips-nintendo-nu64-as b/tools/mips-nintendo-nu64-as
index 1376097228..05ae6219d7 100755
Binary files a/tools/mips-nintendo-nu64-as and b/tools/mips-nintendo-nu64-as differ
diff --git a/tools/n64splat b/tools/n64splat
index 5d0ddef55b..d606c8ec15 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 5d0ddef55b38563641d40dea7d0f662c1025e638
+Subproject commit d606c8ec15daa3632a2ef7baf10948fe5c88209d
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 01621683eb..802b1a8e6f 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -1,8 +1,7 @@
 name: "Paper Mario (North America)"
 basename: "papermario"
 options:
-  "find-file-boundaries": True
-  "skip-asm": True
+  find-file-boundaries: True
   pycparser_flags: ["-Iinclude", "-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", "-DSPLAT"]
   compiler: "GCC"
 segments: