diff --git a/data/aspMain.s b/data/aspMain.s
new file mode 100644
index 0000000000..2956c8abec
--- /dev/null
+++ b/data/aspMain.s
@@ -0,0 +1,22 @@
+.include "macro.inc"
+
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
+
+.section .text
+
+.balign 16
+
+glabel aspMainTextStart
+    .incbin "incbin/aspMainText"
+glabel aspMainTextEnd
+
+.section .rodata
+
+.balign 16
+
+glabel aspMainDataStart
+    .incbin "incbin/aspMainData"
+glabel aspMainDataEnd
diff --git a/data/cic6105.text.s b/data/cic6105.s
similarity index 100%
rename from data/cic6105.text.s
rename to data/cic6105.s
diff --git a/data/rsp.rodata.s b/data/gspF3DZEX2.NoN.PosLight.fifo.s
similarity index 55%
rename from data/rsp.rodata.s
rename to data/gspF3DZEX2.NoN.PosLight.fifo.s
index e60c522133..b0a9da8f19 100644
--- a/data/rsp.rodata.s
+++ b/data/gspF3DZEX2.NoN.PosLight.fifo.s
@@ -9,15 +9,6 @@
 
 .balign 16
 
-glabel aspMainDataStart
-    .incbin "incbin/aspMainData"
-glabel aspMainDataEnd
-
-#ifndef F3DEX_GBI_PL
-glabel gspF3DZEX2_NoN_fifoDataStart
-    .incbin "incbin/gspF3DZEX2_NoN_fifoData"
-glabel gspF3DZEX2_NoN_fifoDataEnd
-#else
 glabel gspF3DZEX2_NoN_PosLight_fifoTextStart
     .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoText"
 glabel gspF3DZEX2_NoN_PosLight_fifoTextEnd
@@ -25,12 +16,3 @@ glabel gspF3DZEX2_NoN_PosLight_fifoTextEnd
 glabel gspF3DZEX2_NoN_PosLight_fifoDataStart
     .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoData"
 glabel gspF3DZEX2_NoN_PosLight_fifoDataEnd
-#endif
-
-glabel gspS2DEX2d_fifoDataStart
-    .incbin "incbin/gspS2DEX2d_fifoData"
-glabel gspS2DEX2d_fifoDataEnd
-
-glabel njpgdspMainDataStart
-    .incbin "incbin/njpgdspMainData"
-glabel njpgdspMainDataEnd
diff --git a/data/rsp.text.s b/data/gspF3DZEX2.NoN.fifo.s
similarity index 54%
rename from data/rsp.text.s
rename to data/gspF3DZEX2.NoN.fifo.s
index 34033443b8..0d2726b9dd 100644
--- a/data/rsp.text.s
+++ b/data/gspF3DZEX2.NoN.fifo.s
@@ -9,20 +9,14 @@
 
 .balign 16
 
-glabel aspMainTextStart
-    .incbin "incbin/aspMainText"
-glabel aspMainTextEnd
-
-#ifndef F3DEX_GBI_PL
 glabel gspF3DZEX2_NoN_fifoTextStart
     .incbin "incbin/gspF3DZEX2_NoN_fifoText"
 glabel gspF3DZEX2_NoN_fifoTextEnd
-#endif
 
-glabel gspS2DEX2d_fifoTextStart
-    .incbin "incbin/gspS2DEX2d_fifoText"
-glabel gspS2DEX2d_fifoTextEnd
+.section .rodata
 
-glabel njpgdspMainTextStart
-    .incbin "incbin/njpgdspMainText"
-glabel njpgdspMainTextEnd
+.balign 16
+
+glabel gspF3DZEX2_NoN_fifoDataStart
+    .incbin "incbin/gspF3DZEX2_NoN_fifoData"
+glabel gspF3DZEX2_NoN_fifoDataEnd
diff --git a/data/gspS2DEX2d.fifo.s b/data/gspS2DEX2d.fifo.s
new file mode 100644
index 0000000000..f490a7f817
--- /dev/null
+++ b/data/gspS2DEX2d.fifo.s
@@ -0,0 +1,22 @@
+.include "macro.inc"
+
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
+
+.section .text
+
+.balign 16
+
+glabel gspS2DEX2d_fifoTextStart
+    .incbin "incbin/gspS2DEX2d_fifoText"
+glabel gspS2DEX2d_fifoTextEnd
+
+.section .rodata
+
+.balign 16
+
+glabel gspS2DEX2d_fifoDataStart
+    .incbin "incbin/gspS2DEX2d_fifoData"
+glabel gspS2DEX2d_fifoDataEnd
diff --git a/data/njpgdspMain.s b/data/njpgdspMain.s
new file mode 100644
index 0000000000..a94b1d6938
--- /dev/null
+++ b/data/njpgdspMain.s
@@ -0,0 +1,22 @@
+.include "macro.inc"
+
+/* assembler directives */
+.set noat      /* allow manual use of $at */
+.set noreorder /* don't insert nops after branches */
+.set gp=64     /* allow use of 64-bit general purpose registers */
+
+.section .text
+
+.balign 16
+
+glabel njpgdspMainTextStart
+    .incbin "incbin/njpgdspMainText"
+glabel njpgdspMainTextEnd
+
+.section .rodata
+
+.balign 16
+
+glabel njpgdspMainDataStart
+    .incbin "incbin/njpgdspMainData"
+glabel njpgdspMainDataEnd
diff --git a/data/rsp_boot.text.s b/data/rspboot.s
similarity index 100%
rename from data/rsp_boot.text.s
rename to data/rspboot.s
diff --git a/spec/spec b/spec/spec
index 2af7aa9d57..54ddc26d6d 100644
--- a/spec/spec
+++ b/spec/spec
@@ -85,8 +85,8 @@ beginseg
     include "$(BUILD_DIR)/src/boot/build.o"
 
     // RSP microcode
-    include "$(BUILD_DIR)/data/rsp_boot.text.o"
-    include "$(BUILD_DIR)/data/cic6105.text.o"
+    include "$(BUILD_DIR)/data/rspboot.o"
+    include "$(BUILD_DIR)/data/cic6105.o"
 
     // Extra files for non-matching debug builds
 #if DEBUG_FEATURES
@@ -816,8 +816,14 @@ beginseg
     include "$(BUILD_DIR)/src/audio/tables/samplebank_table.o"
 
     // RSP microcode
-    include "$(BUILD_DIR)/data/rsp.text.o"
-    include "$(BUILD_DIR)/data/rsp.rodata.o"
+    include "$(BUILD_DIR)/data/aspMain.o"
+#ifndef F3DEX_GBI_PL
+    include "$(BUILD_DIR)/data/gspF3DZEX2.NoN.fifo.o"
+#else
+    include "$(BUILD_DIR)/data/gspF3DZEX2.NoN.PosLight.fifo.o"
+#endif
+    include "$(BUILD_DIR)/data/gspS2DEX2d.fifo.o"
+    include "$(BUILD_DIR)/data/njpgdspMain.o"
 
     // Extra files for non-matching debug builds
 #if DEBUG_FEATURES