summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/aspMain.s22
-rw-r--r--data/cic6105.s (renamed from data/cic6105.text.s)0
-rw-r--r--data/gspF3DZEX2.NoN.PosLight.fifo.s (renamed from data/rsp.rodata.s)18
-rw-r--r--data/gspF3DZEX2.NoN.fifo.s (renamed from data/rsp.text.s)18
-rw-r--r--data/gspS2DEX2d.fifo.s22
-rw-r--r--data/njpgdspMain.s22
-rw-r--r--data/rspboot.s (renamed from data/rsp_boot.text.s)0
7 files changed, 72 insertions, 30 deletions
diff --git a/data/aspMain.s b/data/aspMain.s
new file mode 100644
index 000000000..2956c8abe
--- /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
index 5020669e2..5020669e2 100644
--- a/data/cic6105.text.s
+++ b/data/cic6105.s
diff --git a/data/rsp.rodata.s b/data/gspF3DZEX2.NoN.PosLight.fifo.s
index e60c52213..b0a9da8f1 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
index 34033443b..0d2726b9d 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
+
+.balign 16
-glabel njpgdspMainTextStart
- .incbin "incbin/njpgdspMainText"
-glabel njpgdspMainTextEnd
+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 000000000..f490a7f81
--- /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 000000000..a94b1d693
--- /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
index 59c9ffc27..59c9ffc27 100644
--- a/data/rsp_boot.text.s
+++ b/data/rspboot.s