Fixed incorrect offset in RELs and JKRHeap redefined error.

2021-09-26 02:38:35 +02:00 · 2021-09-26 02:38:35 +02:00 · 6b7484f3cd
parent 800047a854
commit 6b7484f3cd
2 changed files with 5 additions and 4 deletions
--- a/libs/JSystem/JUtility/JUTException.cpp
+++ b/libs/JSystem/JUtility/JUTException.cpp
@ -36,10 +36,6 @@ struct JUTConsoleManager {
    static u8 sManager[4];
 };

-struct JKRHeap {
-    static u8 sSystemHeap[4];
-};
-
 //
 // Forward References:
 //
--- a/src/m_Do/m_Do_machine_exception.cpp
+++ b/src/m_Do/m_Do_machine_exception.cpp
@ -34,6 +34,11 @@ extern "C" void JUTConsole_print_f_va_();

 static JUTConsole* sConsole;

+#pragma push
+#pragma force_active on
+u8 struct_80450C94[4];
+#pragma pop
+
 /* 80017D7C-80017E08 0126BC 008C+00 3/3 0/0 0/0 .text            print_f__FPCce */
 #pragma push
 #pragma optimization_level 0