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

4 files changed, 24 insertions, 24 deletions

diff --git a/tools/disasm/disasm.py b/tools/disasm/disasm.py
index 1f0295cff..79d41bd96 100755
--- a/tools/disasm/disasm.py
+++ b/tools/disasm/disasm.py
@@ -2229,7 +2229,7 @@ for segment in files_spec:
                 data_size = 0x80800000 - file_list[full_index]
             elif segment[0] == "boot" and name == "vimgr" and segment[3][i][2] == "bss":
                 # This is the end of boot, hardcode it
-                data_size = 0x800A5AC0 - file_list[full_index]
+                data_size = 0x8009F8B0 - file_list[full_index]
             else:
                 data_size = file_list[full_index + 1] - file_list[full_index]
 
diff --git a/tools/disasm/files.txt b/tools/disasm/files.txt
index 7042d2333..9479465bd 100644
--- a/tools/disasm/files.txt
+++ b/tools/disasm/files.txt
@@ -21,15 +21,6 @@
             0x80080000 : "entry",
         },
     ],
-    ['dmadata', None, 'dmadata',
-        [
-            [0x8009F8B0, 0x800A5AB0, 'dmadata', None],
-            [0x800A5AB0, 0x800A5AC0, 'bss', None],
-        ],
-        {
-            0x8009F8B0 : "dmadata",
-        },
-    ],
     ['boot', None, 'boot',
         [
             [0x80080060, 0x800969C0, 'text', None],
@@ -243,9 +234,9 @@
             0x800968B0 : "strcmp",
             0x800968F0 : "strcpy",
             0x80096930 : "memmove",
+            0x800969C0 : "rspboot",
 
             # .data section
-            0x800969C0 : "rspboot",
             0x80096B20 : "idle",
             0x80096B40 : "carthandle",
             0x80096B50 : "z_std_dma",
@@ -269,8 +260,8 @@
             0x80097E50 : "initialize",
             0x80097E70 : "pimgr",
             0x80097EA0 : "piacs",
-            0x80097EB0 : "contpfs",
             0x80097EB0 : "vimodentschpn1",
+            0x80097F00 : "contpfs",
             0x80097F10 : "seteventmesg",
             0x80097F20 : "xprintf",
             0x80097F70 : "timerintr",
@@ -283,7 +274,7 @@
             0x80098060 : "vi",
             0x800980D0 : "cartrominit",
             0x800980E0 : "vimodefpallan1",
-            0x80098130 : "xldtob",
+            0x80098130 : "xlitob",
             0x80098160 : "vimgr",
             0x80098180 : "voicecontrolgain",
 
@@ -296,6 +287,7 @@
             0x80098280 : "CIC6105",
             0x800982B0 : "fault",
             0x80098C50 : "fault_drawer",
+            0x80099080 : "stackcheck",
             0x80099090 : "gfxprint",
             0x800990B0 : "debug",
             0x800990C0 : "math64",
@@ -342,6 +334,15 @@
             0x8009E690 : "vimgr",
         },
     ],
+    ['dmadata', None, 'dmadata',
+        [
+            [0x8009F8B0, 0x800A5AB0, 'dmadata', None],
+            [0x800A5AB0, 0x800A5AC0, 'bss', None],
+        ],
+        {
+            0x8009F8B0 : "dmadata",
+        },
+    ],
     ['code', None, 'code',
         [
             [0x800A5AC0, 0x801AAAB0, 'text', ((0x80186028, 0x80186A70, 'data', None, None, None),)],
@@ -382,7 +383,7 @@
             0x800EFE60 : "z_eff_footmark",
             0x800F0390 : "z_sound_source",
             0x800F05C0 : "z_elf_message",
-            0x800F07C0 : "z_en_hy",
+            0x800F07C0 : "z_en_hy_code",
             0x800F1250 : "z_face_reaction",
             0x800F12D0 : "z_env_flags",
             0x800F1460 : "z_eventmgr",
@@ -500,17 +501,17 @@
             0x801A4EB0 : "voice_external",
             0x801A51F0 : "voice_internal",
             0x801A5BC0 : "[PADDING]",
-            0x801A5BD0 : "code_801A5BD0",
+            0x801A5BD0 : "sfx",
             0x801A7B10 : "sequence",
             0x801A9B10 : "jpegutils",
             0x801AA020 : "jpegdecoder",
             0x801AA610 : "z_game_over",
             0x801AAAA0 : "z_construct",
-
-            # .data section
             0x801AAAB0 : "aspMain",
             0x801ABAB0 : "gspS2DEX2.fifo",
             0x801AD370 : "njpgdspMain",
+
+            # .data section
             0x801ADE60 : "z_en_a_keep",
             0x801ADEC0 : "z_en_item00",
             0x801AE240 : "z_eff_blure",
@@ -588,8 +589,7 @@
             0x801D1DE0 : "sys_matrix",
             0x801D1E60 : "sys_ucode",
             0x801D1E70 : "sys_rumble",
-            0x801D1E80 : "code_801D1E80",
-            0x801D2E80 : "audio_data",
+            0x801D1E80 : "audio_data",
             0x801D5FB0 : "audio_synthesis",
             0x801D5FE0 : "audio_load",
             0x801D5FF0 : "audio_thread",
@@ -601,7 +601,7 @@
             0x801D8BE0 : "voice_external",
             0x801D8E50 : "voice_internal",
             0x801D9090 : "audio_sound_params",
-            0x801DB470 : "code_801A5BD0",
+            0x801DB470 : "sfx",
             0x801DB4C0 : "sequence",
             0x801DB4E0 : "session_config",
 
@@ -682,7 +682,7 @@
             0x801E0540 : "audio_seqplayer",
             0x801E0BD0 : "code_8019AF00",
             0x801E0EC0 : "voice_internal",
-            0x801E1050 : "code_801A5BD0",
+            0x801E1050 : "sfx",
             0x801E1070 : "sequence",
             0x801E1100 : "session_config",
             0x801E1110 : "z_game_over",
@@ -748,7 +748,7 @@
             0x801FD140 : "audio_load",
             0x801FD1F0 : "code_8019AF00",
             0x801FD5A0 : "voice_internal",
-            0x801FD710 : "code_801A5BD0",
+            0x801FD710 : "sfx",
             0x801FFD00 : "sequence",
             0x80200BE0 : "session_config",
             0x80208E90 : "jpegdecoder",
diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt
index fcc3001b5..f911c3244 100644
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@@ -69,7 +69,7 @@
     0x80082330:("Fault_PrintFPCSR",),
     0x800823D4:("Fault_LogFPCSR",),
     0x8008246C:("Fault_PrintThreadContext",),
-    0x800827BC:("osSyncPrintfThreadContext",),
+    0x800827BC:("Fault_LogThreadContext",),
     0x80082AB8:("Fault_FindFaultedThread",),
     0x80082B40:("Fault_Wait5Seconds",),
     0x80082BD0:("Fault_WaitForButtonCombo",),
diff --git a/tools/sizes/boot_functions.csv b/tools/sizes/boot_functions.csv
index ac67c6687..a79430b8a 100644
--- a/tools/sizes/boot_functions.csv
+++ b/tools/sizes/boot_functions.csv
@@ -66,7 +66,7 @@ asm/non_matchings/boot/fault/Fault_LogFReg.s,Fault_LogFReg,0x80082280,0x2C
 asm/non_matchings/boot/fault/Fault_PrintFPCSR.s,Fault_PrintFPCSR,0x80082330,0x29
 asm/non_matchings/boot/fault/Fault_LogFPCSR.s,Fault_LogFPCSR,0x800823D4,0x26
 asm/non_matchings/boot/fault/Fault_PrintThreadContext.s,Fault_PrintThreadContext,0x8008246C,0xD4
-asm/non_matchings/boot/fault/osSyncPrintfThreadContext.s,osSyncPrintfThreadContext,0x800827BC,0xBF
+asm/non_matchings/boot/fault/Fault_LogThreadContext.s,Fault_LogThreadContext,0x800827BC,0xBF
 asm/non_matchings/boot/fault/Fault_FindFaultedThread.s,Fault_FindFaultedThread,0x80082AB8,0x22
 asm/non_matchings/boot/fault/Fault_Wait5Seconds.s,Fault_Wait5Seconds,0x80082B40,0x24
 asm/non_matchings/boot/fault/Fault_WaitForButtonCombo.s,Fault_WaitForButtonCombo,0x80082BD0,0x27