Merge branch 'functions'

libs/JSystem/J2DGraph/J2DPane.cpp

@@ -1,5 +1,19 @@
 #include "JSystem/J2DGraph/J2DPane.h"
 
+extern "C" {
+s32 JSUInputStream_NS_read(JSUInputStream*, u8*, u32);
+void __ct__10JSUPtrLinkFPv(void);
+void __dl__FPv(void);
+void __dt__10JSUPtrLinkFv(void);
+void __dt__10JSUPtrListFv(void);
+void append__10JSUPtrListFP10JSUPtrLink(void);
+void getParentPane__7J2DPaneFv(void);
+void GXSetCullMode(void);
+void initiate__10JSUPtrListFv(void);
+void insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink(void);
+void JSURandomInputStream_NS_seek(JSURandomInputStream*, u32, u32);
+}
+
 J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) {
     mTransform = NULL;
     id = 'PAN1';

libs/JSystem/JKernel/JKRAram.cpp

@@ -3,10 +3,28 @@
 #include "JSystem/JKernel/JKRAramHeap/JKRAramHeap.h"
 #include "JSystem/JKernel/JKRAramPiece/JKRAramPiece.h"
 #include "JSystem/JKernel/JKRAramStream/JKRAramStream.h"
-#include "JSystem/JKernel/JKRDecomp/JKRDecomp.h"
 #include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
-#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
-#include "global.h"
+extern "C" {
+void __dl__FPv(void);
+void __RAS_OSDisableInterrupts_begin(void);
+void alloc__11JKRAramHeapFUlQ211JKRAramHeap10EAllocMode(void);
+void alloc__7JKRHeapFUli(void);
+void alloc__7JKRHeapFUliP7JKRHeap(void);
+void changeGroupIdIfNeed__7JKRAramFPUci(void);
+void checkCompressed__9JKRDecompFPUc(void);
+void checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl(void);
+void DCStoreRangeNoSync(void);
+void decompSZS_subroutine__FPUcPUc(void);
+void firstSrcData__Fv(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl(void);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+void memcpy(void*, const void*, int);
+void nextSrcData__FPUc(void);
+void orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock(void);
+void orderSync__9JKRDecompFPUcPUcUlUl(void);
+void startDMA__12JKRAramPieceFP12JKRAMCommand(void);
+}
 
 // Uncomment when static initialization is working
 // JKRAram* JKRAram::sAramObject = NULL;

libs/JSystem/JKernel/JKRAramArchive.cpp

@@ -1,7 +1,34 @@
 #include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h"
 #include "global.h"
-
 #include "JSystem/JKernel/JKRFile/JKRFile.h"
+extern "C" {
+int abs(int);
+void __ct__10JKRArchiveFlQ210JKRArchive10EMountMode(void);
+void __ct__10JKRDvdFileFl(void);
+void __dl__FPv(void);
+void __dt__10JKRArchiveFv(void);
+void __nw__FUlP7JKRHeapi(void);
+void alloc__11JKRAramHeapFUlQ211JKRAramHeap10EAllocMode(void);
+void alloc__7JKRHeapFUli(void);
+void alloc__7JKRHeapFUliP7JKRHeap(void);
+void aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl(void);
+void copyMemory__7JKRHeapFPvPvUl(void);
+void DCInvalidateRange(void*, u32);
+void fetchResource_subroutine__14JKRAramArchiveFUlUlP7JKRHeapiPPUc(void);
+void fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli(void);
+void findFsResource__10JKRArchiveCFPCcUl(void);
+void findPtrResource__10JKRArchiveCFPCv(void);
+void free__7JKRHeapFPv(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void getAramAddress_Entry__14JKRAramArchiveFP12SDIFileEntry(void);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+void loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl(void);
+void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void);
+void open__14JKRAramArchiveFl(void);
+void prepend__10JSUPtrListFP10JSUPtrLink(void);
+void remove__10JSUPtrListFP10JSUPtrLink(void);
+void* memset(void* dest, int ch, u32 count);
+}
 
 asm JKRAramArchive::JKRAramArchive(long, JKRArchive::EMountDirection) {
     nofralloc

libs/JSystem/JKernel/JKRAramHeap.cpp

@@ -1,7 +1,10 @@
 #include "JSystem/JKernel/JKRAramHeap/JKRAramHeap.h"
 #include "global.h"
-
 #include "JSystem/JKernel/JKRAramBlock/JKRAramBlock.h"
+extern "C" {
+void __dl__FPv(void);
+void __dt__11JKRDisposerFv(void);
+}
 
 JKRAramHeap::JKRAramHeap(u32 startAddress, u32 size) {
     OSInitMutex(&mMutex);

libs/JSystem/JKernel/JKRAramPiece.cpp

@@ -3,6 +3,12 @@
 #include "JSystem/JKernel/JKRDecomp/JKRDecomp.h"
 #include "global.h"
 
+extern "C" {
+void DCInvalidateRange(void*, u32);
+void DCStoreRange(void*, u32);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+}
+
 JKRAMCommand* JKRAramPiece::prepareCommand(int direction, u32 src, u32 dst, u32 length,
                                            JKRAramBlock* block,
                                            JKRAMCommand::AsyncCallback callback) {

libs/JSystem/JKernel/JKRAramStream.cpp

@@ -1,6 +1,15 @@
 #include "JSystem/JKernel/JKRAramStream/JKRAramStream.h"
 #include "JSystem/JKernel/JKRAramPiece/JKRAramPiece.h"
 #include "global.h"
+extern "C" {
+s32 JSUInputStream_NS_read(JSUInputStream*, u8*, u32);
+void alloc__7JKRHeapFUli(void);
+void alloc__7JKRHeapFUliP7JKRHeap(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void JSURandomInputStream_NS_seek(JSURandomInputStream*, u32, u32);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+void orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock(void);
+}
 
 extern char lbl_8039D120[32];
 

libs/JSystem/JKernel/JKRArchivePri.cpp

@@ -1,6 +1,11 @@
 #include "JSystem/JKernel/JKRArchive/JKRArchive.h"
 #include "global.h"
 
+extern "C" {
+int strcmp(const char*, const char*);
+int tolower(int);
+}
+
 JKRArchive::JKRArchive(long entryNumber, JKRArchive::EMountMode mountMode) {
     mIsMounted = false;
     mMountMode = mountMode;

libs/JSystem/JKernel/JKRCompArchive.cpp

@@ -1,6 +1,38 @@
 #include "JSystem/JKernel/JKRCompArchive/JKRCompArchive.h"
 #include "global.h"
 
+extern "C" {
+int abs(int);
+void __ct__10JKRArchiveFlQ210JKRArchive10EMountMode(void);
+void __ct__10JKRDvdFileFl(void);
+void __dl__FPv(void);
+void __dt__10JKRArchiveFv(void);
+void __nw__FUlP7JKRHeapi(void);
+void alloc__11JKRAramHeapFUlQ211JKRAramHeap10EAllocMode(void);
+void alloc__7JKRHeapFUli(void);
+void alloc__7JKRHeapFUliP7JKRHeap(void);
+void aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl(void);
+void copyMemory__7JKRHeapFPvPvUl(void);
+void DCInvalidateRange(void*, u32);
+void fetchResource_subroutine__13JKRDvdArchiveFlUlUlP7JKRHeapiiPPUc(void);
+void fetchResource_subroutine__13JKRDvdArchiveFlUlUlPUcUlii(void);
+void fetchResource_subroutine__13JKRMemArchiveFPUcUlPUcUli(void);
+void fetchResource_subroutine__14JKRAramArchiveFUlUlP7JKRHeapiPPUc(void);
+void fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli(void);
+void findPtrResource__10JKRArchiveCFPCv(void);
+void free__7JKRHeapFPv(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+void loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl(void);
+void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void);
+void mainRamToAram__7JKRAramFPUcUlUl15JKRExpandSwitchUlP7JKRHeapiPUl(void);
+void open__14JKRCompArchiveFl(void);
+void orderSync__9JKRDecompFPUcPUcUlUl(void);
+void prepend__10JSUPtrListFP10JSUPtrLink(void);
+void remove__10JSUPtrListFP10JSUPtrLink(void);
+void* memset(void* dest, int ch, u32 count);
+}
+
 asm JKRCompArchive::JKRCompArchive(long, JKRArchive::EMountDirection) {
     nofralloc
 #include "JSystem/JKernel/JKRCompArchive/asm/func_802D87D4.s"

libs/JSystem/JKernel/JKRDvdAramRipper.cpp

@@ -1,6 +1,41 @@
 #include "JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h"
 #include "dvd/dvd.h"
 #include "global.h"
+extern "C" {
+void __ct__10JKRDvdFileFv(void);
+void __ct__10JSUPtrLinkFPv(void);
+void __ct__12JKRADCommandFv(void);
+void __dl__FPv(void);
+void __dt__10JKRDvdFileFv(void);
+void __dt__10JSUPtrLinkFv(void);
+void __dt__12JKRADCommandFv(void);
+void __nw__FUlP7JKRHeapi(void);
+void __RAS_OSDisableInterrupts_begin(void);
+void alloc__11JKRAramHeapFUlQ211JKRAramHeap10EAllocMode(void);
+void alloc__7JKRHeapFUli(void);
+void append__10JSUPtrListFP10JSUPtrLink(void);
+void callCommand_Async__16JKRDvdAramRipperFP12JKRADCommand(void);
+void checkCompressed__9JKRDecompFPUc(void);
+void DCInvalidateRange(void*, u32);
+void decompSZS_subroutine__FPUcUl(void);
+void dmaBufferFlush__FUl(void);
+void firstSrcData__Fv(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl(void);
+void JSUFileInputStream_ct(void);
+void JSUInputStream_NS_dtor(void);
+void loadToAram__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchUlUlPUl(void);
+void loadToAram_Async__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchPFUl_vUlUlPUl(void);
+void memcpy(void*, const void*, int);
+void nextSrcData__FPUc(void);
+void open__10JKRDvdFileFl(void);
+void orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock(void);
+void remove__10JSUPtrListFP10JSUPtrLink(void);
+void sync__13JKRAramStreamFP20JKRAramStreamCommandi(void);
+void syncAram__16JKRDvdAramRipperFP12JKRADCommandi(void);
+void VIWaitForRetrace(void);
+void write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl(void);
+}
 
 static void decompSZS_subroutine(u8*, u32);
 static u8* firstSrcData(void);

libs/JSystem/JKernel/JKRDvdArchive.cpp

@@ -3,6 +3,21 @@
 #include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
 #include "global.h"
 
+extern "C" {
+int abs(int);
+void __ct__10JKRDvdFileFl(void);
+void __nw__FUlP7JKRHeapi(void);
+void alloc__7JKRHeapFUli(void);
+void alloc__7JKRHeapFUliP7JKRHeap(void);
+void copyMemory__7JKRHeapFPvPvUl(void);
+void DCInvalidateRange(void*, u32);
+void fetchResource_subroutine__13JKRDvdArchiveFlUlUlPUcUlii(void);
+void free__7JKRHeapFPv(void);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void);
+void* memset(void* dest, int ch, u32 count);
+}
+
 JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
     : JKRArchive(entryNum, MOUNT_DVD), mMountDirection(mountDirection) {
     if (!open(entryNum))

libs/JSystem/JKernel/JKRDvdFile.cpp

@@ -1,6 +1,10 @@
 #include "JSystem/JKernel/JKRDvdFile/JKRDvdFile.h"
 #include "global.h"
 
+extern "C" {
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+}
+
 JKRDvdFile::JKRDvdFile() : JKRFile(), mDvdLink(this) {
     initiate();
 }

libs/JSystem/JKernel/JKRDvdRipper.cpp

@@ -2,6 +2,29 @@
 #include "dvd/dvd.h"
 #include "global.h"
 
+extern "C" {
+void __ct__10JKRDvdFileFv(void);
+void __dt__10JKRDvdFileFv(void);
+void __RAS_OSDisableInterrupts_begin(void);
+void alloc__7JKRHeapFUli(void);
+void alloc__7JKRHeapFUliP7JKRHeap(void);
+void checkCompressed__9JKRDecompFPUc(void);
+void DCInvalidateRange(void*, u32);
+void DCStoreRangeNoSync(void);
+void decompSZS_subroutine__FPUcPUc(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void isErrorRetry__12JKRDvdRipperFv(void);
+void JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl(void);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+void loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void);
+void memcpy(void*, const void*, int);
+void nextSrcData__FPUc(void);
+void open__10JKRDvdFileFl(void);
+void open__10JKRDvdFileFPCc(void);
+void orderSync__9JKRDecompFPUcPUcUlUl(void);
+void VIWaitForRetrace(void);
+}
+
 static void decompSZS_subroutine(u8*, u8*);
 static u8* firstSrcData(void);
 static u8* nextSrcData(u8*);

libs/JSystem/JKernel/JKRExpHeap.cpp

@@ -1,6 +1,43 @@
 #include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h"
 #include "global.h"
 
+extern "C" {
+void __ct__10JKRExpHeapFPvUlP7JKRHeapb(void);
+void __ct__7JKRHeapFPvUlP7JKRHeapb(void);
+void __dl__FPv(void);
+void __dt__7JKRHeapFv(void);
+void alloc__7JKRHeapFUliP7JKRHeap(void);
+void allocBack__Q210JKRExpHeap9CMemBlockFUlUcUcUcUc(void);
+void allocFore__Q210JKRExpHeap9CMemBlockFUlUcUcUcUc(void);
+void allocFromHead__10JKRExpHeapFUl(void);
+void allocFromHead__10JKRExpHeapFUli(void);
+void allocFromTail__10JKRExpHeapFUl(void);
+void allocFromTail__10JKRExpHeapFUli(void);
+void appendUsedList__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
+void callAllDisposer__7JKRHeapFv(void);
+void dispose__7JKRHeapFPvUl(void);
+void dispose__7JKRHeapFv(void);
+void find__7JKRHeapCFPv(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void free__Q210JKRExpHeap9CMemBlockFP10JKRExpHeap(void);
+void getHeapBlock__Q210JKRExpHeap9CMemBlockFPv(void);
+void getMaxAllocatableSize__7JKRHeapCFi(void);
+void getTotalFreeSize__7JKRHeapCFv(void);
+void getUsedSize__10JKRExpHeapCFUc(void);
+void initArena__7JKRHeapFPPcPUli(void);
+void initiate__Q210JKRExpHeap9CMemBlockFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockUlUcUc(void);
+void joinTwoBlocks__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+void JUTReportConsole_f(const char*, ...);
+void JUTReportConsole(const char*);
+void JUTWarningConsole_f(const char*, ...);
+void JUTWarningConsole(void);
+void recycleFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
+void removeFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
+void removeUsedBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void);
+void setFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlock(void);
+}
+
 asm void JKRExpHeap::createRoot(int, bool) {
     nofralloc
 #include "JSystem/JKernel/JKRExpHeap/asm/func_802CEDB4.s"

libs/JSystem/JKernel/JKRFile.cpp

@@ -1,6 +1,10 @@
 #include "JSystem/JKernel/JKRFile/JKRFile.h"
 #include "global.h"
 
+extern "C" {
+void VIWaitForRetrace(void);
+}
+
 s32 JKRFile::read(void* data, s32 size, long offset) {
     while (true) {
         s32 result = readData(data, size, offset);

libs/JSystem/JKernel/JKRFileCache.cpp

@@ -5,6 +5,22 @@
 #include "dvd/dvd.h"
 #include "global.h"
 
+extern "C" {
+char* strcat(char*, const char*);
+char* strcpy(char*, const char*);
+char* strrchr(char*, int);
+int strcmp(const char*, const char*);
+int tolower(int);
+u32 strlen(const char*);
+void __dl__FPv(void);
+void __dt__10JSUPtrLinkFv(void);
+void free__7JKRHeapFPv(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void getDvdPathName__12JKRFileCacheCFPCc(void);
+void memcpy(void*, const void*, int);
+void remove__10JSUPtrListFP10JSUPtrLink(void);
+}
+
 JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) {
     if (!path || *path != '/') {
         return NULL;

libs/JSystem/JKernel/JKRFileFinder.cpp

@@ -3,6 +3,10 @@
 #include "dvd/dvd.h"
 #include "global.h"
 
+extern "C" {
+void __dl__FPv(void);
+}
+
 JKRArcFinder::JKRArcFinder(JKRArchive* archive, s32 startIndex, u32 numEntries) : JKRFileFinder() {
     mArchive = archive;
     mIsAvailable = (s32)numEntries > 0;
@@ -92,4 +96,4 @@ asm JKRArcFinder::~JKRArcFinder() {
     nofralloc
 #include "JSystem/JKernel/JKRFileFinder/asm/func_802D4958.s"
 }
-#endif
+#endif

libs/JSystem/JKernel/JKRFileLoader.cpp

@@ -1,6 +1,11 @@
 #include "JSystem/JKernel/JKRFileLoader/JKRFileLoader.h"
 #include "global.h"
 
+extern "C" {
+char* strcpy(char*, const char*);
+int strcmp(const char*, const char*);
+}
+
 // todo: static initialization is working uncomment this
 // JSUList<JKRFileLoader> JKRFileLoader::sVolumeList;
 

libs/JSystem/JKernel/JKRHeap.cpp

@@ -1,6 +1,17 @@
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "global.h"
 
+extern "C" {
+void __dl__FPv(void);
+void __dt__10JSUPtrLinkFv(void);
+void __dt__10JSUPtrListFv(void);
+void __dt__11JKRDisposerFv(void);
+void getFreeSize__7JKRHeapCFv(void);
+void getMaxFreeBlock__7JKRHeapCFv(void);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+void remove__10JSUPtrListFP10JSUPtrLink(void);
+}
+
 JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag)
     : JKRDisposer(), mChildTree(this), mDisposerList() {
     OSInitMutex(&mMutex);

libs/JSystem/JKernel/JKRMemArchive.cpp

@@ -2,6 +2,14 @@
 #include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
 #include "global.h"
 
+extern "C" {
+void DCInvalidateRange(void*, u32);
+void findFromRoot__7JKRHeapFPv(void);
+void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...);
+void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(void);
+void memcpy(void*, const void*, int);
+}
+
 JKRMemArchive::JKRMemArchive(long entryNum, JKRArchive::EMountDirection mountDirection)
     : JKRArchive(entryNum, MOUNT_MEM) {
     mIsMounted = false;

libs/JSystem/JKernel/JKRSolidHeap.cpp

@@ -1,6 +1,13 @@
 #include "JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h"
 #include "global.h"
 
+extern "C" {
+void getTotalFreeSize__7JKRHeapCFv(void);
+void JUTReportConsole_f(const char*, ...);
+void JUTWarningConsole_f(const char*, ...);
+void resize__7JKRHeapFPvUl(void);
+}
+
 JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler) {
     if (!heap) {
         heap = getRootHeap();

libs/JSystem/JKernel/JKRThread.cpp

@@ -2,6 +2,23 @@
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
 #include "global.h"
 
+extern "C" {
+void __ct__15JKRThreadSwitchFP7JKRHeap(void);
+void __dl__FPv(void);
+void __nw__FUlP7JKRHeapi(void);
+void becomeCurrentHeap__7JKRHeapFv(void);
+void callback__15JKRThreadSwitchFP8OSThreadP8OSThread(void);
+void func_803620AC(void);
+void func_803626BC(void);
+void func_803664DC(void);
+void isSubHeap__7JKRHeapCFP7JKRHeap(void);
+void JUTConsole_NS_clear(void);
+void JUTConsole_NS_print_f(void);
+void JUTConsole_NS_print(void);
+void JUTWarningConsole(void);
+void searchThread__9JKRThreadFP8OSThread(void);
+}
+
 // lbl_80455FC0 JKRThread.o @934
 static const u8 lbl_80455FC0[4] = {0x42, 0xc8, 0x0, 0x0};
 // lbl_80455FC4 JKRThread.o @935

libs/JSystem/JStudio/functionvalue.cpp

@@ -1,5 +1,9 @@
 #include "JSystem/JStudio/functionvalue.h"
 
+extern "C" {
+void func_803620AC(void);
+}
+
 namespace JStudio {
 
 DoubleFunc TFunctionValue::toFunction_outside(int arg1) {

libs/JSystem/JStudio/stb.cpp

@@ -1,19 +1,19 @@
 #include "JSystem/JStudio/stb.h"
 
 extern "C" {
-extern void process_sequence___Q37JStudio3stb7TObjectFv();
-extern void process_paragraph_reserved___Q37JStudio3stb7TObjectFUlPCvUl();
-extern void JStudio_NS_stb_NS_data_NS_TParse_TParagraph_NS_getData();
-extern void setFlag_operation__Q37JStudio3stb7TObjectFUci();
-extern void JStudio_NS_stb_NS_data_NS_TParse_TSequence_NS_getData();
-extern void JGadget_NS_TNodeLinkList_NS_Erase();
-extern void
-Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget13TLinkListNode();
-extern void destroyObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject();
-extern void std_NS_find_if_X2_();
-extern void reset__Q37JStudio3stb7TObjectFPCv();
-extern void forward__Q37JStudio3stb7TObjectFUl();
-extern void JStudio_NS_object_NS_TIDData_NS_isEqual();
+int func_8036608C(const void*, const void*, u32);
+void process_sequence___Q37JStudio3stb7TObjectFv();
+void process_paragraph_reserved___Q37JStudio3stb7TObjectFUlPCvUl();
+void JStudio_NS_stb_NS_data_NS_TParse_TParagraph_NS_getData();
+void setFlag_operation__Q37JStudio3stb7TObjectFUci();
+void JStudio_NS_stb_NS_data_NS_TParse_TSequence_NS_getData();
+void JGadget_NS_TNodeLinkList_NS_Erase();
+void Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget13TLinkListNode();
+void destroyObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject();
+void std_NS_find_if_X2_();
+void reset__Q37JStudio3stb7TObjectFPCv();
+void forward__Q37JStudio3stb7TObjectFUl();
+void JStudio_NS_object_NS_TIDData_NS_isEqual();
 }
 
 extern u8 lbl_804554D0;            // 0xFF

libs/JSystem/JUtility/JUTGamePad.cpp

@@ -1,6 +1,34 @@
 #include "JSystem/JUtility/JUTGamePad/JUTGamePad.h"
 #include "global.h"
 
+extern "C" {
+u32 OSGetResetSwitchState(void);
+void __ct__10JSUPtrLinkFPv(void);
+void __ct__11JKRDisposerFv(void);
+void __dl__FPv(void);
+void __dt__10JSUPtrLinkFv(void);
+void __dt__11JKRDisposerFv(void);
+void append__10JSUPtrListFP10JSUPtrLink(void);
+void assign__10JUTGamePadFv(void);
+void checkCallback__19JUTGamePadLongPressFlUl(void);
+void checkResetCallback__10JUTGamePadFx(void);
+void checkResetSwitch__10JUTGamePadFv(void);
+void clear__10JUTGamePadFv(void);
+void clear__Q210JUTGamePad6CStickFv(void);
+void clear__Q210JUTGamePad7CButtonFv(void);
+void clear__Q210JUTGamePad7CRumbleFP10JUTGamePad(void);
+void func_8036C720(void);
+void getButton__Q210JUTGamePad6CStickFUl(void);
+void initList__10JUTGamePadFv(void);
+void remove__10JSUPtrListFP10JSUPtrLink(void);
+void startMotor__Q210JUTGamePad7CRumbleFi(void);
+void stopMotor__Q210JUTGamePad7CRumbleFib(void);
+void update__10JUTGamePadFv(void);
+void update__Q210JUTGamePad6CStickFScScUlUlUl(void);
+void update__Q210JUTGamePad7CButtonFPC9PADStatusUl(void);
+void update__Q210JUTGamePad7CRumbleFs(void);
+}
+
 #ifdef NONMATCHING
 // TODO(erin): probably ~easy to do, i just didn't do it yet :)
 JUTGamePad::JUTGamePad(EPadPort port) : ptr_link(this) {

libs/JSystem/JUtility/JUTResFont.cpp

@@ -1,18 +1,15 @@
 #include "JSystem/JUtility/JUTResFont.h"
 
 extern "C" {
-extern void convertSjis__10JUTResFontCFiPUs();  // remove when JUTResFont::getFontCode decompiled
-extern void getFontCode__10JUTResFontCFi();     // remove when JUTResFont::getWidthEntry decompiled
-extern void
-loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth();  // remove when
-                                                            // JUTResFont::drawChar_scale decompiled
-extern void countBlock__10JUTResFontFv();  // remove when JUTResFont::protected_initiate decompiled
-extern void
-initialize_state__7JUTFontFv();  // remove when JUTResFont::protected_initiate decompiled
-extern void
-initialize_state__10JUTResFontFv();  // remove when JUTResFont::protected_initiate decompiled
-extern void
-deleteMemBlocks_ResFont__10JUTResFontFv();  // remove when JUTResFont::protected_initiate decompiled
+void __nwa__FUlP7JKRHeapi(void);
+void JUTReportConsole(const char*);
+void convertSjis__10JUTResFontCFiPUs();  // remove when JUTResFont::getFontCode decompiled
+void getFontCode__10JUTResFontCFi();     // remove when JUTResFont::getWidthEntry decompiled
+void loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth();  // remove when JUTResFont::drawChar_scale decompiled
+void countBlock__10JUTResFontFv();  // remove when JUTResFont::protected_initiate decompiled
+void initialize_state__7JUTFontFv();  // remove when JUTResFont::protected_initiate decompiled
+void initialize_state__10JUTResFontFv();  // remove when JUTResFont::protected_initiate decompiled
+void deleteMemBlocks_ResFont__10JUTResFontFv();  // remove when JUTResFont::protected_initiate decompiled
 }
 
 extern float lbl_80455FF0;

libs/JSystem/JUtility/JUTXfb.cpp

@@ -2,6 +2,11 @@
 #include "JSystem/JUtility/JUTVideo/JUTVideo.h"
 #include "global.h"
 
+extern "C" {
+void common_init__6JUTXfbFl(void);
+void initiate__6JUTXfbFUsUsP7JKRHeapl(void);
+}
+
 void JUTXfb::clearIndex() {
     this->active_xfb_index = -1;
     this->last_drawn_xfb_index = -1;

libs/SSystem/SComponent/c_API_graphic.cpp

@@ -1,3 +1,4 @@
+
 /* c_API_graphic.cpp autogenerated by split.py v0.3 at 2020-12-31 13:52:43.596394 */
 
 #include "SComponent/c_API_graphic.h"
@@ -20,4 +21,4 @@ void cAPIGph_BeforeOfDraw(void) {
 // cAPIGph_AfterOfDraw(void)
 void cAPIGph_AfterOfDraw(void) {
     lbl_803C3528[2]();
-}
+}

libs/SSystem/SComponent/c_angle.cpp

@@ -4,7 +4,13 @@
 #include "global.h"
 
 extern "C" {
-
+double func_8036C028(double);
+double func_8036C590(double);
+double func_8036C668(double);
+double func_8036CA54(double);
+void __ct__7cSAngleFs(void);
+void cSAngle_NS_dtor(void);
+void func_80361C24(void);
 float cAngle_NS_Adjust(float, float, float);
 }
 

libs/SSystem/SComponent/c_bg_s_chk.cpp

@@ -2,6 +2,10 @@
 
 #include "SComponent/c_bg_s_chk.h"
 
+extern "C" {
+void __dl__FPv(void);
+}
+
 // __ct__8cBgS_ChkFv
 cBgS_Chk::cBgS_Chk(void) {
     unk_0x00 = 0;

libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp

@@ -4,6 +4,15 @@
 
 // additional symbols needed for c_bg_s_gnd_chk.cpp
 // autogenerated by split.py v0.3 at 2020-12-31 14:10:48.795807
+extern "C" {
+void __ct__13cBgS_PolyInfoFv(void);
+void __ct__8cBgS_ChkFv(void);
+void __dl__FPv(void);
+void __dt__11cBgS_GndChkFv(void);
+void __dt__13cBgS_PolyInfoFv(void);
+void __dt__8cBgS_ChkFv(void);
+}
+
 extern u8 lbl_803C3F90;
 
 // __ct__11cBgS_GndChkFv

libs/SSystem/SComponent/c_bg_s_lin_chk.cpp

@@ -4,6 +4,17 @@
 
 // additional symbols needed for c_bg_s_lin_chk.cpp
 // autogenerated by split.py v0.3 at 2021-01-01 12:56:44.686018
+extern "C" {
+void __ct__13cBgS_PolyInfoFv(void);
+void __ct__8cBgS_ChkFv(void);
+void __dl__FPv(void);
+void __dt__11cBgS_LinChkFv(void);
+void __dt__13cBgS_PolyInfoFv(void);
+void __dt__8cBgS_ChkFv(void);
+void ClearPi__13cBgS_PolyInfoFv(void);
+void ct__11cBgS_LinChkFv(void);
+void SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz(void);
+}
 extern u8 lbl_803C3FA8;
 
 // __ct__11cBgS_LinChkFv

libs/SSystem/SComponent/c_bg_s_poly_info.cpp

@@ -2,6 +2,11 @@
 
 #include "SComponent/c_bg_s_poly_info.h"
 
+extern "C" {
+void __dl__FPv(void);
+void ClearPi__13cBgS_PolyInfoFv(void);
+}
+
 // __ct__13cBgS_PolyInfoFv
 cBgS_PolyInfo::cBgS_PolyInfo(void) {
     this->ClearPi();

libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp

@@ -4,6 +4,12 @@
 
 // additional symbols needed for c_bg_s_shdw_draw.cpp
 // autogenerated by split.py v0.3 at 2021-01-01 13:07:28.433195
+extern "C" {
+void __ct__8cBgS_ChkFv(void);
+void __dl__FPv(void);
+void __dt__8cBgS_ChkFv(void);
+void Set__8cM3dGAabFPC4cXyzPC4cXyz(void);
+}
 extern u8 lbl_803C3FC0;
 
 // __ct__13cBgS_ShdwDrawFv

libs/SSystem/SComponent/c_bg_w.cpp

@@ -12,9 +12,6 @@ unsigned int cBgW_BgId::ChkUsed() const {
     unsigned int temp = mId - 0x100;
     return temp >> 0x1f;
 }
-
-extern "C" {
-
 bool cBgW_CheckBGround(float a1) {
     return a1 >= lbl_804550E8;
 }
@@ -28,6 +25,4 @@ bool cBgW_CheckBWall(float a1) {
         return true;
 
     return false;
-}
-
-}  // extern "C"
+}

libs/SSystem/SComponent/c_cc_d.cpp

@@ -3,6 +3,36 @@
 #include "SComponent/c_xyz.h"
 #include "global.h"
 
+extern "C" {
+void __dl__FPv(void);
+void cCcD_CpsAttr_NS_dtor(void);
+void cCcD_CylAttr_NS_dtor(void);
+void cCcD_SphAttr_NS_dtor(void);
+void ClearForMinMax__8cM3dGAabFv(void);
+void cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec(void);
+void cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec(void);
+void cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec(void);
+void cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec(void);
+void cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf(void);
+void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf(void);
+void cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec(void);
+void cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf(void);
+void cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec(void);
+void cM3d_Cross_TriTri__FRC8cM3dGTriRC8cM3dGTriP3Vec(void);
+void cross__8cM3dGCylCFPC8cM3dGCylP4cXyz(void);
+void cross__8cM3dGCylCFPC8cM3dGSphP4cXyz(void);
+void cross__8cM3dGSphCFPC8cM3dGCylP4cXyz(void);
+void cross__8cM3dGSphCFPC8cM3dGSphP4cXyz(void);
+void cross__8cM3dGTriCFPC8cM3dGCylP3Vec(void);
+void cXyz_NS_dtor(void);
+void func_80361C24(void);
+void PlusR__8cM3dGAabFf(void);
+void Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt(void);
+void Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg(void);
+void Set__8cM3dGAabFPC4cXyzPC4cXyz(void);
+void SetMinMax__8cM3dGAabFRC4cXyz(void);
+}
+
 extern "C" {
 
 // Set__15cCcD_DivideInfoFUlUlUl

libs/SSystem/SComponent/c_cc_s.cpp

@@ -2,6 +2,27 @@
 
 #include "global.h"
 
+extern "C" {
+void CalcCenter__8cM3dGAabCFP4cXyz(void);
+void CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl(void);
+void cCcD_Stts_NS_PlusDmg(void);
+void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo(void);
+void ClearForMinMax__8cM3dGAabFv(void);
+void ClrCcMove__9cCcD_SttsFv(void);
+void cXyz_NS_dtor(void);
+void func_80361C24(void);
+void GetAc__8cCcD_ObjFv(void);
+void GetWeightF__9cCcD_SttsCFv(void);
+void PlusCcMove__9cCcD_SttsFfff(void);
+void SetArea__15cCcD_DivideAreaFRC8cM3dGAab(void);
+void SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz(void);
+void SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf(void);
+void SetHit__10cCcD_ObjAtFP8cCcD_Obj(void);
+void SetHit__10cCcD_ObjCoFP8cCcD_Obj(void);
+void SetHit__10cCcD_ObjTgFP8cCcD_Obj(void);
+void SetMinMax__8cM3dGAabFRC8cM3dGAab(void);
+}
+
 extern "C" {
 // __ct__4cCcSFv
 // cCcS::cCcS(void)

libs/SSystem/SComponent/c_counter.cpp

@@ -9,7 +9,6 @@ struct counter_class {
 extern counter_class lbl_80430CD8;
 
 extern "C" {
-
 void cCt_Counter(int resetCounter1) {
     if (resetCounter1 == 1) {
         lbl_80430CD8.mCounter1 = 0;
@@ -19,4 +18,4 @@ void cCt_Counter(int resetCounter1) {
 
     lbl_80430CD8.mCounter0++;
 }
-};
+};

libs/SSystem/SComponent/c_lib.cpp

@@ -3,6 +3,18 @@
 #include "SComponent/c_lib.h"
 #include "SComponent/c_math.h"
 
+extern "C" {
+int abs(int);
+void __eq__4cXyzCFRC3Vec(void);
+void __mi__4cXyzCFRC3Vec(void);
+void __ml__4cXyzCFf(void);
+void __ne__4cXyzCFRC3Vec(void);
+void cM_atan2s__Fff(void);
+void memcpy(void*, const void*, int);
+void normZP__4cXyzCFv(void);
+void* memset(void* dest, int ch, u32 count);
+}
+
 // cLib_memCpy__FPvPCvUl
 // cLib_memCpy(void*, const void*, unsigned long)
 void cLib_memCpy(void* dst, const void* src, unsigned long size) {

libs/SSystem/SComponent/c_list.cpp

@@ -3,7 +3,6 @@
 #include "global.h"
 
 extern "C" {
-
 void cLs_Init(node_list_class* pList) {
     pList->mpHead = NULL;
     pList->mpTail = NULL;

libs/SSystem/SComponent/c_list_iter.cpp

@@ -3,7 +3,6 @@
 #include "global.h"
 
 extern "C" {
-
 int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData) {
     if (pList->mSize > 0)
         return cNdIt_Method(pList->mpHead, pMethod, pUserData);

libs/SSystem/SComponent/c_m3d.cpp

@@ -59,6 +59,53 @@ extern u8 lbl_80455154;
 extern u8 lbl_804551B0;
 extern u8 lbl_80455160;
 
+extern "C" {
+void __ct__8cM3dGLinFRC4cXyzRC4cXyz(void);
+void CalcPos__8cM3dGLinCFP3Vecf(void);
+void cM_atan2s__Fff(void);
+void cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin(void);
+void cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec(void);
+void cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf(void);
+void cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec(void);
+void cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec(void);
+void cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec(void);
+void cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec(void);
+void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf(void);
+void cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb(void);
+void cM3d_Cross_LinSph__FPC8cM3dGLinPC8cM3dGSphP3Vec(void);
+void cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec(void);
+void cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb(void);
+void cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec(void);
+void cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec(void);
+void cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf(void);
+void cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec(void);
+void cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec(void);
+void cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec(void);
+void cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec(void);
+void cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf(void);
+void cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec(void);
+void cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vec(void);
+void cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf(void);
+void cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf(void);
+void cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf(void);
+void cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec(void);
+void cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec(void);
+void cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf(void);
+void cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff(void);
+void cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf(void);
+void cM3d_InDivPos1__FPC3VecPC3VecfP3Vec(void);
+void cM3d_InDivPos2__FPC3VecPC3VecfP3Vec(void);
+void cM3d_Len2dSq__Fffff(void);
+void cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf(void);
+void cM3d_lineVsPosSuisenCross__FPC8cM3dGLinPC3VecP3Vec(void);
+void cM3d_PlaneCrossLineProcWork__FfffffffPfPf(void);
+void cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec(void);
+void cM3d_VectorProduct2d__Fffffff(void);
+void SetC__8cM3dGSphFRC4cXyz(void);
+void SetR__8cM3dGSphFf(void);
+void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(void);
+}
+
 // cM3d_InDivPos1__FPC3VecPC3VecfP3Vec
 void cM3d_InDivPos1(const Vec* pVecA, const Vec* pVecB, f32 pF, Vec* pOut) {
     Vec tmp;

libs/SSystem/SComponent/c_m3d_g_aab.cpp

@@ -4,6 +4,12 @@
 
 // additional symbols needed for c_m3d_g_aab.cpp
 // autogenerated by split.py v0.3 at 2021-01-01 14:25:53.390342
+
+extern "C" {
+void SetMax__8cM3dGAabFRC4cXyz(void);
+void SetMin__8cM3dGAabFRC4cXyz(void);
+void SetMinMax__8cM3dGAabFRC4cXyz(void);
+}
 extern f32 lbl_804551D4;
 extern f32 lbl_804551D0;
 extern f32 lbl_804551D8;

libs/SSystem/SComponent/c_m3d_g_cir.cpp

@@ -2,6 +2,10 @@
 
 #include "SComponent/c_m3d_g_cir.h"
 
+extern "C" {
+void __dl__FPv(void);
+}
+
 // __ct__8cM3dGCirFv
 cM3dGCir::cM3dGCir(void) {}
 

libs/SSystem/SComponent/c_m3d_g_cps.cpp

@@ -2,6 +2,13 @@
 
 #include "SComponent/c_m3d_g_cps.h"
 
+extern "C" {
+void __dl__FPv(void);
+void Set__8cM3dGCpsFRC4cXyzRC4cXyzf(void);
+void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(void);
+void SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz(void);
+}
+
 // __ct__8cM3dGCpsFv
 cM3dGCps::cM3dGCps(void) {}
 

libs/SSystem/SComponent/c_m3d_g_cyl.cpp

@@ -3,6 +3,14 @@
 #include "SComponent/c_m3d_g_cyl.h"
 #include "SComponent/c_m3d.h"
 
+extern "C" {
+void cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylP3Vec(void);
+void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf(void);
+void SetC__8cM3dGCylFRC4cXyz(void);
+void SetH__8cM3dGCylFf(void);
+void SetR__8cM3dGCylFf(void);
+}
+
 // __ct__8cM3dGCylFPC4cXyzff
 cM3dGCyl::cM3dGCyl(const cXyz* pCenter, f32 pRadius, f32 pHeight) {
     this->SetC(*pCenter);

libs/SSystem/SComponent/c_m3d_g_pla.cpp

@@ -3,6 +3,10 @@
 #include "SComponent/c_m3d_g_pla.h"
 #include "SComponent/c_m3d.h"
 
+extern "C" {
+void cM3d_InDivPos2__FPC3VecPC3VecfP3Vec(void);
+}
+
 // __ct__8cM3dGPlaFPC4cXyzf
 cM3dGPla::cM3dGPla(const cXyz* pNormal, f32 pD) : mNormal(*pNormal), mD(pD) {}
 

libs/SSystem/SComponent/c_m3d_g_sph.cpp

@@ -3,6 +3,13 @@
 #include "SComponent/c_m3d_g_sph.h"
 #include "SComponent/c_m3d.h"
 
+extern "C" {
+void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf(void);
+void cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphP3Vec(void);
+void SetC__8cM3dGSphFRC4cXyz(void);
+void SetR__8cM3dGSphFf(void);
+}
+
 // SetC__8cM3dGSphFRC4cXyz
 void cM3dGSph::SetC(const cXyz& pCenter) {
     mCenter = pCenter;

libs/SSystem/SComponent/c_m3d_g_tri.cpp

@@ -3,6 +3,13 @@
 #include "SComponent/c_m3d_g_tri.h"
 #include "SComponent/c_m3d.h"
 
+extern "C" {
+void cM3d_CalcPla__FPC3VecPC3VecPC3VecP3VecPf(void);
+void cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec(void);
+void Set__8cM3dGPlaFPC8cM3dGPla(void);
+void SetupNP__8cM3dGPlaFRC3VecRC3Vec(void);
+}
+
 // cross__8cM3dGTriCFPC8cM3dGCylP3Vec
 bool cM3dGTri::cross(const cM3dGCyl* pCylinder, Vec* out) const {
     return cM3d_Cross_CylTri(pCylinder, this, out);

libs/SSystem/SComponent/c_math.cpp

@@ -2,6 +2,12 @@
 
 #include "SComponent/c_math.h"
 
+extern "C" {
+double func_8036C760(double, double);
+void cM_atan2s__Fff(void);
+void U_GetAtanTable__Fff(void);
+}
+
 // additional symbols needed for c_math.cpp
 // autogenerated by split.py v0.3 at 2020-12-31 13:20:59.336084
 extern double lbl_804550A8;  // SComponent::@2201, 6.2831854820251465

libs/SSystem/SComponent/c_node.cpp

@@ -3,10 +3,8 @@
 #include "global.h"
 
 extern "C" {
-
 #define NODE_GET_PREV(pNode) (pNode ? pNode->mpPrevNode : NULL)
 #define NODE_GET_NEXT(pNode) (pNode ? pNode->mpNextNode : NULL)
-
 void cNd_Join(node_class* pA, node_class* pB) {
     pA->mpNextNode = pB;
     pB->mpPrevNode = pA;

libs/SSystem/SComponent/c_request.cpp

@@ -2,6 +2,10 @@
 
 #include "SComponent/c_request.h"
 
+extern "C" {
+void cReq_Create__FP18request_base_classUc(void);
+}
+
 // cReq_Is_Done__FP18request_base_class
 asm int cReq_Is_Done(request_base_class*) {
     nofralloc

libs/SSystem/SComponent/c_sxyz.cpp

@@ -4,6 +4,11 @@
 
 extern u8 lbl_804550A0;
 extern u8 lbl_80430DA8;
+extern "C" {
+void __ct__5csXyzFsss(void);
+void csXyz_NS_dtor(void);
+void func_80361C24(void);
+}
 
 // __ct__5csXyzFsss
 csXyz::csXyz(s16 pX, s16 pY, s16 pZ) {

libs/SSystem/SComponent/c_tag.cpp

@@ -3,7 +3,6 @@
 #include "SComponent/c_tree.h"
 
 extern "C" {
-
 int cTg_IsUse(create_tag_class* pTag) {
     return pTag->mbIsUse;
 }

libs/SSystem/SComponent/c_tag_iter.cpp

@@ -3,7 +3,6 @@
 #include "global.h"
 
 extern "C" {
-
 int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter) {
     return pMethodFilter->mpMethodFunc((node_class*)pTag->mpTagData, pMethodFilter->mpUserData);
 }

libs/SSystem/SComponent/c_tree.cpp

@@ -3,7 +3,6 @@
 #include "global.h"
 
 extern "C" {
-
 int cTr_SingleCut(node_class* pNode) {
     return cLs_SingleCut(pNode);
 }

libs/SSystem/SComponent/c_tree_iter.cpp

@@ -4,7 +4,6 @@
 #include "global.h"
 
 extern "C" {
-
 int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pMethod, void* pUserData) {
     node_list_class* pList = pTree->mpLists;
     int i = pTree->mNumLists;

libs/SSystem/SComponent/c_xyz.cpp

@@ -2,6 +2,14 @@
 
 #include "SComponent/c_xyz.h"
 
+extern "C" {
+void __ml__4cXyzCFf(void);
+void cM_atan2s__Fff(void);
+void cXyz_NS_dtor(void);
+void normZP__4cXyzCFv(void);
+void func_80361C24(void);
+}
+
 // __pl__4cXyzCFRC3Vec
 cXyz cXyz::operator+(const Vec& vec) const {
     Vec ret;

libs/Z2AudioLib/Z2Audience.cpp

@@ -12,6 +12,13 @@
 #include "Z2AudioLib/Z2SpotMic/Z2SpotMic.h"
 #include "global.h"
 
+extern "C" {
+void __dl__FPv(void);
+void func_80361C24(void);
+void func_80361D60(void);
+void func_803620AC(void);
+}
+
 extern "C" {
 // calc__15Z2AudibleAbsPosFRCQ29JGeometry8TVec3<f>
 // Z2AudibleAbsPos::calc(JGeometry::TVec3<f>)

libs/Z2AudioLib/Z2AudioArcLoader.cpp

@@ -5,6 +5,11 @@
 #include "Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h"
 #include "global.h"
 
+extern "C" {
+void __dl__FPv(void);
+void mount__10JKRArchiveFPvP7JKRHeapQ210JKRArchive15EMountDirection(void);
+}
+
 extern "C" {
 // __ct__16Z2AudioArcLoaderFP10JAUSection
 // Z2AudioArcLoader::Z2AudioArcLoader(JAUSection*)

libs/Z2AudioLib/Z2AudioMgr.cpp

@@ -30,6 +30,13 @@
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
+extern "C" {
+void __dl__FPv(void);
+void __nw__FUlP7JKRHeapi(void);
+void func_80361C24(void);
+void func_80361D60(void);
+}
+
 extern "C" {
 // __ct__10Z2AudioMgrFv
 // Z2AudioMgr::Z2AudioMgr(void)

libs/Z2AudioLib/Z2Calc.cpp

@@ -1,5 +1,10 @@
 #include "Z2AudioLib/Z2Calc/Z2Calc.h"
 
+extern "C" {
+double func_8036C740(double);
+double func_8036C780(double, double);
+}
+
 // s_is_oRandom_initialized
 extern s8 lbl_80451330;
 // Z2AudioLib::oRandom$401

libs/Z2AudioLib/Z2Creature.cpp

@@ -13,6 +13,15 @@
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
+extern "C" {
+void __dl__FPv(void);
+void __ct__10JSUPtrLinkFPv(void);
+void __dt__10JSUPtrLinkFv(void);
+void append__10JSUPtrListFP10JSUPtrLink(void);
+void remove__10JSUPtrListFP10JSUPtrLink(void);
+void func_80361D60(void);
+}
+
 extern "C" {
 // __ct__10Z2CreatureFv
 // Z2Creature::Z2Creature(void)

libs/Z2AudioLib/Z2EnvSeMgr.cpp

@@ -13,6 +13,15 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 
+extern "C" {
+void __dl__FPv(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void dComIfGp_getReverb(void);
+void func_803620AC(void);
+void isSwitch__12dSv_memBit_cCFi(void);
+void Z2EnvSeMgr_NS_startRainSe(void);
+}
+
 extern "C" {
 // __ct__11Z2EnvSeBaseFP3Vec
 // Z2EnvSeBase::Z2EnvSeBase(Vec*)

libs/Z2AudioLib/Z2FxLineMgr.cpp

@@ -5,6 +5,16 @@
 #include "JSystem/JSupport/JSUMemoryInputStream.h"
 #include "global.h"
 
+extern "C" {
+class JSUInputStream;
+s32 JSUInputStream_NS_read(JSUInputStream*, u8*, u32);
+void JSUInputStream_NS_dtor(void);
+void free__7JKRHeapFPvP7JKRHeap(void);
+void getResource__10JKRArchiveFUs(void);
+void countResource__10JKRArchiveCFv(void);
+void __nwa__FUlP7JKRHeapi(void);
+}
+
 extern "C" {
 // __ct__11Z2FxLineMgrFv
 // Z2FxLineMgr::Z2FxLineMgr(void)

libs/Z2AudioLib/Z2LinkMgr.cpp

@@ -12,6 +12,14 @@
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 
+extern "C" {
+
+void __dl__FPv(void);
+void __dt__14Z2CreatureLinkFv(void);
+void isEventBit__11dSv_event_cCFUs(void);
+void startLinkVoice__14Z2CreatureLinkF10JAISoundIDSc(void);
+}
+
 void Z2CreatureLink::setLinkGroupInfo(u8 param1) {
     return;
 }

libs/Z2AudioLib/Z2SceneMgr.cpp

@@ -10,6 +10,19 @@
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 
+extern "C" {
+int strcmp(const char*, const char*);
+void __ct__10JAISoundIDFRC10JAISoundID(void);
+void JSUList_X1_(void);
+void dComIfGs_isStageSwitch(void);
+void dComIfGs_getStartPoint(void);
+void isSwitch__10dSv_info_cCFii(void);
+void dComIfGs_isEventBit(void);
+void dComIfGs_isSaveSwitch(void);
+void isSwitch__12dSv_memBit_cCFi(void);
+void isEventBit__11dSv_event_cCFUs(void);
+}
+
 extern u8 lbl_803CA9BC;
 extern u8 lbl_80450863;
 

libs/Z2AudioLib/Z2SeMgr.cpp

@@ -11,6 +11,12 @@
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
+extern "C" {
+void __dl__FPv(void);
+void func_80361D60(void);
+void func_803620AC(void);
+}
+
 asm Z2SeMgr::Z2SeMgr(void) {
     nofralloc
 #include "Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s"

libs/Z2AudioLib/Z2SoundHandles.cpp

@@ -5,6 +5,15 @@
 #include "JSystem/JAudio2/JASMemPool.h"
 #include "global.h"
 
+extern "C" {
+void __ct__10JSUPtrLinkFPv(void);
+void __dl__FPv(void);
+void __dt__10JSUPtrLinkFv(void);
+void func_80361C24(void);
+void remove__10JSUPtrListFP10JSUPtrLink(void);
+void append__10JSUPtrListFP10JSUPtrLink(void);
+}
+
 Z2SoundHandles::Z2SoundHandles() {
     mNumHandles = 0;
 }

libs/Z2AudioLib/Z2SoundInfo.cpp

@@ -8,6 +8,10 @@
 #include "dvd/dvd.h"
 #include "global.h"
 
+extern "C" {
+void __dl__FPv(void);
+}
+
 extern "C" {
 // getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID
 // Z2SoundInfo::getBgmSeqResourceID(JAISoundID) const

libs/Z2AudioLib/Z2SoundMgr.cpp

@@ -16,6 +16,10 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
+extern "C" {
+void func_803664DC(void);
+}
+
 extern "C" {
 // seqCallback__FP8JASTrackUs
 // seqCallback(JASTrack*, unsigned short)

libs/Z2AudioLib/Z2SoundObjMgr.cpp

@@ -4,6 +4,13 @@
 #include "Z2AudioLib/Z2Calc/Z2Calc.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 
+extern "C" {
+int strcmp(const char*, const char*);
+void initiate__10JSUPtrListFv(void);
+void append__10JSUPtrListFP10JSUPtrLink(void);
+void remove__10JSUPtrListFP10JSUPtrLink(void);
+}
+
 #ifdef NONMATCHING
 // order wrong because this needs to inherit from JASGlobalInstance<T>
 Z2SoundObjMgr::Z2SoundObjMgr() {

libs/Z2AudioLib/Z2SoundObject.cpp

@@ -7,6 +7,11 @@
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h"
 
+extern "C" {
+void __dl__FPv(void);
+void getNthLink__10JSUPtrListCFUl(void);
+}
+
 Z2SoundObjBase::Z2SoundObjBase() {
     //! @note initializer list doesn't work since fields were initialized out of
     //! structure layout order, indicating original code didn't use initializer list.

libs/Z2AudioLib/Z2SoundStarter.cpp

@@ -8,6 +8,10 @@
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
+extern "C" {
+void __dl__FPv(void);
+}
+
 extern "C" {
 // __ct__14Z2SoundStarterFb
 // Z2SoundStarter::Z2SoundStarter(bool)

libs/Z2AudioLib/Z2SpeechMgr2.cpp

@@ -10,6 +10,11 @@
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 
+extern "C" {
+void __dl__FPv(void);
+void dComIfGp_getReverb(void);
+}
+
 #ifdef NONMATCHING
 Z2SpeechMgr2::Z2SpeechMgr2()
     : mSound(NULL), field_0x4(0), mRandom(0), mSpeechStarter(), field_0x3f8(0), mTextCount(-1),

libs/Z2AudioLib/Z2StatusMgr.cpp

@@ -7,6 +7,11 @@
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 
+extern "C" {
+int func_80368954(char*, char*, u32);
+int strcmp(const char*, const char*);
+}
+
 Z2StatusMgr::Z2StatusMgr() {
     lbl_80450B7C = this;
     this->hour = 0;