mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-29 23:51:49 -04:00
Merge remote-tracking branch 'decomp/main' into compile
This commit is contained in:
@@ -8,14 +8,14 @@
|
||||
#include "JSystem/JUtility/JUTGamePad.h"
|
||||
#include "JSystem/JUtility/JUTXfb.h"
|
||||
#include "SSystem/SComponent/c_API_controller_pad.h"
|
||||
#include "dolphin/gx.h"
|
||||
#include <dolphin/gx.h>
|
||||
#include "m_Do/m_Do_audio.h"
|
||||
#include "m_Do/m_Do_DVDError.h"
|
||||
#include "m_Do/m_Do_ext.h"
|
||||
#include "m_Do/m_Do_MemCard.h"
|
||||
|
||||
#if !PLATFORM_GCN
|
||||
#include "revolution/os.h"
|
||||
#include <revolution/os.h>
|
||||
#endif
|
||||
|
||||
static void my_OSCancelAlarmAll() {}
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "JSystem/J3DGraphBase/J3DMatBlock.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "dolphin/types.h"
|
||||
#include <dolphin/types.h>
|
||||
|
||||
u32 mDoLib_setResTimgObj(ResTIMG const* i_img, GXTexObj* o_texObj, u32 tlut_name,
|
||||
GXTlutObj* o_tlutObj) {
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
#include "DynamicLink.h"
|
||||
|
||||
#if !PLATFORM_GCN
|
||||
#include "revolution/sc.h"
|
||||
#include "revolution/wpad.h"
|
||||
#include <revolution/sc.h>
|
||||
#include <revolution/wpad.h>
|
||||
#endif
|
||||
|
||||
#if PLATFORM_GCN
|
||||
|
||||
Reference in New Issue
Block a user