From 642cd74a0d5078ba9f11c0c37028411cc558aa56 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 21 Dec 2025 14:45:21 -0500 Subject: [PATCH] A couple manual fixes --- config/GZ2E01/rels/d_a_npc_henna/symbols.txt | 12 ++++++------ src/JSystem/JUtility/JUTException.cpp | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config/GZ2E01/rels/d_a_npc_henna/symbols.txt b/config/GZ2E01/rels/d_a_npc_henna/symbols.txt index 77a7e3144a0..ba8b7a3937e 100644 --- a/config/GZ2E01/rels/d_a_npc_henna/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_henna/symbols.txt @@ -308,8 +308,8 @@ hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3900 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte -init$0000 = .bss:0x00000090; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000091; // type:object size:0x1 scope:local align:1 +lbl_82_bss_90 = .bss:0x00000090; // type:object size:0x1 scope:local align:1 data:byte +lbl_82_bss_91 = .bss:0x00000091; // type:object size:0x1 scope:local align:1 @5112 = .bss:0x00000094; // type:object size:0xC scope:local @5113 = .bss:0x000000A0; // type:object size:0xC scope:local @5114 = .bss:0x000000AC; // type:object size:0xC scope:local @@ -332,12 +332,12 @@ init$0000 = .bss:0x00000091; // type:object size:0x1 scope:local align:1 @5131 = .bss:0x00000178; // type:object size:0xC scope:local zoom_check_pos = .bss:0x00000184; // type:object size:0xF0 scope:global koro2_reset = .bss:0x00000274; // type:object size:0x4 scope:global -@5134 = .bss:0x00000278; // type:object size:0x4 scope:local +unk_bss_5134$3105 = .bss:0x00000278; // type:object size:0x1 scope:local old_stick_x$5644 = .bss:0x0000027C; // type:object size:0x4 scope:local -@5136 = .bss:0x00000280; // type:object size:0x4 scope:local +unk_bss_5136$3107 = .bss:0x00000280; // type:object size:0x1 scope:local old_stick_sx$5647 = .bss:0x00000284; // type:object size:0x4 scope:local -lbl_82_bss_288 = .bss:0x00000288; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000289; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_5138$3109 = .bss:0x00000288; // type:object size:0x1 scope:local +lbl_82_bss_289 = .bss:0x00000289; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000028C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000290; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000294; // type:object size:0x4 scope:global diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index 855e46cf701..876804d5843 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();