debugDisplay and Debug_console attemp

libs/JSystem/JKernel/JKRAram.cpp

@@ -50,6 +50,7 @@ extern u32 JKRAram__readCount;
 extern u32 JKRAram__maxDest;
 extern u32* JKRAram__tsPtr;
 extern u32 JKRAram__tsArea;
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
 
 JKRAram* JKRAram::create(u32 aram_audio_buffer_size, u32 aram_audio_graph_size,
                          long stream_priority, long decomp_priority, long piece_priority) {

libs/JSystem/JKernel/JKRAramArchive.cpp

@@ -1,4 +1,6 @@
 #include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h"
+#include "JSystem/JKernel/JKRAram/JKRAram.h"
+#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRFile/JKRFile.h"
 #include "global.h"
 extern "C" {
@@ -31,6 +33,8 @@ void remove__10JSUPtrListFP10JSUPtrLink(void);
 void* memset(void* dest, int ch, u32 count);
 }
 
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
+
 asm JKRAramArchive::JKRAramArchive(long, JKRArchive::EMountDirection) {
     nofralloc
 #include "JSystem/JKernel/JKRAramArchive/asm/func_802D70C0.s"

libs/JSystem/JKernel/JKRAramStream.cpp

@@ -1,5 +1,6 @@
 #include "JSystem/JKernel/JKRAramStream/JKRAramStream.h"
 #include "JSystem/JKernel/JKRAramPiece/JKRAramPiece.h"
+#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
 #include "global.h"
 extern "C" {
 s32 JSUInputStream_NS_read(JSUInputStream*, u8*, u32);
@@ -12,6 +13,7 @@ void orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock(void);
 }
 
 extern char lbl_8039D120[32];
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
 
 JKRAramStream* JKRAramStream::create(long priority) {
     if (!sAramStreamObject) {

libs/JSystem/JKernel/JKRCompArchive.cpp

@@ -1,4 +1,6 @@
 #include "JSystem/JKernel/JKRCompArchive/JKRCompArchive.h"
+#include "JSystem/JKernel/JKRAram/JKRAram.h"
+#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
 #include "global.h"
 
 extern "C" {
@@ -34,6 +36,8 @@ void remove__10JSUPtrListFP10JSUPtrLink(void);
 void* memset(void* dest, int ch, u32 count);
 }
 
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
+
 asm JKRCompArchive::JKRCompArchive(long, JKRArchive::EMountDirection) {
     nofralloc
 #include "JSystem/JKernel/JKRCompArchive/asm/func_802D87D4.s"

libs/JSystem/JKernel/JKRDvdAramRipper.cpp

@@ -1,6 +1,9 @@
 #include "JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h"
+#include "JSystem/JKernel/JKRAram/JKRAram.h"
+#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
 #include "dvd/dvd.h"
 #include "global.h"
+
 extern "C" {
 void __ct__10JKRDvdFileFv(void);
 void __ct__10JSUPtrLinkFPv(void);
@@ -37,6 +40,8 @@ void VIWaitForRetrace(void);
 void write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl(void);
 }
 
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
+
 static void decompSZS_subroutine(u8*, u32);
 static u8* firstSrcData(void);
 static u8* nextSrcData(u8*);

libs/JSystem/JKernel/JKRDvdArchive.cpp

@@ -1,6 +1,7 @@
 #include "JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h"
 #include "JSystem/JKernel/JKRDvdFile/JKRDvdFile.h"
 #include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
+#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
 #include "global.h"
 
 extern "C" {
@@ -19,6 +20,8 @@ void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRip
 void* memset(void* dest, int ch, u32 count);
 }
 
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
+
 JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
     : JKRArchive(entryNum, MOUNT_DVD), mMountDirection(mountDirection) {
     if (!open(entryNum))

libs/JSystem/JKernel/JKRDvdRipper.cpp

@@ -1,4 +1,5 @@
 #include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
+#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
 #include "dvd/dvd.h"
 #include "global.h"
 
@@ -26,6 +27,8 @@ void orderSync__9JKRDecompFPUcPUcUlUl(void);
 void VIWaitForRetrace(void);
 }
 
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
+
 static void decompSZS_subroutine(u8*, u8*);
 static u8* firstSrcData(void);
 static u8* nextSrcData(u8*);

libs/JSystem/JKernel/JKRFileCache.cpp

@@ -1,5 +1,6 @@
 #include "JSystem/JKernel/JKRFileCache/JKRFileCache.h"
 #include "JSystem/JKernel/JKRDvdFile/JKRDvdFile.h"
+#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRFileFinder/JKRFileFinder.h"
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "dvd/dvd.h"
@@ -21,6 +22,8 @@ void memcpy(void*, const void*, int);
 void remove__10JSUPtrListFP10JSUPtrLink(void);
 }
 
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
+
 JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) {
     if (!path || *path != '/') {
         return NULL;

libs/JSystem/JKernel/JKRHeap.cpp

@@ -1,4 +1,5 @@
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
+#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
 #include "global.h"
 
 extern "C" {
@@ -12,6 +13,8 @@ void JUTException_NS_panic_f(const char* filename, int line, const char* format,
 void remove__10JSUPtrListFP10JSUPtrLink(void);
 }
 
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
+
 JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag)
     : JKRDisposer(), mChildTree(this), mDisposerList() {
     OSInitMutex(&mMutex);

libs/JSystem/JKernel/JKRThread.cpp

@@ -1,4 +1,5 @@
 #include "JSystem/JKernel/JKRThread/JKRThread.h"
+#include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "global.h"
 
@@ -8,11 +9,11 @@ void __dl__FPv(void);
 void __nw__FUlP7JKRHeapi(void);
 void becomeCurrentHeap__7JKRHeapFv(void);
 void callback__15JKRThreadSwitchFP8OSThreadP8OSThread(void);
-void func_803620AC(void);
+void __cvt_fp2unsigned(void);
 void func_803626BC(void);
 void func_803664DC(void);
 void isSubHeap__7JKRHeapCFP7JKRHeap(void);
-void JUTConsole_NS_clear(void);
+void clear__10JUTConsoleFv(void);
 void JUTConsole_NS_print_f(void);
 void JUTConsole_NS_print(void);
 void JUTWarningConsole(void);
@@ -25,6 +26,7 @@ static const u8 lbl_80455FC0[4] = {0x42, 0xc8, 0x0, 0x0};
 static const u8 lbl_80455FC4[4] = {0x44, 0x7a, 0x0, 0x0};
 // lbl_80455FC8 JKRThread.o @937
 static const u8 lbl_80455FC8[8] = {0x43, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
+extern JKRExpHeap* sSystemHeap__7JKRHeap;
 
 JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadListLink(this) {
     mSwitchCount = 0;

libs/JSystem/JStudio/functionvalue.cpp

@@ -1,7 +1,7 @@
 #include "JSystem/JStudio/functionvalue.h"
 
 extern "C" {
-void func_803620AC(void);
+void __cvt_fp2unsigned(void);
 }
 
 namespace JStudio {

libs/Z2AudioLib/Z2Audience.cpp

@@ -16,7 +16,7 @@ extern "C" {
 void __dl__FPv(void);
 void func_80361C24(void);
 void func_80361D60(void);
-void func_803620AC(void);
+void __cvt_fp2unsigned(void);
 }
 
 extern "C" {

libs/Z2AudioLib/Z2EnvSeMgr.cpp

@@ -17,7 +17,7 @@ extern "C" {
 void __dl__FPv(void);
 void isEventBit__11dSv_event_cCFUs(void);
 void dComIfGp_getReverb(void);
-void func_803620AC(void);
+void __cvt_fp2unsigned(void);
 void isSwitch__12dSv_memBit_cCFi(void);
 void Z2EnvSeMgr_NS_startRainSe(void);
 }

libs/Z2AudioLib/Z2SeMgr.cpp

@@ -14,7 +14,7 @@
 extern "C" {
 void __dl__FPv(void);
 void func_80361D60(void);
-void func_803620AC(void);
+void __cvt_fp2unsigned(void);
 }
 
 asm Z2SeMgr::Z2SeMgr(void) {