rearrange microcode

spec/spec

@@ -21,7 +21,6 @@ beginseg
     name "boot"
     address 0x80080060
     include "$(BUILD_DIR)/src/boot/boot_main.o"
-    include "$(BUILD_DIR)/src/boot/rspboot.o"
     include "$(BUILD_DIR)/src/boot/idle.o"
     include "$(BUILD_DIR)/src/boot/viconfig.o"
     include "$(BUILD_DIR)/src/boot/carthandle.o"
@@ -244,6 +243,8 @@ beginseg
     include "$(BUILD_DIR)/src/boot/libc/strcpy.o"
     include "$(BUILD_DIR)/src/boot/libc/memmove.o"
     include "$(BUILD_DIR)/src/boot/build.o"
+    include "$(BUILD_DIR)/src/boot/rspboot.o"
+
 #ifdef COMPILER_GCC
     include "$(BUILD_DIR)/src/gcc_fix/missing_gcc_functions.o"
 #endif
@@ -609,7 +610,6 @@ beginseg
     name "code"
     compress
     after "dmadata"
-    include "$(BUILD_DIR)/src/code/rsptext.o"
     include "$(BUILD_DIR)/src/code/z_en_a_keep.o"
     include "$(BUILD_DIR)/src/code/z_en_item00.o"
     include "$(BUILD_DIR)/src/code/z_eff_blure.o"
@@ -780,7 +780,7 @@ beginseg
     include "$(BUILD_DIR)/assets/audio/sequence_font_table.o"
     include "$(BUILD_DIR)/src/audio/tables/sequence_table.o"
     include "$(BUILD_DIR)/src/audio/tables/samplebank_table.o"
-    include "$(BUILD_DIR)/src/code/rspdata.o"
+    include "$(BUILD_DIR)/src/code/rspcode.o"
 endseg
 
 // The game expects all the segments after the `code` segment and before the first overlay to be `NOLOAD` ones

src/boot/rspboot.s

@@ -1,7 +1,9 @@
 .include "macro.inc"
 
-.section .data
+.section .text
 
-dlabel rspbootTextStart
+.balign 16
+
+glabel rspbootTextStart
     .incbin "incbin/rspbootText"
-dlabel rspbootTextEnd
+glabel rspbootTextEnd

src/code/rspcode.s

@@ -1,7 +1,25 @@
 .include "macro.inc"
 
+.section .text
+
+.balign 16
+
+glabel aspMainTextStart
+    .incbin "incbin/aspMainText"
+glabel aspMainTextEnd
+
+glabel gspS2DEX2_fifoTextStart
+    .incbin "incbin/gspS2DEX2_fifoText"
+glabel gspS2DEX2_fifoTextEnd
+
+glabel njpgdspMainTextStart
+    .incbin "incbin/njpgdspMainText"
+glabel njpgdspMainTextEnd
+
 .section .rodata
 
+.balign 16
+
 dlabel aspMainDataStart
     .incbin "incbin/aspMainData"
 dlabel aspMainDataEnd

src/code/rsptext.s

@@ -1,15 +0,0 @@
-.include "macro.inc"
-
-.section .data
-
-dlabel aspMainTextStart
-    .incbin "incbin/aspMainText"
-dlabel aspMainTextEnd
-
-dlabel gspS2DEX2_fifoTextStart
-    .incbin "incbin/gspS2DEX2_fifoText"
-dlabel gspS2DEX2_fifoTextEnd
-
-dlabel njpgdspMainTextStart
-    .incbin "incbin/njpgdspMainText"
-dlabel njpgdspMainTextEnd

tools/disasm/files.txt

@@ -243,9 +243,9 @@
             0x800968B0 : "strcmp",
             0x800968F0 : "strcpy",
             0x80096930 : "memmove",
+            0x800969C0 : "rspboot",
 
             # .data section
-            0x800969C0 : "rspboot",
             0x80096B20 : "idle",
             0x80096B40 : "carthandle",
             0x80096B50 : "z_std_dma",