4 files changed, 24 insertions, 17 deletions
diff --git a/src/code/rspdata.s b/src/code/rspcode.s
index 812bcf5d5..e7e53298f 100644
--- a/src/code/rspdata.s
+++ b/src/code/rspcode.s
@@ -1,7 +1,28 @@
 .include "macro.inc"
 
+.section .text
+
+.balign 16
+
+glabel aspMainTextStart
+    .incbin "incbin/aspMainText"
+endlabel aspMainTextStart
+dlabel aspMainTextEnd
+
+glabel gspS2DEX2_fifoTextStart
+    .incbin "incbin/gspS2DEX2_fifoText"
+endlabel gspS2DEX2_fifoTextStart
+dlabel gspS2DEX2_fifoTextEnd
+
+glabel njpgdspMainTextStart
+    .incbin "incbin/njpgdspMainText"
+endlabel njpgdspMainTextStart
+dlabel njpgdspMainTextEnd
+
 .section .rodata
 
+.balign 16
+
 dlabel aspMainDataStart
     .incbin "incbin/aspMainData"
 dlabel aspMainDataEnd
diff --git a/src/code/rsptext.s b/src/code/rsptext.s
deleted file mode 100644
index d8d3290bd..000000000
--- a/src/code/rsptext.s
+++ /dev/null
@@ -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
diff --git a/src/code/z_rumble.c b/src/code/z_rumble.c
index 3cca1d432..52267f6a2 100644
--- a/src/code/z_rumble.c
+++ b/src/code/z_rumble.c
@@ -10,6 +10,9 @@
 #include "global.h"
 #include "z64rumble.h"
 
+#pragma increment_block_number "n64-us:128"
+
+static s32 sBssPad[4];
 RumbleManager gRumbleMgr;
 
 void Rumble_Update(void* arg0) {
diff --git a/src/code/z_skin.c b/src/code/z_skin.c
index 5ced3edea..b3f3b577b 100644
--- a/src/code/z_skin.c
+++ b/src/code/z_skin.c
@@ -10,8 +10,6 @@
 // 60 is an arbitrary number which specifies the max amount of limbs per skeleton this system supports
 MtxF gSkinLimbMatrices[60];
 
-static s32 sBssPad;
-
 void Skin_UpdateVertices(MtxF* mtx, SkinVertex* skinVertices, SkinLimbModif* modifEntry, Vtx* vtxBuf, Vec3f* pos) {
     SkinVertex* vertexEntry;
     Vtx* vtx;