From b4f931f75f5d87fc7844e00eab7d7b99eceb3622 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 21 Dec 2025 19:43:06 -0500 Subject: Miscellaneous data fixes (#2983) * Replace bss lbl_ with init$0000 * Rename l_HIOInit to hio_set The name is excluded from TP's weird maps, but hio_set is the name they used in TWW's maps. * Fix a couple more init$ names * Fix nbomb missing some bss * Fix camera localstatics having wrong name * Rename l_initHIO to hio_set * A couple manual fixes * Rename hioInit to hio_set * Couple more manual fixes * Fix d_a_npc_cd2 data and function order * More data fixes * Fix inconsistent hex vs decimal --- src/JSystem/JUtility/JUTException.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/JSystem/JUtility/JUTException.cpp') diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index 855e46cf70..876804d584 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -154,8 +154,6 @@ void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3, JSUList JUTException::sMapFileList(false); -static OSContext context; - void JUTException::panic_f_va(char const* file, int line, char const* format, va_list args) { char buffer[256]; vsnprintf(buffer, sizeof(buffer) - 1, format, args); @@ -164,6 +162,7 @@ void JUTException::panic_f_va(char const* file, int line, char const* format, va } OSContext* current_context = OSGetCurrentContext(); + static OSContext context; memcpy(&context, current_context, sizeof(OSContext)); sErrorManager->mStackPointer = (uintptr_t)OSGetStackPointer(); -- cgit v1.2.3