JKernel (#20)

* JKRDvdArchive.s split

* JKRMemArchive.s split

* JKRAramArchive.s split

* JKRCompArchive.s split

* JKRDecomp.s split

* JKRDvdRipper.s split

* JKRAramBlock.s split

* JKRAramHeap.s split

* JKRAramPiece.s split

* JKRAramStream.s split

* removed unused .s files

* JKRDvdAramRipper.s split

* JKRAram.s split

* cleanup and making vtables easier to debug

* fixed merge errors

* fixed JKRFileLoader::fetchVolumeName

Co-authored-by: Pheenoh <pheenoh@gmail.com>

libs/JSystem/JKernel/JKRAram.cpp

@@ -1 +1,74 @@
-// ok
+#include "JSystem/JKernel/JKRAram/JKRAram.h"
+#include "global.h"
+
+asm void JKRAram::create(u32, u32, long, long, long) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D1FA4.s"
+}
+
+asm JKRAram::JKRAram(u32, u32, long) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D2040.s"
+}
+
+asm JKRAram::~JKRAram() {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D214C.s"
+}
+
+asm void* JKRAram::run(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D21DC.s"
+}
+
+asm void JKRAram::checkOkAddress(u8 *, u32, JKRAramBlock *, u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D2248.s"
+}
+
+asm void JKRAram::changeGroupIdIfNeed(u8 *, int) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D22DC.s"
+}
+
+asm void JKRAram::mainRamToAram(u8 *, u32, u32, JKRExpandSwitch, u32, JKRHeap *, int, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D233C.s"
+}
+
+asm void JKRAram::aramToMainRam(u32, u8 *, u32, JKRExpandSwitch, u32, JKRHeap *, int, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D25B4.s"
+}
+
+asm void JKRDecompressFromAramToMainRam(u32, void *, u32, u32, u32, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D2830.s"
+}
+
+asm void decompSZS_subroutine(u8 *, u8 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D29A0.s"
+}
+
+asm void firstSrcData(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D2C40.s"
+}
+
+asm void nextSrcData(u8 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D2CE4.s"
+}
+
+#if 0
+asm void __sinit_JKRAram_cpp {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D2DAC.s"
+}
+
+asm JSUList<12JKRAMCommand>::~JSUList<12JKRAMCommand>(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAram/asm/func_802D2DF0.s"
+}
+#endif

libs/JSystem/JKernel/JKRAramArchive.cpp

@@ -1 +1,61 @@
-// ok
+#include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h"
+#include "global.h"
+
+#include "JSystem/JKernel/JKRFile/JKRFile.h"
+
+asm JKRAramArchive::JKRAramArchive(long, JKRArchive::EMountDirection) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D70C0.s"
+}
+
+asm JKRAramArchive::~JKRAramArchive() {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D7168.s"
+}
+
+asm void JKRAramArchive::open(long) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D72A8.s"
+}
+
+asm void JKRAramArchive::fetchResource(JKRArchive::SDIFileEntry *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D75E0.s"
+}
+
+asm void JKRAramArchive::fetchResource(void *, u32, JKRArchive::SDIFileEntry *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D76F4.s"
+}
+
+asm void JKRAramArchive::getAramAddress_Entry(JKRArchive::SDIFileEntry *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D77F8.s"
+}
+
+asm void JKRAramArchive::getAramAddress(char const *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D781C.s"
+}
+
+asm void JKRAramArchive::fetchResource_subroutine(u32, u32, u8 *, u32, int) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D7858.s"
+}
+
+asm void JKRAramArchive::fetchResource_subroutine(u32, u32, JKRHeap *, int, u8 **) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D7914.s"
+}
+
+asm void JKRAramArchive::getExpandedResSize(void const *) const {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D7A64.s"
+}
+
+#if 0
+asm JKRFile::~JKRFile() {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramArchive/asm/func_802D7B90.s"
+}
+#endif

libs/JSystem/JKernel/JKRAramBlock.cpp

@@ -1 +1,23 @@
-// ok
+#include "JSystem/JKernel/JKRAramBlock/JKRAramBlock.h"
+#include "global.h"
+
+asm JKRAramBlock::JKRAramBlock(u32, u32, u32, u8, bool) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramBlock/asm/func_802D3304.s"
+}
+
+asm JKRAramBlock::~JKRAramBlock(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramBlock/asm/func_802D3378.s"
+}
+
+asm void JKRAramBlock::allocHead(u32, u8, JKRAramHeap *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramBlock/asm/func_802D3434.s"
+}
+
+asm void JKRAramBlock::allocTail(u32, u8, JKRAramHeap *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramBlock/asm/func_802D34D0.s"
+}
+

libs/JSystem/JKernel/JKRAramHeap.cpp

@@ -1 +1,54 @@
-// ok
+#include "JSystem/JKernel/JKRAramHeap/JKRAramHeap.h"
+#include "global.h"
+
+asm JKRAramHeap::JKRAramHeap(u32, u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D2E44.s"
+}
+
+asm JKRAramHeap::~JKRAramHeap(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D2F14.s"
+}
+
+asm void JKRAramHeap::alloc(u32, JKRAramHeap::EAllocMode) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D2FBC.s"
+}
+
+asm void JKRAramHeap::allocFromHead(u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D3034.s"
+}
+
+asm void JKRAramHeap::allocFromTail(u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D30BC.s"
+}
+
+asm void JKRAramHeap::getFreeSize(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D3134.s"
+}
+
+asm void JKRAramHeap::getTotalFreeSize(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D31AC.s"
+}
+
+asm void JKRAramHeap::dump(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D3218.s"
+}
+
+#if 0
+asm void __sinit_JKRAramHeap_cpp {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D326C.s"
+}
+
+asm JSUList<12JKRAramBlock>::~JSUList<12JKRAramBlock>(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramHeap/asm/func_802D32B0.s"
+}
+#endif

libs/JSystem/JKernel/JKRAramPiece.cpp

@@ -1 +1,54 @@
-// ok
+#include "JSystem/JKernel/JKRAramPiece/JKRAramPiece.h"
+#include "global.h"
+
+asm void JKRAramPiece::prepareCommand(int, u32, u32, u32, JKRAramBlock *, void (*)(u32)) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3574.s"
+}
+
+asm void JKRAramPiece::sendCommand(JKRAMCommand *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D35F4.s"
+}
+
+asm void JKRAramPiece::orderAsync(int, u32, u32, u32, JKRAramBlock *, void (*)(u32)) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s"
+}
+
+asm void JKRAramPiece::sync(JKRAMCommand *, int) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3770.s"
+}
+
+asm void JKRAramPiece::orderSync(int, u32, u32, u32, JKRAramBlock *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3838.s"
+}
+
+asm void JKRAramPiece::startDMA(JKRAMCommand *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D38CC.s"
+}
+
+asm void JKRAramPiece::doneDMA(u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3944.s"
+}
+
+asm JKRAMCommand::JKRAMCommand(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D39EC.s"
+}
+
+asm JKRAMCommand::~JKRAMCommand() {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3A5C.s"
+}
+
+#if 0
+asm void __sinit_JKRAramPiece_cpp {
+    nofralloc
+    #include "JSystem/JKernel/JKRAramPiece/asm/func_802D3B04.s"
+}
+#endif

libs/JSystem/JKernel/JKRAramStream.cpp

@@ -1 +1,57 @@
-// ok
+#include "JSystem/JKernel/JKRAramStream/JKRAramStream.h"
+#include "global.h"
+
+asm void JKRAramStream::create(long) {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D3B48.s"
+}
+
+asm JKRAramStream::JKRAramStream(long) {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D3BB8.s"
+}
+
+asm JKRAramStream::~JKRAramStream() {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D3C08.s"
+}
+
+asm void* JKRAramStream::run(void) {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D3C68.s"
+}
+
+asm void JKRAramStream::readFromAram(void) {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D3CD8.s"
+}
+
+asm void JKRAramStream::writeToAram(JKRAramStreamCommand*) {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s"
+}
+
+asm void JKRAramStream::write_StreamToAram_Async(JSUFileInputStream*, u32, u32, u32, u32*) {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D3ED0.s"
+}
+
+asm void JKRAramStream::sync(JKRAramStreamCommand*, int) {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D3FA0.s"
+}
+
+asm void JKRAramStream::setTransBuffer(u8*, u32, JKRHeap*) {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D4034.s"
+}
+
+asm JKRAramStreamCommand::JKRAramStreamCommand(void) {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D4088.s"
+}
+
+asm void JSURandomInputStream::getAvailable(void) const {
+    nofralloc
+#include "JSystem/JKernel/JKRAramStream/asm/func_802D4094.s"
+}

libs/JSystem/JKernel/JKRCompArchive.cpp

@@ -1 +1,43 @@
-// ok
+#include "JSystem/JKernel/JKRCompArchive/JKRCompArchive.h"
+#include "global.h"
+
+asm JKRCompArchive::JKRCompArchive(long, JKRArchive::EMountDirection) {
+    nofralloc
+    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D87D4.s"
+}
+
+asm JKRCompArchive::~JKRCompArchive(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D887C.s"
+}
+
+asm void JKRCompArchive::open(long) {
+    nofralloc
+    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D89BC.s"
+}
+
+asm void JKRCompArchive::fetchResource(JKRArchive::SDIFileEntry *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D8F40.s"
+}
+
+asm void JKRCompArchive::fetchResource(void *, u32, JKRArchive::SDIFileEntry *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D90C0.s"
+}
+
+asm void JKRCompArchive::removeResourceAll(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D9260.s"
+}
+
+asm void JKRCompArchive::removeResource(void *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D92F4.s"
+}
+
+asm void JKRCompArchive::getExpandedResSize(void const *) const {
+    nofralloc
+    #include "JSystem/JKernel/JKRCompArchive/asm/func_802D9360.s"
+}
+

libs/JSystem/JKernel/JKRDecomp.cpp

@@ -1 +1,78 @@
-// ok
+#include "JSystem/JKernel/JKRDecomp/JKRDecomp.h"
+#include "global.h"
+
+asm void JKRDecomp::create(long) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB680.s"
+}
+
+asm JKRDecomp::JKRDecomp(long) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB6E0.s"
+}
+
+asm JKRDecomp::~JKRDecomp(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB730.s"
+}
+
+asm void* JKRDecomp::run(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB790.s"
+}
+
+asm void JKRDecomp::prepareCommand(u8 *, u8 *, u32, u32, void (*)(u32)) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB858.s"
+}
+
+asm void JKRDecomp::sendCommand(JKRDecompCommand *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB8D0.s"
+}
+
+asm void JKRDecomp::orderAsync(u8 *, u8 *, u32, u32, void (*)(u32)) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB900.s"
+}
+
+asm void JKRDecomp::sync(JKRDecompCommand *, int) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB934.s"
+}
+
+asm void JKRDecomp::orderSync(u8 *, u8 *, u32, u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB988.s"
+}
+
+asm void JKRDecomp::decode(u8 *, u8 *, u32, u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DB9DC.s"
+}
+
+asm void JKRDecomp::decodeSZP(u8 *, u8 *, u32, u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DBA58.s"
+}
+
+asm void JKRDecomp::decodeSZS(u8 *, u8 *, u32, u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DBC14.s"
+}
+
+asm void JKRDecomp::checkCompressed(u8 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DBCF8.s"
+}
+
+asm JKRDecompCommand::JKRDecompCommand(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DBD70.s"
+}
+
+asm JKRDecompCommand::~JKRDecompCommand(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDecomp/asm/func_802DBDC0.s"
+}
+

libs/JSystem/JKernel/JKRDvdAramRipper.cpp

@@ -1 +1,80 @@
-// ok
+#include "JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h"
+#include "global.h"
+
+asm void JKRDvdAramRipper::loadToAram(long, u32, JKRExpandSwitch, u32, u32, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA874.s"
+}
+
+asm void JKRDvdAramRipper::loadToAram(JKRDvdFile *, u32, JKRExpandSwitch, u32, u32, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA918.s"
+}
+
+asm void JKRDvdAramRipper::loadToAram_Async(JKRDvdFile *, u32, JKRExpandSwitch, void (*)(u32), u32, u32, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DA9C0.s"
+}
+
+asm void JKRDvdAramRipper::callCommand_Async(JKRADCommand *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s"
+}
+
+asm JSUFileInputStream::~JSUFileInputStream(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DADD8.s"
+}
+
+asm void JKRDvdAramRipper::syncAram(JKRADCommand *, int) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAE48.s"
+}
+
+asm JKRADCommand::JKRADCommand(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAF1C.s"
+}
+
+asm JKRADCommand::~JKRADCommand() {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAF5C.s"
+}
+
+asm void JKRDecompressFromDVDToAram(JKRDvdFile *, u32, u32, u32, u32, u32, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAFE8.s"
+}
+
+asm void decompSZS_subroutine(u8 *, u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB160.s"
+}
+
+asm void firstSrcData(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB3E8.s"
+}
+
+asm void nextSrcData(u8 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB49C.s"
+}
+
+asm void dmaBufferFlush(u32) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB580.s"
+}
+
+#if 0
+asm void __sinit_JKRDvdAramRipper_cpp {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB5E8.s"
+}
+
+asm JSUList<12JKRADCommand>::~JSUList<12JKRADCommand>(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdAramRipper/asm/func_802DB62C.s"
+}
+#endif
+

libs/JSystem/JKernel/JKRDvdArchive.cpp

@@ -1 +1,43 @@
-// ok
+#include "JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h"
+#include "global.h"
+
+asm JKRDvdArchive::JKRDvdArchive(long, JKRArchive::EMountDirection) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D7BF0.s"
+}
+
+asm JKRDvdArchive::~JKRDvdArchive() {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D7C98.s"
+}
+
+asm void JKRDvdArchive::open(long) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D7DB4.s"
+}
+
+asm void JKRDvdArchive::fetchResource(JKRArchive::SDIFileEntry *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8050.s"
+}
+
+asm void JKRDvdArchive::fetchResource(void *, u32, JKRArchive::SDIFileEntry *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8168.s"
+}
+
+asm void JKRDvdArchive::fetchResource_subroutine(long, u32, u32, u8 *, u32, int, int) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D826C.s"
+}
+
+asm void JKRDvdArchive::fetchResource_subroutine(long, u32, u32, JKRHeap *, int, int, u8 **) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8474.s"
+}
+
+asm void JKRDvdArchive::getExpandedResSize(void const *) const {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdArchive/asm/func_802D8698.s"
+}
+

libs/JSystem/JKernel/JKRDvdFile.cpp

@@ -1,7 +1,6 @@
 #include "JSystem/JKernel/JKRDvdFile/JKRDvdFile.h"
 #include "global.h"
 
-// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9584.s"
 JKRDvdFile::JKRDvdFile() : JKRFile(), mDvdLink(this) {
     this->initiate();
 }
@@ -10,7 +9,7 @@ JKRDvdFile::JKRDvdFile() : JKRFile(), mDvdLink(this) {
 JKRDvdFile::JKRDvdFile(char const* param_1) : JKRFile(), mDvdLink(this) {
     this->initiate();
     bool result   = this->open(param_1);
-    this->mIsOpen = result;
+    this->mIsAvailable = result;
 }
 #else
 asm JKRDvdFile::JKRDvdFile(char const*) {
@@ -23,7 +22,7 @@ asm JKRDvdFile::JKRDvdFile(char const*) {
 JKRDvdFile::JKRDvdFile(long param_1) : JKRFile(), mDvdLink(this) {
     this->initiate();
     bool result   = this->open(param_1);
-    this->mIsOpen = result;
+    this->mIsAvailable = result;
 }
 #else
 asm JKRDvdFile::JKRDvdFile(long) {
@@ -32,10 +31,16 @@ asm JKRDvdFile::JKRDvdFile(long) {
 }
 #endif
 
-// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s"
+#ifndef NONMATCHING
 JKRDvdFile::~JKRDvdFile() {
     this->close();
 }
+#else
+asm JKRDvdFile::~JKRDvdFile() {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s"
+}
+#endif
 
 // #include "JSystem/JKernel/JKRDvdFile/asm/func_802D97E4.s"
 void JKRDvdFile::initiate(void) {
@@ -51,34 +56,34 @@ void JKRDvdFile::initiate(void) {
 
 // #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9850.s"
 bool JKRDvdFile::open(char const* param_1) {
-    if (!this->mIsOpen) {
-        this->mIsOpen = DVDOpen(param_1, this->mDvdCommandBlock);
-        if (this->mIsOpen) {
+    if (!this->mIsAvailable) {
+        this->mIsAvailable = DVDOpen(param_1, this->mDvdCommandBlock);
+        if (this->mIsAvailable) {
             lbl_8043436C.append(&this->mDvdLink);
             this->getStatus();
         }
     }
-    return this->mIsOpen;
+    return this->mIsAvailable;
 }
 
 // #include "JSystem/JKernel/JKRDvdFile/asm/func_802D98C4.s"
 bool JKRDvdFile::open(long param_1) {
-    if (!this->mIsOpen) {
-        this->mIsOpen = DVDFastOpen(param_1, this->mDvdCommandBlock);
-        if (this->mIsOpen) {
+    if (!this->mIsAvailable) {
+        this->mIsAvailable = DVDFastOpen(param_1, this->mDvdCommandBlock);
+        if (this->mIsAvailable) {
             lbl_8043436C.append(&this->mDvdLink);
             this->getStatus();
         }
     }
-    return this->mIsOpen;
+    return this->mIsAvailable;
 }
 
 // #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9938.s"
 void JKRDvdFile::close() {
-    if (this->mIsOpen) {
+    if (this->mIsAvailable) {
         s32 result = DVDClose(this->mDvdCommandBlock);
         if (result != 0) {
-            this->mIsOpen = false;
+            this->mIsAvailable = false;
             lbl_8043436C.remove(&this->mDvdLink);
         } else {
             const char* filename = lbl_8039D260;        // "JKRDvdFile.cpp"

libs/JSystem/JKernel/JKRDvdRipper.cpp

@@ -1 +1,54 @@
-// ok
+#include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
+#include "global.h"
+
+asm void JKRDvdRipper::loadToMainRAM(char const *, u8 *, JKRExpandSwitch, u32, JKRHeap *, JKRDvdRipper::EAllocDirection, u32, int *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802D9B98.s"
+}
+
+asm void JKRDvdRipper::loadToMainRAM(long, u8 *, JKRExpandSwitch, u32, JKRHeap *, JKRDvdRipper::EAllocDirection, u32, int *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802D9C54.s"
+}
+
+asm void JKRDvdRipper::loadToMainRAM(JKRDvdFile *, u8 *, JKRExpandSwitch, u32, JKRHeap *, JKRDvdRipper::EAllocDirection, u32, int *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s"
+}
+
+asm void JKRDecompressFromDVD(JKRDvdFile *, void *, u32, u32, u32, u32, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA1E4.s"
+}
+
+asm void decompSZS_subroutine(u8 *, u8 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA35C.s"
+}
+
+asm void firstSrcData(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA60C.s"
+}
+
+asm void nextSrcData(u8 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA6D8.s"
+}
+
+asm void JKRDvdRipper::isErrorRetry(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA7D4.s"
+}
+
+#if 0
+asm void __sinit_JKRDvdRipper_cpp {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA7DC.s"
+}
+
+asm JSUList<12JKRDMCommand>::~JSUList<12JKRDMCommand>(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRDvdRipper/asm/func_802DA820.s"
+}
+#endif

libs/JSystem/JKernel/JKRFileLoader.cpp

@@ -41,13 +41,7 @@ asm JKRFileLoader* JKRFileLoader::findVolume(char const **) {
     #include "JSystem/JKernel/JKRFileLoader/asm/func_802D4438.s"
 }
 
-#if 0
-// JSystem\JKernel\JKRFileLoader\asm\func_802D44C4.s:18: illegal object reference in constant expression (lbl_804508C0)
-// JSystem\JKernel\JKRFileLoader\asm\func_802D44C4.s:20: illegal object reference in constant expression (lbl_804508C0)
-// JSystem\JKernel\JKRFileLoader\asm\func_802D44C4.s:57: illegal object reference in constant expression (lbl_804508C0)
-asm void JKRFileLoader::fetchVolumeName(char *, long, char const *) {
+asm char* JKRFileLoader::fetchVolumeName(char *, long, char const *) {
     nofralloc
     #include "JSystem/JKernel/JKRFileLoader/asm/func_802D44C4.s"
-}
-
-#endif
+}

libs/JSystem/JKernel/JKRMemArchive.cpp

@@ -1 +1,58 @@
-// ok
+#include "JSystem/JKernel/JKRMemArchive/JKRMemArchive.h"
+#include "global.h"
+
+asm JKRMemArchive::JKRMemArchive(long, JKRArchive::EMountDirection) {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D69B8.s"
+}
+
+asm JKRMemArchive::JKRMemArchive(void *, u32, JKRMemBreakFlag) {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6A6C.s"
+}
+
+asm JKRMemArchive::~JKRMemArchive() {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6B24.s"
+}
+
+asm void JKRMemArchive::open(long, JKRArchive::EMountDirection) {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6BCC.s"
+}
+
+asm void JKRMemArchive::open(void *, u32, JKRMemBreakFlag) {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6D30.s"
+}
+
+asm void JKRMemArchive::fetchResource(JKRArchive::SDIFileEntry *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6DDC.s"
+}
+
+asm void JKRMemArchive::fetchResource(void *, u32, JKRArchive::SDIFileEntry *, u32 *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6E10.s"
+}
+
+asm void JKRMemArchive::removeResourceAll(void) {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6ED0.s"
+}
+
+asm void JKRMemArchive::removeResource(void *) {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6F20.s"
+}
+
+asm void JKRMemArchive::fetchResource_subroutine(u8 *, u32, u8 *, u32, int) {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D6F5C.s"
+}
+
+asm void JKRMemArchive::getExpandedResSize(void const *) const {
+    nofralloc
+    #include "JSystem/JKernel/JKRMemArchive/asm/func_802D7030.s"
+}
+