9 files changed, 37 insertions, 27 deletions
diff --git a/src/boot/fault.c b/src/boot/fault.c
index 15a77f03b..7d167e41c 100644
--- a/src/boot/fault.c
+++ b/src/boot/fault.c
@@ -468,7 +468,7 @@ void Fault_PrintThreadContext(OSThread* thread) {
     }
 }
 
-void osSyncPrintfThreadContext(OSThread* thread) {
+void Fault_LogThreadContext(OSThread* thread) {
     __OSThreadContext* threadCtx;
     s16 causeStrIndex = _SHIFTR((u32)thread->context.cause, 2, 5);
 
@@ -1035,7 +1035,7 @@ void Fault_ThreadEntry(void* arg) {
         do {
             // Thread context page
             Fault_PrintThreadContext(faultedThread);
-            osSyncPrintfThreadContext(faultedThread);
+            Fault_LogThreadContext(faultedThread);
             Fault_WaitForInput();
 
             // Stack trace page
diff --git a/src/boot/fault_drawer.c b/src/boot/fault_drawer.c
index fa2dd3d4d..1465c2c7e 100644
--- a/src/boot/fault_drawer.c
+++ b/src/boot/fault_drawer.c
@@ -266,8 +266,6 @@ void* FaultDrawer_FormatStringFunc(void* arg, const char* str, size_t count) {
     return arg;
 }
 
-const char D_80099080[] = "(null)";
-
 s32 FaultDrawer_VPrintf(const char* fmt, va_list ap) {
     return _Printf(FaultDrawer_FormatStringFunc, sFaultDrawerInstance, fmt, ap);
 }
diff --git a/src/boot/libu64/stackcheck.c b/src/boot/libu64/stackcheck.c
index de321bddd..905495221 100644
--- a/src/boot/libu64/stackcheck.c
+++ b/src/boot/libu64/stackcheck.c
@@ -94,6 +94,8 @@ StackStatus StackCheck_GetState(StackEntry* entry) {
         status = STACK_STATUS_OK;
     }
 
+    (void)"(null)";
+
     return status;
 }
 
diff --git a/src/boot/rspboot.s b/src/boot/rspboot.s
index bc1d5d4f5..96f204b65 100644
--- a/src/boot/rspboot.s
+++ b/src/boot/rspboot.s
@@ -1,7 +1,10 @@
 .include "macro.inc"
 
-.section .data
+.section .text
 
-dlabel rspbootTextStart
+.balign 16
+
+glabel rspbootTextStart
     .incbin "incbin/rspbootText"
+endlabel rspbootTextStart
 dlabel rspbootTextEnd
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;
diff --git a/src/libultra/gu/position.c b/src/libultra/gu/position.c
index 43072b5a6..20ee80bfe 100644
--- a/src/libultra/gu/position.c
+++ b/src/libultra/gu/position.c
@@ -6,7 +6,7 @@
  * Creates a rotation/parallel translation modelling matrix (floating point)
  */
 void guPositionF(f32 mf[4][4], f32 rot, f32 pitch, f32 yaw, f32 scale, f32 x, f32 y, f32 z) {
-    static f32 D_80134D00 = M_PIf / 180.0f;
+    static f32 dtor = M_PIf / 180.0f;
     f32 sinr;
     f32 sinp;
     f32 sinh;
@@ -14,9 +14,9 @@ void guPositionF(f32 mf[4][4], f32 rot, f32 pitch, f32 yaw, f32 scale, f32 x, f3
     f32 cosp;
     f32 cosh;
 
-    rot *= D_80134D00;
-    pitch *= D_80134D00;
-    yaw *= D_80134D00;
+    rot *= dtor;
+    pitch *= dtor;
+    yaw *= dtor;
 
     sinr = sinf(rot);
     cosr = cosf(rot);