mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-26 08:24:31 -04:00
Merge remote-tracking branch 'decomp/main' into compile
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
#include "JSystem/JKernel/JKRDecomp.h"
|
||||
#include "JSystem/JKernel/JKRExpHeap.h"
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include "dolphin/ar.h"
|
||||
#include <dolphin/ar.h>
|
||||
#include <dolphin/os.h>
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "JSystem/JKernel/JKRAram.h"
|
||||
#include "JSystem/JKernel/JKRDecomp.h"
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include "dolphin/os.h"
|
||||
#include <dolphin/os.h>
|
||||
|
||||
JKRAMCommand* JKRAramPiece::prepareCommand(int direction, u32 src, u32 dst, u32 length,
|
||||
JKRAramBlock* block,
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "JSystem/JSupport/JSUFileStream.h"
|
||||
#include <dolphin/os.h>
|
||||
#include <dolphin/os.h>
|
||||
#include "dolphin/vi.h"
|
||||
#include <dolphin/vi.h>
|
||||
#include "global.h"
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "JSystem/JUtility/JUTException.h"
|
||||
#include <string>
|
||||
#include <dolphin/os.h>
|
||||
#include "dolphin/vi.h"
|
||||
#include <dolphin/vi.h>
|
||||
#include <stdint.h>
|
||||
|
||||
static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "JSystem/JSystem.h" // IWYU pragma: keep
|
||||
|
||||
#include "JSystem/JKernel/JKRFile.h"
|
||||
#include "dolphin/vi.h"
|
||||
#include <dolphin/vi.h>
|
||||
|
||||
void JKRFile::read(void* data, s32 length, s32 offset) {
|
||||
JUT_ASSERT(32, ( length & 0x1f ) == 0);
|
||||
|
||||
Reference in New Issue
Block a user