merge cuyler's PR

This commit is contained in:
Prakxo
2023-03-13 07:15:03 +00:00
parent cf13cc2139
commit 3dd5dbcf59
48 changed files with 3102 additions and 215 deletions
+43
View File
@@ -0,0 +1,43 @@
#include "JSystem/JKernel/JKRFile.h"
#include "dolphin/vi.h"
#ifdef JSYSTEM_DEBUG
#include "JSystem/JUtility/JUTAssertion.h"
#endif
/* Empty space for aligning line numbers */
/**
* Nonmatched function. Unused in Animal Crossing.
*/
void JKRFile::read(void* data, s32 length, s32 ofs) {
#ifdef JSYSTEM_DEBUG
if (!JKR_ISALIGNED(length, 32)) {
JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, __LINE__, "( length & 0x1f ) == 0");
}
#endif
while (true) {
if (this->readData(data, length, ofs) == length) {
return;
}
VIWaitForRetrace();
}
}