summaryrefslogtreecommitdiff
path: root/src/JSystem/JUtility/JUTException.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-12-21 19:43:06 -0500
committerGitHub <noreply@github.com>2025-12-21 16:43:06 -0800
commitb4f931f75f5d87fc7844e00eab7d7b99eceb3622 (patch)
tree0b818358d479bf2d6ececafabe71c5c0918e19cc /src/JSystem/JUtility/JUTException.cpp
parentc69e31bd0fbfde798f0b86f5880f1b9d21696365 (diff)
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
Diffstat (limited to 'src/JSystem/JUtility/JUTException.cpp')
-rw-r--r--src/JSystem/JUtility/JUTException.cpp3
1 files changed, 1 insertions, 2 deletions
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::JUTExMapFile> 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();