From 9ca02c79b531f39b2adc92581ea9c846d8f6936a Mon Sep 17 00:00:00 2001
From: Derek Hensley <hensley.derek58@gmail.com>
Date: Mon, 24 Mar 2025 06:52:10 -0700
Subject: Misc fixes (#1800)

* disasm_fix

* dtor

* Fault_LogThreadContext

* rearrange microcode

* sGfxPrintFont size of 0x800

* Move (null) to stackcheck

* vimgr bss

* sfx

* Remove code_801D1E80

* z_en_hy_code

* Fix assembler messages with endlabels and dlabels

* xlitob data

* Move skin unused bss pad to rumble
---
 src/code/rspcode.s  | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/code/rspdata.s  | 23 -----------------------
 src/code/rsptext.s  | 15 ---------------
 src/code/z_rumble.c |  3 +++
 src/code/z_skin.c   |  2 --
 5 files changed, 47 insertions(+), 40 deletions(-)
 create mode 100644 src/code/rspcode.s
 delete mode 100644 src/code/rspdata.s
 delete mode 100644 src/code/rsptext.s

(limited to 'src/code')

diff --git a/src/code/rspcode.s b/src/code/rspcode.s
new file mode 100644
index 000000000..e7e53298f
--- /dev/null
+++ b/src/code/rspcode.s
@@ -0,0 +1,44 @@
+.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
+
+dlabel gspF3DZEX2_NoN_PosLight_fifoTextStart
+    .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoText"
+dlabel gspF3DZEX2_NoN_PosLight_fifoTextEnd
+
+dlabel gspF3DZEX2_NoN_PosLight_fifoDataStart
+    .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoData"
+dlabel gspF3DZEX2_NoN_PosLight_fifoDataEnd
+
+dlabel gspS2DEX2_fifoDataStart
+    .incbin "incbin/gspS2DEX2_fifoData"
+dlabel gspS2DEX2_fifoDataEnd
+
+dlabel njpgdspMainDataStart
+    .incbin "incbin/njpgdspMainData"
+dlabel njpgdspMainDataEnd
diff --git a/src/code/rspdata.s b/src/code/rspdata.s
deleted file mode 100644
index 812bcf5d5..000000000
--- a/src/code/rspdata.s
+++ /dev/null
@@ -1,23 +0,0 @@
-.include "macro.inc"
-
-.section .rodata
-
-dlabel aspMainDataStart
-    .incbin "incbin/aspMainData"
-dlabel aspMainDataEnd
-
-dlabel gspF3DZEX2_NoN_PosLight_fifoTextStart
-    .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoText"
-dlabel gspF3DZEX2_NoN_PosLight_fifoTextEnd
-
-dlabel gspF3DZEX2_NoN_PosLight_fifoDataStart
-    .incbin "incbin/gspF3DZEX2_NoN_PosLight_fifoData"
-dlabel gspF3DZEX2_NoN_PosLight_fifoDataEnd
-
-dlabel gspS2DEX2_fifoDataStart
-    .incbin "incbin/gspS2DEX2_fifoData"
-dlabel gspS2DEX2_fifoDataEnd
-
-dlabel njpgdspMainDataStart
-    .incbin "incbin/njpgdspMainData"
-dlabel njpgdspMainDataEnd
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;
-- 
cgit v1.2.3