diff --git a/configure.py b/configure.py index 914bafa047..210dc3f14d 100755 --- a/configure.py +++ b/configure.py @@ -272,21 +272,29 @@ cflags_base = [ f"-i build/{config.version}/include", f"-i assets/{config.version}", "-i src", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/Runtime/Inc", - "-i src/PowerPC_EABI_Support/MetroTRK", - "-i include/dolphin", + "-i libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include", + "-i libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include", + "-i libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include", + "-i libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include", + "-i libs/PowerPC_EABI_Support/Runtime/Inc", + "-i libs/PowerPC_EABI_Support/MetroTRK", + "-i libs/JSystem/include", f"-DVERSION={version_num}", "-D__GEKKO__", ] if config.version in WII_VERSIONS or config.version in SHIELD_VERSIONS: - cflags_base.extend(["-enc SJIS"]) + cflags_base.extend([ + "-i libs/revolution/include", + "-i libs/revolution/include/revolution", # for types.h includes + "-enc SJIS", + ]) else: - cflags_base.extend(["-multibyte"]) + cflags_base.extend([ + "-i libs/dolphin/include", + "-i libs/dolphin/include/dolphin", # for types.h includes + "-multibyte", + ]) USE_REVOLUTION_SDK_VERSIONS = [ "RZDE01_00", # Wii USA Rev 0 @@ -351,7 +359,7 @@ cflags_trk = [ # Dolphin library flags cflags_dolphin = [ *cflags_base, - "-ir src/dolphin", + "-ir libs/dolphin/src", "-fp_contract off", "-char unsigned", "-sym on", @@ -361,12 +369,11 @@ cflags_dolphin = [ # Revolution library flags cflags_revolution_base = [ *cflags_base, - "-ir src/revolution", + "-ir libs/revolution/src", "-fp_contract off", "-sym on", "-inline auto", "-ipa file", - "-i include/revolution", "-D__REVOLUTION_SDK__", ] @@ -466,6 +473,8 @@ else: def DolphinLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]: return { "lib": lib_name, + "src_dir": "libs/dolphin/src", + "strip_prefix": "dolphin/", "mw_version": "GC/1.2.5n", "cflags": cflags_dolphin, "progress_category": "sdk", @@ -476,6 +485,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict if config.version == "ShieldD": return { "lib": lib_name, + "src_dir": "libs/revolution/src", + "strip_prefix": "revolution/", "mw_version": "Wii/1.0", "cflags": [*cflags_revolution_debug, "-DSDK_AUG2010", *extra_cflags], "progress_category": "sdk", @@ -484,6 +495,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict elif config.version == "Shield": return { "lib": lib_name, + "src_dir": "libs/revolution/src", + "strip_prefix": "revolution/", "mw_version": "Wii/1.0", "cflags": [*cflags_revolution_retail, "-DSDK_AUG2010", *extra_cflags], "progress_category": "sdk", @@ -492,6 +505,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict elif config.version == "RZDE01_00": return { "lib": lib_name, + "src_dir": "libs/revolution/src", + "strip_prefix": "revolution/", "mw_version": "GC/3.0a3", "cflags": [*cflags_revolution_retail, "-DSDK_SEP2006", "-DNW4HBM_DEBUG", *extra_cflags], "progress_category": "sdk", @@ -500,6 +515,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict else: return { "lib": lib_name, + "src_dir": "libs/revolution/src", + "strip_prefix": "revolution/", "mw_version": "GC/3.0a3", "cflags": [*cflags_revolution_retail, "-DSDK_SEP2006", *extra_cflags], "progress_category": "sdk", @@ -525,6 +542,8 @@ def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[]) -> Dict[st def JSystemLib(lib_name: str, objects: List[Object], progress_category: str="third_party") -> Dict[str, Any]: return { "lib": lib_name, + "src_dir": "libs/JSystem/src", + "strip_prefix": "JSystem/", "mw_version": MWVersion(config.version), "cflags": [*cflags_jsystem], "progress_category": progress_category, @@ -560,17 +579,20 @@ config.warn_missing_config = True config.warn_missing_source = False config.precompiled_headers = [ { - "source": "d/dolzel.pch", + "source": "include/d/dolzel.pch", + "output": "d/dolzel.mch", "mw_version": MWVersion(config.version), "cflags": ["-lang=c++", *cflags_dolzel_framework], }, { - "source": "d/dolzel_rel.pch", + "source": "include/d/dolzel_rel.pch", + "output": "d/dolzel_rel.mch", "mw_version": MWVersion(config.version), "cflags": ["-lang=c++", *cflags_dolzel_rel], }, { - "source": "JSystem/JSystem.pch", + "source": "libs/JSystem/include/JSystem/JSystem.pch", + "output": "JSystem/JSystem.mch", "mw_version": MWVersion(config.version), "cflags": ["-lang=c++", *cflags_framework], }, @@ -581,7 +603,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ Object(MatchingFor(ALL_GCN), "m_Do/m_Do_main.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_printf.cpp"), @@ -608,7 +629,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "game", - "host": True, "objects": [ Object(MatchingFor(ALL_GCN), "c/c_damagereaction.cpp"), Object(MatchingFor(ALL_GCN), "c/c_dylink.cpp"), @@ -619,7 +639,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ # f_ap Object(MatchingFor(ALL_GCN), "f_ap/f_ap_game.cpp"), @@ -688,7 +707,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "game", - "host": True, "objects": [ Object(NonMatching, "d/d_home_button.cpp"), Object(NonMatching, "d/d_cursor_mng.cpp"), @@ -876,7 +894,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ Object(MatchingFor(ALL_GCN), "DynamicLink.cpp"), ], @@ -886,7 +903,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ Object(NonMatching, "CaptureScreen.cpp"), ], @@ -896,7 +912,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "third_party", - "host": True, "objects": [ Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_malloc.cpp"), Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_API.cpp"), @@ -1221,7 +1236,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2Calc.cpp"), Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2AudioArcLoader.cpp"), @@ -1257,7 +1271,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ Object(Matching, "Z2AudioCS/SpkSpeakerCtrl.cpp"), Object(Equivalent, "Z2AudioCS/SpkSystem.cpp"), @@ -1271,6 +1284,8 @@ config.libs = [ }, { "lib": "gf", + "src_dir": "libs/dolphin/src", + "strip_prefix": "dolphin/", "mw_version": MWVersion(config.version), "cflags": [*cflags_noopt, "-O3"], "progress_category": "sdk", @@ -1503,8 +1518,10 @@ config.libs = [ ), { "lib": "exi", + "src_dir": "libs/dolphin/src", + "strip_prefix": "dolphin/", "mw_version": "GC/1.2.5n", - "cflags": [*cflags_noopt, "-ir src/dolphin"], + "cflags": [*cflags_noopt, "-ir libs/dolphin/src"], "progress_category": "sdk", "objects": [ Object(Matching, "dolphin/exi/EXIBios.c", extra_cflags=["-O3,p"]), @@ -1976,10 +1993,10 @@ config.libs = [ ), { "lib": "Runtime.PPCEABI.H", + "src_dir": "libs", "mw_version": MWVersion(config.version), "cflags": cflags_runtime, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/Runtime/Src/__mem.c"), Object(MatchingFor(ALL_GCN, "Shield"), "PowerPC_EABI_Support/Runtime/Src/__va_arg.c"), @@ -1995,10 +2012,10 @@ config.libs = [ }, { "lib": "MSL_C", + "src_dir": "libs", "mw_version": MWVersion(config.version), "cflags": cflags_runtime, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c"), @@ -2076,10 +2093,10 @@ config.libs = [ }, { "lib": "TRK_MINNOW_DOLPHIN", + "src_dir": "libs", "mw_version": MWVersion(config.version), "cflags": cflags_trk, "progress_category": "sdk", - "host": False, "objects": [ # debugger Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c"), @@ -2123,7 +2140,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_dolphin, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "amcstubs/AmcExi2Stubs.c"), ], @@ -2133,7 +2149,6 @@ config.libs = [ "mw_version": "GC/1.2.5n", "cflags": cflags_runtime, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "odemuexi2/DebuggerDriver.c"), ], @@ -2143,7 +2158,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_dolphin, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "odenotstub/odenotstub.c"), ], @@ -2154,7 +2168,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "sdk", - "host": False, "objects": [ Object(NonMatching, "NdevExi2A/DebuggerDriver.c"), Object(NonMatching, "NdevExi2A/exi2.c"), @@ -2165,7 +2178,6 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "third_party", - "host": False, "objects": [ Object(MatchingFor("Shield"), "lingcod/LingcodPatch.c"), ], @@ -2177,13 +2189,13 @@ config.libs = [ "mw_version": MWVersion(config.version), "cflags": cflags_rel, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "REL/executor.c"), Object( MatchingFor(ALL_GCN), "REL/global_destructor_chain.c", - source="PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c", + src_dir="libs/PowerPC_EABI_Support/Runtime/Src", + source="global_destructor_chain.c", ), ], }, diff --git a/include/DynamicLink.h b/include/DynamicLink.h index f59cab5b3e..7f6d8568eb 100644 --- a/include/DynamicLink.h +++ b/include/DynamicLink.h @@ -1,7 +1,7 @@ #ifndef DYNAMICLINK_H #define DYNAMICLINK_H -#include +#include #include "JSystem/JKernel/JKRHeap.h" #include "global.h" diff --git a/include/NdevExi2A/DebuggerDriver.h b/include/NdevExi2A/DebuggerDriver.h index 44cf7daad7..53f3c8ff83 100644 --- a/include/NdevExi2A/DebuggerDriver.h +++ b/include/NdevExi2A/DebuggerDriver.h @@ -1,7 +1,7 @@ #ifndef NDEVEXI2A_DEBUGGERDRIVER_H #define NDEVEXI2A_DEBUGGERDRIVER_H -#include +#include #include "types.h" typedef void (*MtrCallback)(s32, OSContext*); diff --git a/include/SSystem/SComponent/c_API_controller_pad.h b/include/SSystem/SComponent/c_API_controller_pad.h index 36d8fa5a1f..d45b483daa 100644 --- a/include/SSystem/SComponent/c_API_controller_pad.h +++ b/include/SSystem/SComponent/c_API_controller_pad.h @@ -1,7 +1,7 @@ #ifndef C_API_CONTROLLER_PAD_ #define C_API_CONTROLLER_PAD_ -#include +#include struct interface_of_controller_pad { /* 0x00 */ f32 mMainStickPosX; @@ -35,4 +35,42 @@ struct interface_of_controller_pad { void cAPICPad_recalibrate(void); u32 cAPICPad_ANY_BUTTON(u32 param_0); +#if PLATFORM_WII +u32 cAPICPad_BUTTON(u32 i_padNo); +u32 cAPICPad_Z_BUTTON(u32 i_padNo); +u32 cAPICPad_R_BUTTON(u32 i_padNo); +u32 cAPICPad_L_BUTTON(u32 i_padNo); +u32 cAPICPad_A_BUTTON(u32 i_padNo); +u32 cAPICPad_B_BUTTON(u32 i_padNo); +u32 cAPICPad_X_BUTTON(u32 i_padNo); +u32 cAPICPad_Y_BUTTON(u32 i_padNo); + +u32 cAPICPad_TRIGGER(u32 i_padNo); +u32 cAPICPad_Z_TRIGGER(u32 i_padNo); +u32 cAPICPad_R_TRIGGER(u32 i_padNo); +u32 cAPICPad_UP_TRIGGER(u32 i_padNo); +u32 cAPICPad_DOWN_TRIGGER(u32 i_padNo); +u32 cAPICPad_LEFT_TRIGGER(u32 i_padNo); +u32 cAPICPad_RIGHT_TRIGGER(u32 i_padNo); +u32 cAPICPad_L_TRIGGER(u32 i_padNo); +u32 cAPICPad_A_TRIGGER(u32 i_padNo); +u32 cAPICPad_B_TRIGGER(u32 i_padNo); +u32 cAPICPad_X_TRIGGER(u32 i_padNo); +u32 cAPICPad_Y_TRIGGER(u32 i_padNo); +u32 cAPICPad_START_TRIGGER(u32 i_padNo); + +f32 cAPICPad_X_STICK(u32 i_padNo); +f32 cAPICPad_X_STICK_3D(u32 i_padNo); +f32 cAPICPad_Y_STICK(u32 i_padNo); +f32 cAPICPad_VALUE_STICK(u32 i_padNo); +s16 cAPICPad_ANGLE_STICK(u32 i_padNo); +s16 cAPICPad_ANGLE_STICK_3D(u32 i_padNo); +f32 cAPICPad_X_SUBSTICK(u32 i_padNo); +f32 cAPICPad_Y_SUBSTICK(u32 i_padNo); +f32 cAPICPad_VALUE_SUBSTICK(u32 i_padNo); +s16 cAPICPad_ANGLE_SUBSTICK(u32 i_padNo); +f32 cAPICPad_L_ANALOG(u32 i_padNo); +f32 cAPICPad_R_ANALOG(u32 i_padNo); +#endif + #endif diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index 5390dc5ecd..51c7eb6015 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -1,7 +1,7 @@ #ifndef C_BG_S_CHK_H #define C_BG_S_CHK_H -#include +#include #include "f_pc/f_pc_base.h" #include "SSystem/SComponent/c_bg_s_grp_pass_chk.h" #include "SSystem/SComponent/c_bg_s_poly_pass_chk.h" diff --git a/include/SSystem/SComponent/c_bg_s_poly_info.h b/include/SSystem/SComponent/c_bg_s_poly_info.h index 214118476c..179a0565ec 100644 --- a/include/SSystem/SComponent/c_bg_s_poly_info.h +++ b/include/SSystem/SComponent/c_bg_s_poly_info.h @@ -1,7 +1,7 @@ #ifndef C_BG_S_POLY_INFO_H #define C_BG_S_POLY_INFO_H -#include +#include #include "f_pc/f_pc_manager.h" class cBgS_PolyInfo { diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h index 85233888a6..f1d5e291b4 100644 --- a/include/SSystem/SComponent/c_bg_w.h +++ b/include/SSystem/SComponent/c_bg_w.h @@ -1,7 +1,7 @@ #ifndef C_BG_W_H #define C_BG_W_H -#include +#include class cBgW_BgId { private: diff --git a/include/SSystem/SComponent/c_counter.h b/include/SSystem/SComponent/c_counter.h index 124d623fd0..864554b1a7 100644 --- a/include/SSystem/SComponent/c_counter.h +++ b/include/SSystem/SComponent/c_counter.h @@ -1,7 +1,7 @@ #ifndef C_COUNTER_H #define C_COUNTER_H -#include +#include struct counter_class { u32 mCounter0; diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index 16488c5a12..e3654846e0 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -2,7 +2,7 @@ #define C_LIB_H_ #include "SSystem/SComponent/c_xyz.h" -#include +#include #include "SSystem/SComponent/c_math.h" inline bool cLib_IsZero(f32 value) { diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index 58f0e28753..94762d5a29 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -2,7 +2,7 @@ #define C_M3D_H_ #include -#include +#include class cM3dGAab; class cM3dGCps; diff --git a/include/SSystem/SComponent/c_m3d_g_cir.h b/include/SSystem/SComponent/c_m3d_g_cir.h index 8ad96fa2a6..eccd553c86 100644 --- a/include/SSystem/SComponent/c_m3d_g_cir.h +++ b/include/SSystem/SComponent/c_m3d_g_cir.h @@ -1,7 +1,7 @@ #ifndef C_M3D_G_CIR_H #define C_M3D_G_CIR_H -#include +#include class cM2dGCir { public: diff --git a/include/SSystem/SComponent/c_malloc.h b/include/SSystem/SComponent/c_malloc.h index bbcff9ae68..95b2d8f298 100644 --- a/include/SSystem/SComponent/c_malloc.h +++ b/include/SSystem/SComponent/c_malloc.h @@ -1,7 +1,7 @@ #ifndef C_MALLOC_H #define C_MALLOC_H -#include +#include class JKRHeap; diff --git a/include/SSystem/SComponent/c_phase.h b/include/SSystem/SComponent/c_phase.h index 8b88d2f835..81386b613f 100644 --- a/include/SSystem/SComponent/c_phase.h +++ b/include/SSystem/SComponent/c_phase.h @@ -1,7 +1,7 @@ #ifndef C_PHASE_H #define C_PHASE_H -#include +#include typedef int (*cPhs__Handler)(void*); diff --git a/include/SSystem/SComponent/c_request.h b/include/SSystem/SComponent/c_request.h index 22bca520e8..b31c0e34aa 100644 --- a/include/SSystem/SComponent/c_request.h +++ b/include/SSystem/SComponent/c_request.h @@ -1,7 +1,7 @@ #ifndef C_REQUEST_H #define C_REQUEST_H -#include +#include struct request_base_class { u8 flag0 : 1; diff --git a/include/SSystem/SComponent/c_sxyz.h b/include/SSystem/SComponent/c_sxyz.h index 0a2a9df11d..bfaa035de9 100644 --- a/include/SSystem/SComponent/c_sxyz.h +++ b/include/SSystem/SComponent/c_sxyz.h @@ -1,7 +1,7 @@ #ifndef C_SXYZ_H #define C_SXYZ_H -#include +#include struct SVec { s16 x, y, z; diff --git a/include/SSystem/SComponent/c_tag.h b/include/SSystem/SComponent/c_tag.h index 9e9b4a894e..08aec1b867 100644 --- a/include/SSystem/SComponent/c_tag.h +++ b/include/SSystem/SComponent/c_tag.h @@ -2,7 +2,7 @@ #define C_TAG_H #include "SSystem/SComponent/c_node.h" -#include +#include typedef struct node_list_class node_list_class; typedef struct node_lists_tree_class node_lists_tree_class; diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 46f2527065..0bea35efe3 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -1,7 +1,7 @@ #ifndef C_XYZ_H #define C_XYZ_H -#include +#include #include #ifdef _MSVC_LANG diff --git a/include/SSystem/SStandard/s_basic.h b/include/SSystem/SStandard/s_basic.h index d173a0bc77..c689c7b2aa 100644 --- a/include/SSystem/SStandard/s_basic.h +++ b/include/SSystem/SStandard/s_basic.h @@ -1,7 +1,7 @@ #ifndef S_BASIC_H #define S_BASIC_H -#include +#include void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue); void sBs_ClearArea(void* pPtr, u32 pNumBytes); diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.h index 64312808a0..91158c4152 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_DISPATCH_H #define METROTRK_PORTABLE_DISPATCH_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h index 924fb5ee29..1463655447 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_MEM_TRK_H #define METROTRK_PORTABLE_MEM_TRK_H -#include +#include void* TRK_memset(void* dest, int val, size_t count); void* TRK_memcpy(void* dest, const void* src, size_t count); diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h index debc035386..76d839ff17 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_MSG_H #define METROTRK_PORTABLE_MSG_H -#include +#include typedef struct _TRK_Msg { u8 _00[8]; diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h index fe34214e6e..3597aa6d88 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_MUTEX_TRK_H #define METROTRK_PORTABLE_MUTEX_TRK_H -#include +#include u8 TRKReleaseMutex(); u8 TRKAcquireMutex(); diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h index 93035ade09..7865b7ac11 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_DDH_STUBS_H #define OS_DOLPHIN_DDH_STUBS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h index 4179c1754d..f5d1416531 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_GDEV_STUBS_H #define OS_DOLPHIN_GDEV_STUBS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h index 1c64630181..20e8c85831 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_UDP_STUBS_H #define OS_DOLPHIN_UDP_STUBS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h index f205a32590..ca0310a953 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_DOLPHIN_TRK_GLUE_H #define OS_DOLPHIN_DOLPHIN_TRK_GLUE_H -#include +#include #include "trk.h" #ifdef __cplusplus diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h index 473eca26f5..6c105b82d6 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_TARGET_OPTIONS_H #define OS_DOLPHIN_TARGET_OPTIONS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h index 7bccc876ee..181c262796 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h @@ -1,6 +1,6 @@ #ifndef OS_DOLPHIN_USR_PUT_H #define OS_DOLPHIN_USR_PUT_H -#include +#include #endif /* OS_DOLPHIN_USR_PUT_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h b/include/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h index 3fc0ee3cb8..916a86f200 100644 --- a/include/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h +++ b/include/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h @@ -1,7 +1,7 @@ #ifndef PPC_EXPORT_TARGSUPP_H #define PPC_EXPORT_TARGSUPP_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h b/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h index 5bb30fbde1..0e4e4c0909 100644 --- a/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h +++ b/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h @@ -1,7 +1,7 @@ #ifndef UTILS_COMMON_CIRCLEBUFFER_H #define UTILS_COMMON_CIRCLEBUFFER_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h b/include/TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h index 7c38df3192..47d7475537 100644 --- a/include/TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h +++ b/include/TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h @@ -1,7 +1,7 @@ #ifndef UTILS_COMMON_MWTRACE_H #define UTILS_COMMON_MWTRACE_H -#include +#include void MWTRACE(u8, char*, ...); diff --git a/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h b/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h index bf2586b403..bcfe09eddf 100644 --- a/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h +++ b/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h @@ -1,7 +1,7 @@ #ifndef UTILS_GC_MWCRITICALSECTION_GC_H #define UTILS_GC_MWCRITICALSECTION_GC_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/Z2AudioCS/Z2AudioCS.h b/include/Z2AudioCS/Z2AudioCS.h index b0788de786..7d13accabc 100644 --- a/include/Z2AudioCS/Z2AudioCS.h +++ b/include/Z2AudioCS/Z2AudioCS.h @@ -3,7 +3,7 @@ #include "Z2AudioCS/SpkTable.h" #include "Z2AudioCS/SpkSound.h" -#include +#include class JKRHeap; class JKRArchive; diff --git a/include/Z2AudioLib/Z2Calc.h b/include/Z2AudioLib/Z2Calc.h index db6e0561c8..e8eee29571 100644 --- a/include/Z2AudioLib/Z2Calc.h +++ b/include/Z2AudioLib/Z2Calc.h @@ -1,7 +1,7 @@ #ifndef Z2CALC_H #define Z2CALC_H -#include +#include #include "m_Do/m_Do_lib.h" namespace Z2Calc { diff --git a/include/Z2AudioLib/Z2Param.h b/include/Z2AudioLib/Z2Param.h index c0d2bf53c7..e6c8aac993 100644 --- a/include/Z2AudioLib/Z2Param.h +++ b/include/Z2AudioLib/Z2Param.h @@ -1,7 +1,7 @@ #ifndef Z2PARAM_H #define Z2PARAM_H -#include +#include struct Z2Param { static f32 DISTANCE_MAX; diff --git a/include/Z2AudioLib/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr.h index 762772c746..88bd393361 100644 --- a/include/Z2AudioLib/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr.h @@ -3,7 +3,7 @@ #include #include "JSystem/JAudio2/JASGadget.h" -#include +#include struct Z2StatusMgr : public JASGlobalInstance { Z2StatusMgr(); diff --git a/include/d/actor/d_a_balloon_2D.h b/include/d/actor/d_a_balloon_2D.h index cf8a24116b..f2dfa5e99f 100644 --- a/include/d/actor/d_a_balloon_2D.h +++ b/include/d/actor/d_a_balloon_2D.h @@ -1,7 +1,7 @@ #ifndef D_A_BALLOON_2D_H #define D_A_BALLOON_2D_H -#include +#include #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_phase.h" #include "d/d_drawlist.h" diff --git a/include/d/actor/d_a_door_bossL1.h b/include/d/actor/d_a_door_bossL1.h index 81d9f5b844..397b7d90ce 100644 --- a/include/d/actor/d_a_door_bossL1.h +++ b/include/d/actor/d_a_door_bossL1.h @@ -1,7 +1,7 @@ #ifndef D_A_DOOR_BOSSL1_H #define D_A_DOOR_BOSSL1_H -#include +#include #include "f_op/f_op_actor.h" #include "d/d_bg_w.h" #include "d/d_bg_s_acch.h" diff --git a/include/d/actor/d_a_door_bossL5.h b/include/d/actor/d_a_door_bossL5.h index 11e7bf7843..832f575ac1 100644 --- a/include/d/actor/d_a_door_bossL5.h +++ b/include/d/actor/d_a_door_bossL5.h @@ -1,7 +1,7 @@ #ifndef D_A_DOOR_BOSSL5_H #define D_A_DOOR_BOSSL5_H -#include +#include #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_phase.h" #include "d/d_bg_w.h" diff --git a/include/d/actor/d_a_door_mbossL1.h b/include/d/actor/d_a_door_mbossL1.h index ce2be23aa0..fc49529018 100644 --- a/include/d/actor/d_a_door_mbossL1.h +++ b/include/d/actor/d_a_door_mbossL1.h @@ -1,7 +1,7 @@ #ifndef D_A_DOOR_MBOSSL1_H #define D_A_DOOR_MBOSSL1_H -#include +#include #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_phase.h" #include "d/d_bg_w.h" diff --git a/include/d/actor/d_a_door_shutter.h b/include/d/actor/d_a_door_shutter.h index 5df7c2f4af..1b32c7d357 100644 --- a/include/d/actor/d_a_door_shutter.h +++ b/include/d/actor/d_a_door_shutter.h @@ -1,7 +1,7 @@ #ifndef D_A_DOOR_SHUTTER_H #define D_A_DOOR_SHUTTER_H -#include +#include #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_phase.h" #include "d/d_bg_w.h" diff --git a/include/d/actor/d_a_e_db_leaf.h b/include/d/actor/d_a_e_db_leaf.h index 2a19d4b01b..f783ea3596 100644 --- a/include/d/actor/d_a_e_db_leaf.h +++ b/include/d/actor/d_a_e_db_leaf.h @@ -2,7 +2,7 @@ #define D_A_E_DB_LEAF_H #include "d/d_com_inf_game.h" -#include +#include /** * @ingroup actors-enemies diff --git a/include/d/actor/d_a_e_oct_bg.h b/include/d/actor/d_a_e_oct_bg.h index 7c54d6e84b..cd5b6b27cd 100644 --- a/include/d/actor/d_a_e_oct_bg.h +++ b/include/d/actor/d_a_e_oct_bg.h @@ -1,7 +1,7 @@ #ifndef D_A_E_OCT_BG_H #define D_A_E_OCT_BG_H -#include +#include #include "f_op/f_op_actor.h" #include "d/d_bg_s_acch.h" #include "Z2AudioLib/Z2Creature.h" diff --git a/include/d/actor/d_a_fr.h b/include/d/actor/d_a_fr.h index cf44361b89..bb8da171a6 100644 --- a/include/d/actor/d_a_fr.h +++ b/include/d/actor/d_a_fr.h @@ -4,7 +4,7 @@ #include "d/d_bg_s_acch.h" #include "d/d_cc_d.h" #include "d/d_msg_flow.h" -#include +#include #include "SSystem/SComponent/c_phase.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/d/actor/d_a_grass.h b/include/d/actor/d_a_grass.h index 549a067eba..4b07bea1d5 100644 --- a/include/d/actor/d_a_grass.h +++ b/include/d/actor/d_a_grass.h @@ -44,6 +44,8 @@ public: static daGrass_c* m_myObj; static dGrass_packet_c* m_grass; static dFlower_packet_c* m_flower; + + /* 0x568 */ u8 unk_0x568[0x570 - 0x568]; }; namespace daGrass_prm { diff --git a/include/d/actor/d_a_kago.h b/include/d/actor/d_a_kago.h index a84d049ad2..90de3b74bf 100644 --- a/include/d/actor/d_a_kago.h +++ b/include/d/actor/d_a_kago.h @@ -18,6 +18,20 @@ */ class daKago_c : public fopAc_ac_c { public: + enum daKago_Action_e { + ACTION_FLY_e, + ACTION_STAGGER_e, + ACTION_EVENT_e, + ACTION_PERCH_e, + ACTION_WAIT_e, + ACTION_ATTACK_e, + ACTION_EVENT2_e, + ACTION_PERCH2_e, + ACTION_LANDING_e, + ACTION_DEMO_FLY_e, + ACTION_DEMO_FLY2_e, + }; + int getBckName(int); void setBck(int, u8, f32, f32); bool checkBck(int); @@ -93,14 +107,14 @@ public: void setEvent() { mIsFlying = false; - mCurrentAction = 2; - field_0x744 = 0; + mAction = ACTION_EVENT_e; + mMode = 0; } void setEvent2() { mIsFlying = false; - mCurrentAction = 6; - field_0x744 = 0; + mAction = ACTION_EVENT2_e; + mMode = 0; } void setKagoPath(u8 i_pathNo) { @@ -110,36 +124,36 @@ public: } void onWaterFall() { - field_0x6ea = 1; + mIsWaterfall = TRUE; } bool isAttack() { - return field_0x6dd != 0; + return mIsAttack != 0; } MtxP getLegR3Mtx() { return mLegR3Mtx; } - MtxP getMidnaLocaterMtx() { return mpMorf->getModel()->getAnmMtx(4); } + MtxP getMidnaLocaterMtx() { return mAnm_p->getModel()->getAnmMtx(4); } s8 getPathDir() { return mPathDir; } u8 isFlying() { return mIsFlying; } fopAc_ac_c* getLockActor() { return mpLockActor; } void setLockActor(fopAc_ac_c* actor) { mpLockActor = actor; } void setEatYm() { field_0x6d8 |= (u8) 4; } - MtxP getMouthMtx() { return mpMorf->getModel()->getAnmMtx(7); } + MtxP getMouthMtx() { return mAnm_p->getModel()->getAnmMtx(7); } private: /* 0x568 */ request_of_phase_process_class mPhase; - /* 0x570 */ mDoExt_McaMorfSO* mpMorf; + /* 0x570 */ mDoExt_McaMorfSO* mAnm_p; /* 0x574 */ Z2CreatureEnemy mSound; /* 0x618 */ fopAc_ac_c* mpLockActor; /* 0x61C */ fpc_ProcID mBalloon2DId; /* 0x620 */ Mtx mLegR3Mtx; - /* 0x650 */ cXyz field_0x650[3]; + /* 0x650 */ cXyz mWallHitEffPos[3]; /* 0x674 */ cXyz field_0x674; /* 0x680 */ cXyz field_0x680; - /* 0x68C */ cXyz field_0x68c; - /* 0x698 */ cXyz field_0x698; + /* 0x68C */ cXyz mDemoCamCenter; + /* 0x698 */ cXyz mDemoCamEye; /* 0x6A4 */ cXyz field_0x6a4; - /* 0x6B0 */ cXyz field_0x6b0; + /* 0x6B0 */ cXyz mPrevCamEye; /* 0x6BC */ s16 field_0x6bc; /* 0x6BE */ csXyz field_0x6be; /* 0x6C4 */ f32 field_0x6c4; @@ -147,12 +161,12 @@ private: /* 0x6CA */ s16 field_0x6ca; /* 0x6CC */ f32 field_0x6cc; /* 0x6D0 */ f32 field_0x6d0; - /* 0x6D4 */ f32 field_0x6d4; + /* 0x6D4 */ f32 mDemoCamFovy; /* 0x6D8 */ u8 field_0x6d8; /* 0x6D9 */ u8 field_0x6d9; /* 0x6DA */ s16 field_0x6da; /* 0x6DC */ u8 field_0x6dc; - /* 0x6DD */ u8 field_0x6dd; + /* 0x6DD */ u8 mIsAttack; /* 0x6DE */ u8 field_0x6de; /* 0x6DF */ u8 field_0x6df; /* 0x6E0 */ u8 field_0x6e0; @@ -162,18 +176,18 @@ private: /* 0x6E4 */ u8 field_0x6e4; /* 0x6E5 */ u8 field_0x6e5; /* 0x6E6 */ u8 field_0x6e6; - /* 0x6E7 */ u8 field_0x6e7; + /* 0x6E7 */ u8 mType; /* 0x6E8 */ u8 field_0x6e8; /* 0x6E8 */ u8 field_0x6e9; - /* 0x6EA */ u8 field_0x6ea; - /* 0x6EB */ u8 field_0x6eb; + /* 0x6EA */ u8 mIsWaterfall; + /* 0x6EB */ u8 mBalloonMenuMode; /* 0x6EC */ u8 field_0x6ec[0x6ed - 0x6ec]; - /* 0x6ED */ u8 field_0x6ed; - /* 0x6F0 */ f32 field_0x6f0; - /* 0x6F4 */ f32 field_0x6f4; - /* 0x6F8 */ f32 field_0x6f8; + /* 0x6ED */ u8 unk_0x6ed; + /* 0x6F0 */ f32 mStickX; + /* 0x6F4 */ f32 mStickY; + /* 0x6F8 */ f32 mFlySpeed; /* 0x6FC */ f32 field_0x6fc; - /* 0x700 */ f32 field_0x700; + /* 0x700 */ f32 mGroundFlyHeight; /* 0x704 */ f32 mGroundHeight; /* 0x708 */ f32 mRoofHeight; /* 0x70C */ f32 field_0x70c; @@ -181,32 +195,32 @@ private: /* 0x712 */ s16 field_0x712; /* 0x714 */ s16 field_0x714; /* 0x716 */ s16 field_0x716; - /* 0x718 */ s16 field_0x718; - /* 0x71A */ s16 field_0x71a; - /* 0x71C */ s32 field_0x71c; - /* 0x720 */ s32 field_0x720; + /* 0x718 */ s16 mHeadRotZ; + /* 0x71A */ s16 mHeadRotY; + /* 0x71C */ int mWaterSplashTimer; + /* 0x720 */ int mWallHitInvulnTimer; /* 0x724 */ u8 field_0x724[0x728 - 0x724]; - /* 0x728 */ s32 field_0x728; - /* 0x72C */ s32 field_0x72c; - /* 0x730 */ s32 mDashCooldownTime; - /* 0x734 */ s32 mDashTime; - /* 0x738 */ s32 field_0x738; - /* 0x73C */ s32 field_0x73c; - /* 0x740 */ s32 mCurrentAction; - /* 0x744 */ s32 field_0x744; - /* 0x748 */ s32 field_0x748; - /* 0x74C */ s32 field_0x74c; - /* 0x750 */ s32 field_0x750; - /* 0x754 */ s32 field_0x754; - /* 0x758 */ s32 field_0x758; - /* 0x75C */ char* field_0x75c; - /* 0x760 */ char* field_0x760; - /* 0x764 */ s32 field_0x764; + /* 0x728 */ int field_0x728; + /* 0x72C */ int field_0x72c; + /* 0x730 */ int mDashCooldownTime; + /* 0x734 */ int mDashTime; + /* 0x738 */ int mGndSpecialCode; + /* 0x73C */ int mSceneType; + /* 0x740 */ int mAction; + /* 0x744 */ int mMode; + /* 0x748 */ int mDemoMode; + /* 0x74C */ int field_0x74c; + /* 0x750 */ int field_0x750; + /* 0x754 */ int field_0x754; + /* 0x758 */ int field_0x758; + /* 0x75C */ char* mArcName; + /* 0x760 */ char* mDemoName; + /* 0x764 */ u32 mShadowId; /* 0x768 */ dPath* mpPath1; /* 0x76C */ dPath* mpPath2; - /* 0x770 */ s8 mPathIdx; + /* 0x770 */ s8 mPathCurrentPointNo; /* 0x771 */ s8 field_0x771; - /* 0x772 */ s8 mPathIdxOffset; + /* 0x772 */ s8 mPathStep; /* 0x773 */ s8 mPathDir; /* 0x774 */ u8 field_0x774[0x778 - 0x774]; /* 0x778 */ dBgS_AcchCir mAcchCir; @@ -220,9 +234,9 @@ private: /* 0xB38 */ u32 field_0xb38; /* 0xB3C */ u32 field_0xb3c; /* 0xB40 */ u32 field_0xb40; - /* 0xB44 */ u32 field_0xb44[3]; - /* 0xB50 */ u32 field_0xb50; - /* 0xB54 */ u8 field_0xb54; + /* 0xB44 */ u32 mSibukiEmitterIDs[3]; + /* 0xB50 */ u32 mDashSibukiEmitterID; + /* 0xB54 */ u8 mIsHioSet; /* 0xB58 */ dMsgFlow_c mMsgFlow; }; diff --git a/include/d/actor/d_a_kytag12.h b/include/d/actor/d_a_kytag12.h index a043aafaad..73b46a0efe 100644 --- a/include/d/actor/d_a_kytag12.h +++ b/include/d/actor/d_a_kytag12.h @@ -1,7 +1,7 @@ #ifndef D_A_KYTAG12_H #define D_A_KYTAG12_H -#include +#include #include "f_op/f_op_actor_mng.h" /** diff --git a/include/d/actor/d_a_kytag13.h b/include/d/actor/d_a_kytag13.h index e03d9c579c..03d835e9c7 100644 --- a/include/d/actor/d_a_kytag13.h +++ b/include/d/actor/d_a_kytag13.h @@ -1,7 +1,7 @@ #ifndef D_A_KYTAG13_H #define D_A_KYTAG13_H -#include +#include #include "f_op/f_op_actor_mng.h" /** diff --git a/include/d/actor/d_a_movie_player.h b/include/d/actor/d_a_movie_player.h index 22f3b2b43c..e064d558dd 100644 --- a/include/d/actor/d_a_movie_player.h +++ b/include/d/actor/d_a_movie_player.h @@ -1,7 +1,7 @@ #ifndef D_A_MOVIE_PLAYER_H #define D_A_MOVIE_PLAYER_H -#include +#include #include "f_op/f_op_actor.h" #include "d/d_drawlist.h" diff --git a/include/d/actor/d_a_npc_cd2.h b/include/d/actor/d_a_npc_cd2.h index 85ec30b4e2..3d2eaa87c5 100644 --- a/include/d/actor/d_a_npc_cd2.h +++ b/include/d/actor/d_a_npc_cd2.h @@ -5,7 +5,7 @@ #include "d/actor/d_a_tag_escape.h" #include "d/d_npc_lib.h" #include "d/d_path.h" -#include +#include enum { MdlMANa_e = 0, diff --git a/include/d/actor/d_a_npc_toby.h b/include/d/actor/d_a_npc_toby.h index 2168d28947..0c3de69c6f 100644 --- a/include/d/actor/d_a_npc_toby.h +++ b/include/d/actor/d_a_npc_toby.h @@ -1,7 +1,7 @@ #ifndef D_A_NPC_TOBY_H #define D_A_NPC_TOBY_H -#include +#include #include "d/actor/d_a_npc.h" struct daNpc_Toby_HIOParam { diff --git a/include/d/actor/d_a_obj_avalanche.h b/include/d/actor/d_a_obj_avalanche.h index 18912da8f7..89de60d2e8 100644 --- a/include/d/actor/d_a_obj_avalanche.h +++ b/include/d/actor/d_a_obj_avalanche.h @@ -1,7 +1,7 @@ #ifndef D_A_OBJ_AVALANCHE_H #define D_A_OBJ_AVALANCHE_H -#include +#include #include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/d/actor/d_a_obj_bed.h b/include/d/actor/d_a_obj_bed.h index 0997e25353..68919a8461 100644 --- a/include/d/actor/d_a_obj_bed.h +++ b/include/d/actor/d_a_obj_bed.h @@ -4,7 +4,7 @@ #include "SSystem/SComponent/c_phase.h" #include "d/d_bg_s_acch.h" #include "f_op/f_op_actor.h" -#include +#include class dBgW; diff --git a/include/d/actor/d_a_obj_bmWindow.h b/include/d/actor/d_a_obj_bmWindow.h index fd04b16ccb..85b5ab8f86 100644 --- a/include/d/actor/d_a_obj_bmWindow.h +++ b/include/d/actor/d_a_obj_bmWindow.h @@ -1,7 +1,7 @@ #ifndef D_A_OBJ_BMWINDOW_H #define D_A_OBJ_BMWINDOW_H -#include +#include #include "d/d_bg_s_movebg_actor.h" #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/d/actor/d_a_obj_hata.h b/include/d/actor/d_a_obj_hata.h index e0763a9c75..db42f9d42d 100644 --- a/include/d/actor/d_a_obj_hata.h +++ b/include/d/actor/d_a_obj_hata.h @@ -2,7 +2,7 @@ #define D_A_OBJ_HATA_H #include "SSystem/SComponent/c_phase.h" -#include +#include #include "f_op/f_op_actor.h" /** diff --git a/include/d/actor/d_a_obj_stopper.h b/include/d/actor/d_a_obj_stopper.h index 562d5a87ca..9a100c754b 100644 --- a/include/d/actor/d_a_obj_stopper.h +++ b/include/d/actor/d_a_obj_stopper.h @@ -5,7 +5,7 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_cc_d.h" #include "d/d_particle.h" -#include +#include #include "f_op/f_op_actor_mng.h" /** diff --git a/include/d/actor/d_a_path_line.h b/include/d/actor/d_a_path_line.h index a03c5445e7..9cf086adaf 100644 --- a/include/d/actor/d_a_path_line.h +++ b/include/d/actor/d_a_path_line.h @@ -1,6 +1,6 @@ #ifndef D_A_PATH_LINE_H #define D_A_PATH_LINE_H -#include +#include #endif /* D_A_PATH_LINE_H */ diff --git a/include/d/actor/d_a_peru.h b/include/d/actor/d_a_peru.h index 583f7c62d0..df9f494936 100644 --- a/include/d/actor/d_a_peru.h +++ b/include/d/actor/d_a_peru.h @@ -2,7 +2,7 @@ #define D_A_PERU_H #include "d/actor/d_a_tag_evtarea.h" -#include +#include #include "d/actor/d_a_npc.h" #include "SSystem/SComponent/c_counter.h" diff --git a/include/d/actor/d_a_ppolamp.h b/include/d/actor/d_a_ppolamp.h index f6a6da2e66..f1e1a9f26d 100644 --- a/include/d/actor/d_a_ppolamp.h +++ b/include/d/actor/d_a_ppolamp.h @@ -1,7 +1,7 @@ #ifndef D_A_PPOLAMP_H #define D_A_PPOLAMP_H -#include +#include #include "f_op/f_op_actor_mng.h" /** diff --git a/include/d/actor/d_a_tag_kmsg.h b/include/d/actor/d_a_tag_kmsg.h index 2875ca3210..92cd33f35b 100644 --- a/include/d/actor/d_a_tag_kmsg.h +++ b/include/d/actor/d_a_tag_kmsg.h @@ -1,7 +1,7 @@ #ifndef D_A_TAG_KMSG_H #define D_A_TAG_KMSG_H -#include +#include #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_msg_flow.h" diff --git a/include/d/d_bg_pc.h b/include/d/d_bg_pc.h index 949c38e609..6585010451 100644 --- a/include/d/d_bg_pc.h +++ b/include/d/d_bg_pc.h @@ -1,7 +1,7 @@ #ifndef D_BG_D_BG_PC_H #define D_BG_D_BG_PC_H -#include +#include struct sBgPc { /* 0x00 */ u32 code0; diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h index c0804bd07c..315a7be614 100644 --- a/include/d/d_bg_s.h +++ b/include/d/d_bg_s.h @@ -3,7 +3,7 @@ #include "d/d_bg_w_base.h" #include "JSystem/JHostIO/JORReflexible.h" -#include +#include #include "global.h" class dBgW; @@ -195,6 +195,8 @@ public: void ChkDeleteActorRegist(fopAc_ac_c*); + void Draw(); + #if DEBUG /* 0x1404 */ u8 field_0x1404[0x1408 - 0x1404]; /* 0x1408 */ dBgS_HIO m_hio; diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h index 94b3e5d93c..2b24bf12c8 100644 --- a/include/d/d_bg_w.h +++ b/include/d/d_bg_w.h @@ -4,8 +4,8 @@ #include "SSystem/SComponent/c_m3d_g_aab.h" #include "SSystem/SComponent/c_sxyz.h" #include "d/d_bg_w_base.h" -#include -#include +#include +#include #include "dusk/offset_ptr.h" #include "dusk/endian.h" #include "dusk/endian_ssystem.h" diff --git a/include/d/d_bg_w_base.h b/include/d/d_bg_w_base.h index 0a05467820..762d3bb707 100644 --- a/include/d/d_bg_w_base.h +++ b/include/d/d_bg_w_base.h @@ -4,7 +4,7 @@ #include "SSystem/SComponent/c_bg_s_poly_info.h" #include "SSystem/SComponent/c_bg_w.h" #include "SSystem/SComponent/c_m3d_g_pla.h" -#include +#include #include "f_pc/f_pc_base.h" class cBgS_GndChk; diff --git a/include/d/d_camera.h b/include/d/d_camera.h index c49cce155e..f7a7132538 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -1367,8 +1367,7 @@ public: /* 0x970 */ dCamSetup_c mCamSetup; /* 0xAEC */ dCamParam_c mCamParam; /* 0xB0C */ u8 field_0xb0c; - /* 0xB0D */ u8 field_0xb0d[0xd58 - 0xb0d]; -}; // Size: 0xD58 +}; // Size: 0xB10 dCamera_c* dCam_getBody(); camera_class* dCam_getCamera(); diff --git a/include/d/d_cc_uty.h b/include/d/d_cc_uty.h index bc58f99dc8..d070512cc1 100644 --- a/include/d/d_cc_uty.h +++ b/include/d/d_cc_uty.h @@ -2,7 +2,7 @@ #define D_CC_D_CC_UTY_H #include "SSystem/SComponent/c_sxyz.h" -#include +#include class cCcD_Obj; class fopAc_ac_c; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 9a0344eece..8b2ef8c007 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -952,7 +952,7 @@ public: dComIfG_inf_c() { this->ct(); } ~dComIfG_inf_c() {} void ct(); - void createBaseCsr(); + static void createBaseCsr(); #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG class baseCsr_c : public mDoGph_gInf_c::csr_c { @@ -1022,7 +1022,9 @@ public: /* 0x1DE09 */ u8 field_0x1de09; /* 0x1DE0A */ u8 field_0x1de0a; /* 0x1DE0B */ u8 mIsDebugMode; - /* 0x1DE0C */ u8 field_0x1de0c; + #if DEBUG + /* 0x1DE0C */ OSStopwatch mStopwatch; + #endif static __d_timer_info_c dComIfG_mTimerInfo; #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG @@ -1235,6 +1237,7 @@ int dComIfG_TimerEnd(int i_mode, int param_1); int dComIfG_TimerDeleteCheck(int); int dComIfG_TimerDeleteRequest(int i_mode); int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*); +BOOL dComIfG_isSceneResetButton(); int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, s16 i_angle, f32 param_5, GXTexObj* i_tex); @@ -3323,6 +3326,22 @@ inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* i_pos NULL, NULL, NULL, -1, NULL); } +inline u32 dComIfGp_particle_getHeapSize() { + return g_dComIfG_gameInfo.play.getParticle()->getHeapSize(); +} + +inline u32 dComIfGp_particle_getSceneHeapSize() { + return g_dComIfG_gameInfo.play.getParticle()->getSceneHeapSize(); +} + +inline int dComIfGp_particle_getEmitterNum() { + return g_dComIfG_gameInfo.play.getParticle()->getEmitterNum(); +} + +inline int dComIfGp_particle_getParticleNum() { + return g_dComIfG_gameInfo.play.getParticle()->getParticleNum(); +} + inline dSmplMdl_draw_c* dComIfGp_getSimpleModel() { return g_dComIfG_gameInfo.play.getSimpleModel(); } @@ -4430,6 +4449,28 @@ inline u32 dComIfG_getTrigB(u32 i_padNo) { return mDoCPd_c::getTrig(i_padNo) & PAD_BUTTON_B; } +inline u32 dComIfG_getObjectAllSize() { + return g_dComIfG_gameInfo.mResControl.getObjectAllSize(); +} + +inline u32 dComIfG_getStageAllSize() { + return g_dComIfG_gameInfo.mResControl.getStageAllSize(); +} + +inline u32 dComIfG_getObjectSize(const char* i_arcName) { + return g_dComIfG_gameInfo.mResControl.getObjectSize(i_arcName); +} + +inline u32 dComIfG_getStageSize(const char* i_arcName) { + return g_dComIfG_gameInfo.mResControl.getStageSize(i_arcName); +} + +#if DEBUG +inline void dComIfG_initStopwatch() { + OSInitStopwatch(&g_dComIfG_gameInfo.mStopwatch, "dComIfG"); +} +#endif + inline int dComIfGd_setRealShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4, f32 param_5, dKy_tevstr_c* param_6) { return g_dComIfG_gameInfo.drawlist.setRealShadow(param_0, param_1, param_2, param_3, param_4, diff --git a/include/d/d_debug_viewer.h b/include/d/d_debug_viewer.h index f535207a3a..dc72f972d8 100644 --- a/include/d/d_debug_viewer.h +++ b/include/d/d_debug_viewer.h @@ -1,7 +1,7 @@ #ifndef D_DEBUG_VIEWER_H #define D_DEBUG_VIEWER_H -#include +#include #include "SSystem/SComponent/c_xyz.h" #include "SSystem/SComponent/c_sxyz.h" diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 3a517f72b9..9b9d2325ac 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -391,6 +391,7 @@ public: static s16 getBranchId() { return m_branchId; } static u16 getBranchNum() { return m_branchNum; } static jmessage_tControl* getMesgControl() { return m_mesgControl; } + static dDemo_system_c* getSystem() { return m_system; } static void setBranchNum(u16 num) { m_branchNum = num; diff --git a/include/d/d_door_param2.h b/include/d/d_door_param2.h index ffb6f9a9c2..2b98243b56 100644 --- a/include/d/d_door_param2.h +++ b/include/d/d_door_param2.h @@ -1,7 +1,7 @@ #ifndef D_D_DOOR_PARAM2_H #define D_D_DOOR_PARAM2_H -#include +#include class fopAc_ac_c; diff --git a/include/d/d_event_lib.h b/include/d/d_event_lib.h index 7220534f5c..b0ee88a6f3 100644 --- a/include/d/d_event_lib.h +++ b/include/d/d_event_lib.h @@ -1,7 +1,7 @@ #ifndef D_EVENT_D_EVENT_LIB_H #define D_EVENT_D_EVENT_LIB_H -#include +#include class fopAc_ac_c; diff --git a/include/d/d_eye_hl.h b/include/d/d_eye_hl.h index d174387806..e7a4d82d3c 100644 --- a/include/d/d_eye_hl.h +++ b/include/d/d_eye_hl.h @@ -1,7 +1,7 @@ #ifndef D_D_EYE_HL_H #define D_D_EYE_HL_H -#include +#include class J3DModelData; struct ResTIMG; @@ -13,6 +13,10 @@ public: static void entry(dEyeHL_c*); static void remove(dEyeHL_c*); + static void create() { + JUT_ASSERT(51, m_obj == NULL); + } + static dEyeHL_c* m_obj; }; diff --git a/include/d/d_item.h b/include/d/d_item.h index 8b988ce10c..0d379c0578 100644 --- a/include/d/d_item.h +++ b/include/d/d_item.h @@ -1,7 +1,7 @@ #ifndef D_D_ITEM_H #define D_D_ITEM_H -#include +#include class dEnemyItem_c { public: diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h index 00fb9e5b9b..a7e658c1a3 100644 --- a/include/d/d_item_data.h +++ b/include/d/d_item_data.h @@ -1,7 +1,7 @@ #ifndef D_D_ITEM_DATA_H #define D_D_ITEM_DATA_H -#include +#include struct dItem_itemInfo { /* 0x0 */ u8 mShadowSize; diff --git a/include/d/d_jpreviewer.h b/include/d/d_jpreviewer.h index 9971fa6674..6f00adbb93 100644 --- a/include/d/d_jpreviewer.h +++ b/include/d/d_jpreviewer.h @@ -1,7 +1,7 @@ #ifndef D_JPREVIEWER_H #define D_JPREVIEWER_H -#include +#include #include "JSystem/JStudio/JStudio_JPreviewer/control.h" namespace JStudio { @@ -26,8 +26,8 @@ public: void show3D(Mtx); void show2D(); - void create(JStudio::TControl* pControl, const JUTGamePad& pad); - void remove(); + static void create(JStudio::TControl* pControl, const JUTGamePad& pad); + static void remove(); void update(); static dJprev_c* get() { return m_myObj; } diff --git a/include/d/d_kankyo_data.h b/include/d/d_kankyo_data.h index 93b0cecfcb..e8d38992ab 100644 --- a/include/d/d_kankyo_data.h +++ b/include/d/d_kankyo_data.h @@ -1,7 +1,7 @@ #ifndef D_KANKYO_D_KANKYO_DATA_H #define D_KANKYO_D_KANKYO_DATA_H -#include +#include struct color_RGB_class { /* 0x0 */ u8 r; diff --git a/include/d/d_kankyo_rain.h b/include/d/d_kankyo_rain.h index 27eaa3886a..47b068d52b 100644 --- a/include/d/d_kankyo_rain.h +++ b/include/d/d_kankyo_rain.h @@ -1,7 +1,7 @@ #ifndef D_KANKYO_D_KANKYO_RAIN_H #define D_KANKYO_D_KANKYO_RAIN_H -#include +#include struct cXyz; diff --git a/include/d/d_kankyo_tev_str.h b/include/d/d_kankyo_tev_str.h index 177dc80d65..d5403876c5 100644 --- a/include/d/d_kankyo_tev_str.h +++ b/include/d/d_kankyo_tev_str.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DTevs.h" #include "SSystem/SComponent/c_xyz.h" -#include +#include class dKy_tevstr_c { public: diff --git a/include/d/d_lib.h b/include/d/d_lib.h index 212bf517f5..1d3103ce96 100644 --- a/include/d/d_lib.h +++ b/include/d/d_lib.h @@ -2,8 +2,8 @@ #define D_D_LIB_H #include "SSystem/SComponent/c_xyz.h" -#include -#include +#include +#include class fopAc_ac_c; diff --git a/include/d/d_menu_dmap.h b/include/d/d_menu_dmap.h index fafa30e0c0..78c659e2cf 100644 --- a/include/d/d_menu_dmap.h +++ b/include/d/d_menu_dmap.h @@ -5,7 +5,7 @@ #include "d/d_msg_flow.h" #include "d/d_menu_map_common.h" #include "d/d_map_path_dmap.h" -#include +#include class CPaneMgr; struct CSTControl; diff --git a/include/d/d_menu_fmap2D.h b/include/d/d_menu_fmap2D.h index ba8fd8659f..c0344c7903 100644 --- a/include/d/d_menu_fmap2D.h +++ b/include/d/d_menu_fmap2D.h @@ -7,7 +7,7 @@ #include "d/d_menu_map_common.h" #include "d/d_meter_haihai.h" #include "d/d_pane_class.h" -#include +#include class dMsgScrnExplain_c; diff --git a/include/d/d_menu_fmap_map.h b/include/d/d_menu_fmap_map.h index b77e43ba70..95294ffb35 100644 --- a/include/d/d_menu_fmap_map.h +++ b/include/d/d_menu_fmap_map.h @@ -2,7 +2,7 @@ #define D_MENU_D_MENU_FMAP_MAP_H #include "SSystem/SComponent/c_counter.h" -#include +#include #include #include "d/d_menu_fmap.h" #include "d/d_map.h" diff --git a/include/d/d_menu_map_common.h b/include/d/d_menu_map_common.h index 7d81ba620d..84da15328c 100644 --- a/include/d/d_menu_map_common.h +++ b/include/d/d_menu_map_common.h @@ -1,7 +1,7 @@ #ifndef D_MENU_D_MENU_MAP_COMMON_H #define D_MENU_D_MENU_MAP_COMMON_H -#include +#include class J2DPicture; class JKRArchive; diff --git a/include/d/d_menu_window_HIO.h b/include/d/d_menu_window_HIO.h index 9a6e82fa06..1df1b5cb72 100644 --- a/include/d/d_menu_window_HIO.h +++ b/include/d/d_menu_window_HIO.h @@ -1,7 +1,7 @@ #ifndef D_MENU_D_MENU_WINDOW_HIO_H #define D_MENU_D_MENU_WINDOW_HIO_H -#include +#include class dMw_DHIO_c { public: diff --git a/include/d/d_msg_flow.h b/include/d/d_msg_flow.h index 8f242f3eec..98a5308385 100644 --- a/include/d/d_msg_flow.h +++ b/include/d/d_msg_flow.h @@ -1,7 +1,7 @@ #ifndef D_MSG_D_MSG_FLOW_H #define D_MSG_D_MSG_FLOW_H -#include +#include enum { NODETYPE_MESSAGE_e = 1, diff --git a/include/d/d_msg_out_font.h b/include/d/d_msg_out_font.h index f1cb15a5c4..2b2d0fa33d 100644 --- a/include/d/d_msg_out_font.h +++ b/include/d/d_msg_out_font.h @@ -1,7 +1,7 @@ #ifndef D_MSG_D_MSG_OUT_FONT_H #define D_MSG_D_MSG_OUT_FONT_H -#include +#include class J2DPicture; class J2DTextBox; diff --git a/include/d/d_msg_scrn_arrow.h b/include/d/d_msg_scrn_arrow.h index 0f65181033..725fbf8658 100644 --- a/include/d/d_msg_scrn_arrow.h +++ b/include/d/d_msg_scrn_arrow.h @@ -1,7 +1,7 @@ #ifndef MSG_SCRN_D_MSG_SCRN_ARROW_H #define MSG_SCRN_D_MSG_SCRN_ARROW_H -#include +#include class J2DScreen; class J2DAnmTransform; diff --git a/include/d/d_msg_scrn_item.h b/include/d/d_msg_scrn_item.h index 2d82bb2138..4b0e55cbd9 100644 --- a/include/d/d_msg_scrn_item.h +++ b/include/d/d_msg_scrn_item.h @@ -1,7 +1,7 @@ #ifndef MSG_SCRN_D_MSG_SCRN_ITEM_H #define MSG_SCRN_D_MSG_SCRN_ITEM_H -#include +#include #include "d/d_msg_scrn_base.h" class dMsgScrnArrow_c; diff --git a/include/d/d_msg_scrn_talk.h b/include/d/d_msg_scrn_talk.h index cac9efc97b..05b187e709 100644 --- a/include/d/d_msg_scrn_talk.h +++ b/include/d/d_msg_scrn_talk.h @@ -1,7 +1,7 @@ #ifndef MSG_SCRN_D_MSG_SCRN_TALK_H #define MSG_SCRN_D_MSG_SCRN_TALK_H -#include +#include #include "d/d_msg_scrn_base.h" class dMsgScrnArrow_c; diff --git a/include/d/d_particle.h b/include/d/d_particle.h index 5130a7afa6..c9db174fcd 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -7,6 +7,7 @@ #include "JSystem/JParticle/JPAParticle.h" #include "d/d_particle_name.h" #include "d/d_kankyo_tev_str.h" +#include "JSystem/JKernel/JKRSolidHeap.h" void dPa_cleanupGX(); @@ -427,6 +428,9 @@ public: JKRSolidHeap* getSceneHeap() { return mSceneHeap; } void* getSceneRes() { return m_sceneRes; } + u32 getHeapSize() { return mHeap->getTotalFreeSize(); } + u32 getSceneHeapSize() { return mSceneHeap->getTotalFreeSize(); } + void levelAllForceOnEventMove() { field_0x210.allForceOnEventMove(); } void levelExecute(u32 param_0) { @@ -453,6 +457,7 @@ public: static JPAEmitterManager* getEmitterManager() { return mEmitterMng; } int getEmitterNum() { return mEmitterMng->getEmitterNumber(); }; + int getParticleNum() { return mEmitterMng->getParticleNumber(); } static dPa_light8PcallBack* getLight8PcallBack() { return &mLight8PcallBack; diff --git a/include/d/d_particle_name.h b/include/d/d_particle_name.h index 05c128edd7..72a3332558 100644 --- a/include/d/d_particle_name.h +++ b/include/d/d_particle_name.h @@ -1,7 +1,7 @@ #ifndef D_PARTICLE_D_PARTICLE_NAME_H #define D_PARTICLE_D_PARTICLE_NAME_H -#include "dolphin/types.h" +#include #include // Room scenes use a bit to specify an ID is from a room particle pack, not the common particle pack diff --git a/include/d/d_path.h b/include/d/d_path.h index b49e2fcf5a..6e4e159a61 100644 --- a/include/d/d_path.h +++ b/include/d/d_path.h @@ -1,8 +1,8 @@ #ifndef D_D_PATH_H #define D_D_PATH_H -#include -#include +#include +#include class cBgS_PolyInfo; struct cXyz; @@ -25,6 +25,13 @@ struct dPath { /* 0x8 */ OFFSET_PTR(dPnt) m_points; }; +#if VERSION == VERSION_SHIELD_DEBUG +void dPath_Move(); +void dPath_Draw(); +void dPath_Dt(); +void dPath_Ct(); +#endif + inline BOOL dPath_ChkClose(const dPath* i_path) { return i_path->m_closed & 1; } dPath* dPath_GetRoomPath(int path_index, int room_no); diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 000146822b..31d028a082 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -39,6 +39,7 @@ public: char* getArchiveName() { return mArchiveName; } mDoDvdThd_mountArchive_c* getDMCommand() { return mDMCommand; } JKRArchive* getArchive() { return mArchive; } + JKRSolidHeap* getDataHeap() { return mDataHeap; } u32 incCount() { return ++mCount; } u32 decCount() { return --mCount; } @@ -138,6 +139,14 @@ public: return getResInfo(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo)); } + u32 getObjectSize(const char* i_arcName) { + return getSize(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo)); + } + + u32 getStageSize(const char* i_arcName) { + return getSize(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo)); + } + /* 0x0000 */ dRes_info_c mObjectInfo[128]; /* 0x1200 */ dRes_info_c mStageInfo[64]; }; // Size: 0x1B00 diff --git a/include/d/d_s_logo.h b/include/d/d_s_logo.h index 0a611b83c3..56d10eef82 100644 --- a/include/d/d_s_logo.h +++ b/include/d/d_s_logo.h @@ -2,6 +2,7 @@ #define D_S_D_S_LOGO_H #include "f_op/f_op_scene.h" +#include "m_Do/m_Do_dvd_thread.h" class JKRExpHeap; class JKRHeap; @@ -11,33 +12,41 @@ class mDoDvdThd_mountXArchive_c; class mDoDvdThd_mountArchive_c; class mDoDvdThd_toMainRam_c; -class dLog_HIO_c { -public: - dLog_HIO_c(); - virtual ~dLog_HIO_c(); - - u8 field_0x4[0x8 - 0x4]; -}; // Size: 0x8 - class dScnLogo_c : public scene_class { public: enum { - /* 0x0 */ EXEC_WARNING_IN, - /* 0x1 */ EXEC_WARNING_DISP, - /* 0x2 */ EXEC_WARNING_OUT, - /* 0x3 */ EXEC_NINTENDO_IN, - /* 0x4 */ EXEC_NINTENDO_OUT, - /* 0x5 */ EXEC_DOLBY_IN, - /* 0x6 */ EXEC_DOLBY_OUT, - /* 0x7 */ EXEC_DOLBY_OUT2, - /* 0x8 */ EXEC_PROG_IN, - /* 0x9 */ EXEC_PROG_SEL, - /* 0xA */ EXEC_PROG_OUT, - /* 0xB */ EXEC_PROG_SET, - /* 0xC */ EXEC_PROG_SET2, - /* 0xD */ EXEC_PROG_CHANGE, - /* 0xE */ EXEC_DVD_WAIT, - /* 0xF */ EXEC_SCENE_CHANGE, + /* 0 */ EXEC_WARNING_IN, + /* 1 */ EXEC_WARNING_DISP, + /* 2 */ EXEC_WARNING_OUT, + /* 3 */ EXEC_NINTENDO_IN, + /* 4 */ EXEC_NINTENDO_OUT, + /* 5 */ EXEC_DOLBY_IN, + /* 6 */ EXEC_DOLBY_OUT, + /* 7 */ EXEC_DOLBY_OUT2, + /* 8 */ EXEC_PROG_IN, + /* 9 */ EXEC_PROG_SEL, + /* 10 */ EXEC_PROG_OUT, + /* 11 */ EXEC_PROG_SET, + /* 12 */ EXEC_PROG_SET2, + /* 13 */ EXEC_PROG_CHANGE, + /* 14 */ EXEC_DVD_WAIT, + /* 15 */ EXEC_SCENE_CHANGE, + + #if PLATFORM_WII || PLATFORM_SHIELD + /* 16 */ EXEC_STRAP_IN, + /* 17 */ EXEC_STRAP_DISP, + /* 18 */ EXEC_STRAP_OUT, + /* 19 */ EXEC_STRAP_OUT2, + #endif + + #if VERSION == VERSION_SHIELD + /* 20 */ EXEC_MOC_IN, + /* 21 */ EXEC_MOC_DISP, + /* 22 */ EXEC_MOC_OUT, + /* 23 */ EXEC_NVLOGO_IN, + /* 24 */ EXEC_NVLOGO_DISP, + /* 25 */ EXEC_NVLOGO_OUT, + #endif }; dScnLogo_c() {} @@ -64,30 +73,66 @@ public: void nextSceneChange(); ~dScnLogo_c(); int create(); - void logoInitGC(); void dvdDataLoad(); void setProgressiveMode(u8); u8 getProgressiveMode(); bool isProgressiveMode(); void setRenderMode(); - #if VERSION == VERSION_GCN_PAL + #if VERSION == VERSION_GCN_PAL || PLATFORM_WII || PLATFORM_SHIELD u8 getPalLanguage(); #endif - #if DEBUG - static void onOpeningCut() { - mOpeningCut = true; + #if PLATFORM_WII || PLATFORM_SHIELD + void logoInitWii(); + void strapInDraw(); + void strapDispDraw(); + void strapOutDraw(); + void strapOut2Draw(); + #else + void logoInitGC(); + #endif + + #if VERSION == VERSION_SHIELD + void mocInDraw(); + void mocDispDraw(); + void mocOutDraw(); + void nvLogoInDraw(); + void nvLogoDispDraw(); + void nvLogoOutDraw(); + #endif + + mDoDvdThd_mountXArchive_c* aramMount(const char* i_arcPath, JKRHeap* i_heap) { + return mDoDvdThd_mountXArchive_c::create(i_arcPath, 0, JKRArchive::MOUNT_ARAM, i_heap); + } + + mDoDvdThd_mountXArchive_c* onMemMount(const char* i_arcPath) { + return mDoDvdThd_mountXArchive_c::create(i_arcPath, 0, JKRArchive::MOUNT_MEM, NULL); } + static void onOpeningCut() { + #if DEBUG + mOpeningCut = true; + #endif + } + + static u8 isOpeningCut() { + #if DEBUG + return mOpeningCut; + #else + return 0; + #endif + } + + #if DEBUG static u8 mOpeningCut; #endif public: /* 0x1C4 */ request_of_phase_process_class field_0x1c4; /* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand; - /* 0x1D0 */ JKRExpHeap* field_0x1d0; - /* 0x1D4 */ JKRExpHeap* field_0x1d4; + /* 0x1D0 */ JKRExpHeap* mLogoHeap; + /* 0x1D4 */ JKRExpHeap* mLogo01Heap; /* 0x1D8 */ JKRHeap* mpHeap; /* 0x1DC */ dDlst_2D_c* mWarning; /* 0x1E0 */ dDlst_2D_c* mWarningStart; @@ -97,6 +142,13 @@ public: /* 0x1F0 */ dDlst_2D_c* mProgressiveYes; /* 0x1F4 */ dDlst_2D_c* mProgressiveNo; /* 0x1F8 */ dDlst_2D_c* mProgressiveSel; +#if PLATFORM_WII || PLATFORM_SHIELD + /* 0x1FC */ dDlst_2D_c* mStrapImg; +#endif +#if VERSION == VERSION_SHIELD + /* 0x200 */ dDlst_2D_c* mNvLogo; + /* 0x204 */ dDlst_2D_c* mMocImg; +#endif #if VERSION == VERSION_GCN_PAL /* 0x1FC */ mDoDvdThd_mountArchive_c* mpPalLogoResCommand; #endif @@ -114,6 +166,10 @@ public: /* 0x214 */ u16 field_0x214; /* 0x218 */ u32 field_0x218; /* 0x21C */ void* dummyGameAlloc; +#if PLATFORM_WII || VERSION == VERSION_SHIELD + /* 0x224 */ mDoDvdThd_toMainRam_c* mpHomeBtnCommand; + /* 0x228 */ int mHomeBtnRegion; +#endif /* 0x220 */ mDoDvdThd_mountXArchive_c* mpField0Command; /* 0x224 */ mDoDvdThd_mountXArchive_c* mpAlAnmCommand; /* 0x228 */ u8 field_0x228[4]; diff --git a/include/d/d_s_menu.h b/include/d/d_s_menu.h index a544c65576..d2e0e9bde0 100644 --- a/include/d/d_s_menu.h +++ b/include/d/d_s_menu.h @@ -83,6 +83,8 @@ public: extern int g_playerKind; extern int g_debugHpMode; extern int g_horsePosInit; + +u8 dSm_read_stageset(u8* i_data); #else class dScnMenu_c {}; #endif diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h index 7181cf0b60..45b60220b0 100644 --- a/include/d/d_s_play.h +++ b/include/d/d_s_play.h @@ -9,9 +9,15 @@ class mDoDvdThd_mountXArchive_c; class mDoDvdThd_toMainRam_c; -class dScnPly_reg_childHIO_c { +class dScnPly_reg_childHIO_c : public JORReflexible { public: - /* 0x00 */ void* vtable; +#if ENABLE_REGHIO + dScnPly_reg_childHIO_c(); + virtual ~dScnPly_reg_childHIO_c() {} + + void genMessage(JORMContext*); +#endif + /* 0x04 */ f32 mFloatReg[30]; /* 0x7C */ s16 mShortReg[10]; }; @@ -37,9 +43,10 @@ public: void genMessage(JORMContext*); }; -class dScnPly_env_HIO_c { +class dScnPly_env_HIO_c : public JORReflexible { public: virtual ~dScnPly_env_HIO_c() {} + void genMessage(JORMContext*); /* 0x04 */ s8 field_0x4; /* 0x08 */ dScnPly_env_otherHIO_c mOther; @@ -79,6 +86,18 @@ public: static s8 pauseTimer; static s8 nextPauseTimer; + #if DEBUG + void onDebugPause() { + debugPause = TRUE; + } + + void offDebugPause() { + debugPause = FALSE; + } + + static u8 debugPause; + #endif + /* 0x1C4 */ request_of_phase_process_class field_0x1c4; /* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand; /* 0x1D0 */ mDoDvdThd_mountXArchive_c* field_0x1d0; diff --git a/include/d/d_s_play_env.h b/include/d/d_s_play_env.h index 79eed8a63d..d2b23d9f8c 100644 --- a/include/d/d_s_play_env.h +++ b/include/d/d_s_play_env.h @@ -6,7 +6,9 @@ public: dScnPly_env_otherHIO_c(); virtual ~dScnPly_env_otherHIO_c() {} + void listenPropertyEvent(const JORPropertyEvent*); void genMessage(JORMContext*); + void addSetEmitterID(u16 param_0) { #if DEBUG field_0x1c[field_0x4f++] = param_0; @@ -14,6 +16,8 @@ public: #endif } + void printParticle(); + #if DEBUG /* 0x04 */ s8 field_0x04; #endif @@ -53,6 +57,7 @@ public: dScnPly_env_debugHIO_c(); virtual ~dScnPly_env_debugHIO_c() {} + void listenPropertyEvent(const JORPropertyEvent*); void genMessage(JORMContext*); /* 0x04 */ u8 field_0x4; diff --git a/include/d/d_save.h b/include/d/d_save.h index abb77dd69c..9a57f9eb15 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -3,7 +3,7 @@ #include #include "SSystem/SComponent/c_xyz.h" -#include +#include #include "global.h" #include "f_pc/f_pc_name.h" #include "JSystem/JUtility/JUTAssert.h" diff --git a/include/d/d_save_HIO.h b/include/d/d_save_HIO.h index cc2f8af706..e149f7fcb9 100644 --- a/include/d/d_save_HIO.h +++ b/include/d/d_save_HIO.h @@ -209,11 +209,12 @@ private: /* 0x1A0 */ dSvBit_childItOneZoneHIO_c mOneZoneSave; }; -class dSvBit_HIO_c { +class dSvBit_HIO_c : public JORReflexible { public: void init(); virtual ~dSvBit_HIO_c() {} + void genMessage(JORMContext*); /* 0x004 */ s8 field_0x4; /* 0x008 */ dSvBit_childSwitchHIO_c mSwitch; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 0bf4c62165..fdaea03826 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1065,7 +1065,7 @@ public: /* 0x3F7 */ s8 mZoneNo; /* 0x3F8 */ s8 mMemBlockID; /* 0x3F9 */ u8 mRegionNo; - /* 0x3FC */ int mProcID; + /* 0x3FC */ fpc_ProcID mProcID; /* 0x400 */ dBgW_Base* mpBgW; int getZoneNo() const { return mZoneNo; } @@ -1121,8 +1121,8 @@ public: static s8 getRoomReadId() { return mRoomReadId; } static void setRoomReadId(s8 id) { mRoomReadId = id; } - static u32 getProcID() { return mProcID; } - static void setProcID(u32 id) { mProcID = id; } + static fpc_ProcID getProcID() { return mProcID; } + static void setProcID(fpc_ProcID id) { mProcID = id; } static int getStayNo() { return mStayNo; } static int getNextStayNo() { return mNextStayNo; } static BOOL GetTimePass() { return m_time_pass; } @@ -1196,7 +1196,7 @@ public: JUT_ASSERT(2770, 0 <= i_roomNo && i_roomNo < 64); mStatus[i_roomNo].mProcID = i_id; } - static int getStatusProcID(int i_roomNo) { + static fpc_ProcID getStatusProcID(int i_roomNo) { JUT_ASSERT(2774, 0 <= i_roomNo && i_roomNo < 64); return mStatus[i_roomNo].mProcID; } @@ -1226,7 +1226,7 @@ public: static char mArcBank[32][10]; static dStage_roomStatus_c mStatus[0x40]; static char mDemoArcName[10]; - static u32 mProcID; + static fpc_ProcID mProcID; static nameData* mArcBankName; static bankData* mArcBankData; static roomDzs_c m_roomDzs; @@ -1401,6 +1401,10 @@ dStage_KeepDoorInfo* dStage_GetKeepDoorInfo(); dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo(); void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage); +#if DEBUG +void dStage_DebugDisp(); +#endif + #define dStage_NAME_LENGTH 8 const char* dStage_getName(s16 procName, s8 argument); diff --git a/include/d/d_tresure.h b/include/d/d_tresure.h index 118e6a47be..236e2690c6 100644 --- a/include/d/d_tresure.h +++ b/include/d/d_tresure.h @@ -1,7 +1,7 @@ #ifndef D_D_TRESURE_H #define D_D_TRESURE_H -#include +#include #include "dusk/offset_ptr.h" class dTres_c { diff --git a/include/d/d_vib_pattern.h b/include/d/d_vib_pattern.h index 55d213513b..a794bdbf39 100644 --- a/include/d/d_vib_pattern.h +++ b/include/d/d_vib_pattern.h @@ -1,7 +1,7 @@ #ifndef D_D_VIB_PATTERN_H #define D_D_VIB_PATTERN_H -#include +#include diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 9d2caeea39..6d24ed130d 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -71,6 +71,8 @@ enum fopAc_Cull_e { fopAc_CULLBOX_14_e, #endif fopAc_CULLBOX_CUSTOM_e, + fopAc_CULLBOX_MAX_e = fopAc_CULLBOX_CUSTOM_e, + fopAc_CULLSPHERE_0_e, fopAc_CULLSPHERE_1_e, fopAc_CULLSPHERE_2_e, @@ -83,6 +85,7 @@ enum fopAc_Cull_e { fopAc_CULLSPHERE_8_e, #endif fopAc_CULLSPHERE_CUSTOM_e, + fopAc_CULLSPHERE_MAX_e = fopAc_CULLSPHERE_CUSTOM_e - fopAc_CULLSPHERE_0_e, }; enum fopAc_attention_type { diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index dc9fec05f2..d0538422b7 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -866,6 +866,9 @@ BOOL fopAcM_getNameString(const fopAc_ac_c*, char*); inline void fopAcM_SetStatusMap(fopAc_ac_c*, u32) {} +extern cull_box l_cullSizeBox[fopAc_CULLBOX_MAX_e]; +extern cull_sphere l_cullSizeSphere[fopAc_CULLSPHERE_MAX_e]; + class fopAcM_lc_c { public: fopAcM_lc_c() { mLineCheck.ClrSttsRoofOff(); } diff --git a/include/f_op/f_op_kankyo.h b/include/f_op/f_op_kankyo.h index 9d2b3b87eb..7741d6c09d 100644 --- a/include/f_op/f_op_kankyo.h +++ b/include/f_op/f_op_kankyo.h @@ -19,7 +19,7 @@ struct kankyo_process_profile_definition { /* 0x24 */ leafdraw_method_class* sub_method; }; // Size: 0x28 -void fopKy_IsKankyo(void* i_this); +BOOL fopKy_IsKankyo(void* i_this); extern leafdraw_method_class g_fopKy_Method; diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h index 975c1d2028..dcd36635ae 100644 --- a/include/f_op/f_op_kankyo_mng.h +++ b/include/f_op/f_op_kankyo_mng.h @@ -21,6 +21,7 @@ base_process_class* fopKyM_fastCreate(s16 i_procName, int i_param, cXyz* i_pos, fopKyM_CreateFunc i_createFunc); fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param); fpc_ProcID fopKyM_createMpillar(cXyz const* i_pos, f32 i_size); +BOOL fopKyM_IsKy(void* i_process); inline fopKyM_prm_class* fopKyM_GetAppend(void* i_process) { return (fopKyM_prm_class*)fpcM_GetAppend(i_process); diff --git a/include/f_op/f_op_view.h b/include/f_op/f_op_view.h index cd6aeccbbc..a605923b2f 100644 --- a/include/f_op/f_op_view.h +++ b/include/f_op/f_op_view.h @@ -2,7 +2,7 @@ #define F_F_OP_VIEW_H_ #include "SSystem/SComponent/c_xyz.h" -#include +#include #include "f_pc/f_pc_leaf.h" struct view_process_profile_definition { diff --git a/include/f_pc/f_pc_create_iter.h b/include/f_pc/f_pc_create_iter.h index 509a0fe1c0..c9e25c98ff 100644 --- a/include/f_pc/f_pc_create_iter.h +++ b/include/f_pc/f_pc_create_iter.h @@ -2,7 +2,7 @@ #ifndef F_PC_CREATE_ITER_H_ #define F_PC_CREATE_ITER_H_ -#include +#include typedef struct create_tag create_tag; diff --git a/include/f_pc/f_pc_debug_sv.h b/include/f_pc/f_pc_debug_sv.h index 680f90bd82..d2fcfcb84c 100644 --- a/include/f_pc/f_pc_debug_sv.h +++ b/include/f_pc/f_pc_debug_sv.h @@ -2,7 +2,11 @@ #ifndef F_PC_DEBUG_SV_H_ #define F_PC_DEBUG_SV_H_ -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #if DEBUG diff --git a/include/f_pc/f_pc_deletor.h b/include/f_pc/f_pc_deletor.h index 9f4cbeb014..c0b7da0fc2 100644 --- a/include/f_pc/f_pc_deletor.h +++ b/include/f_pc/f_pc_deletor.h @@ -2,7 +2,7 @@ #ifndef F_PC_DELETOR_H_ #define F_PC_DELETOR_H_ -#include +#include typedef struct base_process_class base_process_class; diff --git a/include/f_pc/f_pc_draw.h b/include/f_pc/f_pc_draw.h index dc971c8c27..889a67ab35 100644 --- a/include/f_pc/f_pc_draw.h +++ b/include/f_pc/f_pc_draw.h @@ -1,7 +1,7 @@ #ifndef F_PC_DRAW_H_ #define F_PC_DRAW_H_ -#include +#include typedef struct base_process_class base_process_class; diff --git a/include/f_pc/f_pc_draw_priority.h b/include/f_pc/f_pc_draw_priority.h index b34a810f70..467d53ced2 100644 --- a/include/f_pc/f_pc_draw_priority.h +++ b/include/f_pc/f_pc_draw_priority.h @@ -2,7 +2,7 @@ #ifndef F_PC_DRAW_PRIORITY_H_ #define F_PC_DRAW_PRIORITY_H_ -#include +#include typedef struct draw_priority_class { s16 priority; diff --git a/include/f_pc/f_pc_layer_iter.h b/include/f_pc/f_pc_layer_iter.h index 35e16fd8fa..19130d4d67 100644 --- a/include/f_pc/f_pc_layer_iter.h +++ b/include/f_pc/f_pc_layer_iter.h @@ -1,7 +1,7 @@ #ifndef F_PC_LAYER_ITER_H_ #define F_PC_LAYER_ITER_H_ -#include +#include typedef struct layer_class layer_class; diff --git a/include/f_pc/f_pc_load.h b/include/f_pc/f_pc_load.h index b71a767982..80db744aef 100644 --- a/include/f_pc/f_pc_load.h +++ b/include/f_pc/f_pc_load.h @@ -2,7 +2,7 @@ #ifndef F_PC_LOAD_H_ #define F_PC_LOAD_H_ -#include +#include BOOL fpcLd_Use(s16 i_procName); BOOL fpcLd_IsLoaded(s16 i_procName); diff --git a/include/f_pc/f_pc_method.h b/include/f_pc/f_pc_method.h index b87aa81e15..342a41008c 100644 --- a/include/f_pc/f_pc_method.h +++ b/include/f_pc/f_pc_method.h @@ -1,7 +1,7 @@ #ifndef F_PC_METHOD_H_ #define F_PC_METHOD_H_ -#include +#include typedef int (*process_method_func)(void*); diff --git a/include/f_pc/f_pc_method_iter.h b/include/f_pc/f_pc_method_iter.h index 05c1de4402..94e77c24d8 100644 --- a/include/f_pc/f_pc_method_iter.h +++ b/include/f_pc/f_pc_method_iter.h @@ -2,7 +2,7 @@ #ifndef F_PC_METHOD_ITER_H_ #define F_PC_METHOD_ITER_H_ -#include +#include typedef struct node_list_class node_list_class; diff --git a/include/f_pc/f_pc_pause.h b/include/f_pc/f_pc_pause.h index 0bc14c72b3..fb1c5f2c1e 100644 --- a/include/f_pc/f_pc_pause.h +++ b/include/f_pc/f_pc_pause.h @@ -1,7 +1,7 @@ #ifndef F_PC_PAUSE_ #define F_PC_PAUSE_ -#include +#include int fpcPause_IsEnable(void* pProc, u8 expected); int fpcPause_Enable(void* pProc, u8 pauseMask); diff --git a/include/f_pc/f_pc_profile.h b/include/f_pc/f_pc_profile.h index 8bc40fadc7..865d9a9a4f 100644 --- a/include/f_pc/f_pc_profile.h +++ b/include/f_pc/f_pc_profile.h @@ -2,7 +2,7 @@ #ifndef F_PC_PROFILE_H_ #define F_PC_PROFILE_H_ -#include +#include typedef struct nodedraw_method_class nodedraw_method_class; typedef struct leafdraw_method_class leafdraw_method_class; diff --git a/include/m_Do/m_Do_MemCard.h b/include/m_Do/m_Do_MemCard.h index 1dd2c37b13..f369bf2f2f 100644 --- a/include/m_Do/m_Do_MemCard.h +++ b/include/m_Do/m_Do_MemCard.h @@ -1,8 +1,8 @@ #ifndef M_DO_M_DO_MEMCARD_H #define M_DO_M_DO_MEMCARD_H -#include -#include +#include +#include #include "global.h" #define SAVEDATA_SIZE 0xA94 // Size of 1 Quest Log diff --git a/include/m_Do/m_Do_MemCardRWmng.h b/include/m_Do/m_Do_MemCardRWmng.h index 5263a53327..15f95d6347 100644 --- a/include/m_Do/m_Do_MemCardRWmng.h +++ b/include/m_Do/m_Do_MemCardRWmng.h @@ -2,7 +2,7 @@ #define M_DO_M_DO_MEMCARDRWMNG_H #include "global.h" -#include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h index 5396a1510d..a426460ba9 100644 --- a/include/m_Do/m_Do_Reset.h +++ b/include/m_Do/m_Do_Reset.h @@ -1,11 +1,15 @@ #ifndef M_DO_M_DO_RESET_H #define M_DO_M_DO_RESET_H -#include +#include void mDoRst_reset(int, u32, int); void mDoRst_resetCallBack(int, void*); +#if !PLATFORM_GCN +void mDoRst_shutdownCallBack(); +#endif + struct mDoRstData { /* 0x00 */ int mReset; /* 0x04 */ int mResetPrepare; diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 0cf8d843d1..1d58e8d8f2 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -28,13 +28,13 @@ public: static u8 isResetFlag() { return mResetFlag; } static void onResetFlag() { mResetFlag = true; } static void offResetFlag() { mResetFlag = false; } - static bool isBgmSet() { return mBgmSet; } + static u8 isBgmSet() { return mBgmSet; } static void onBgmSet() { mBgmSet = true; } static void offBgmSet() { mBgmSet = false; } static u8 mInitFlag; static u8 mResetFlag; - static bool mBgmSet; + static u8 mBgmSet; }; extern JKRSolidHeap* g_mDoAud_audioHeap; diff --git a/include/m_Do/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread.h index ad053bd051..16e7b1f9ab 100644 --- a/include/m_Do/m_Do_dvd_thread.h +++ b/include/m_Do/m_Do_dvd_thread.h @@ -2,8 +2,8 @@ #define M_DO_M_DO_DVD_THREAD_H #include "JSystem/JKernel/JKRArchive.h" -#include -#include +#include +#include #include "f_pc/f_pc_node.h" #define mDoDvd_MOUNT_DIRECTION_HEAD 0 diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 1462ad2032..5bcd2f3ac1 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -767,6 +767,12 @@ void mDoExt_restoreCurrentHeap(); JKRExpHeap* mDoExt_getGameHeap(); void mDoExt_setSafeGameHeapSize(); size_t mDoExt_getSafeGameHeapSize(); +intptr_t mDoExt_getSafeArchiveHeapSize(); +intptr_t mDoExt_getSafeJ2dHeapSize(); +intptr_t mDoExt_getSafeCommandHeapSize(); +void mDoExt_setSafeCommandHeapSize(); +void mDoExt_setSafeArchiveHeapSize(); +void mDoExt_setSafeJ2dHeapSize(); void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap); JKRHeap* mDoExt_setCurrentHeap(JKRHeap* i_heap); JKRExpHeap* mDoExt_getArchiveHeap(); diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h index 47879f3adb..53c47c07a7 100644 --- a/include/m_Do/m_Do_machine.h +++ b/include/m_Do/m_Do_machine.h @@ -1,7 +1,7 @@ #ifndef M_DO_M_DO_MACHINE_H #define M_DO_M_DO_MACHINE_H -#include +#include typedef struct OSContext OSContext; class JKRHeap; diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index ff5aa4d12a..9bedc21a39 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -2,7 +2,7 @@ #define M_DO_M_DO_MAIN_H #include "JSystem/JKernel/JKRExpHeap.h" -#include +#include class JKRExpHeap; diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 52a05ab9f0..23db8b6d94 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -3,7 +3,7 @@ #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" -#include +#include #include "JSystem/JMath/JMath.h" #include "dusk/endian.h" diff --git a/include/m_Do/m_Do_printf.h b/include/m_Do/m_Do_printf.h index 032efe518b..527be3d58a 100644 --- a/include/m_Do/m_Do_printf.h +++ b/include/m_Do/m_Do_printf.h @@ -1,8 +1,8 @@ #ifndef M_DO_M_DO_PRINTF_H #define M_DO_M_DO_PRINTF_H -#include -#include "dolphin/types.h" +#include +#include "dusk/endian.h" void my_PutString(const char*); void mDoPrintf_vprintf_Interrupt(char const*, va_list); diff --git a/include/m_Re/m_Re_controller_pad.h b/include/m_Re/m_Re_controller_pad.h index ac77462a91..1b58bfd4af 100644 --- a/include/m_Re/m_Re_controller_pad.h +++ b/include/m_Re/m_Re_controller_pad.h @@ -187,6 +187,8 @@ public: static u32 getTrigUp(u32 i_pad) { return getTrig(i_pad) & WPAD_BUTTON_UP; } static u32 getTrigStart(u32 i_pad) { return getTrig(i_pad) & WPAD_BUTTON_PLUS; } + static f32 getStickX(u32 i_pad) { return getPad(i_pad).field_0x4[0].ex_status.fs.stick.x; } + static WPADInfo m_pad_info[WPAD_MAX_CONTROLLERS]; static Pad m_pad[WPAD_MAX_CONTROLLERS]; static motorWave_t m_motorWave[WPAD_MAX_CONTROLLERS]; diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/libs/JSystem/include/JSystem/J2DGraph/J2DAnimation.h similarity index 100% rename from include/JSystem/J2DGraph/J2DAnimation.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DAnimation.h diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/libs/JSystem/include/JSystem/J2DGraph/J2DAnmLoader.h similarity index 100% rename from include/JSystem/J2DGraph/J2DAnmLoader.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DAnmLoader.h diff --git a/include/JSystem/J2DGraph/J2DGrafContext.h b/libs/JSystem/include/JSystem/J2DGraph/J2DGrafContext.h similarity index 98% rename from include/JSystem/J2DGraph/J2DGrafContext.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DGrafContext.h index 9f9ff431a7..8a7e1a74a2 100644 --- a/include/JSystem/J2DGraph/J2DGrafContext.h +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DGrafContext.h @@ -3,7 +3,7 @@ #include "JSystem/JGeometry.h" #include "JSystem/JUtility/TColor.h" -#include +#include /** * @ingroup jsystem-j2d diff --git a/include/JSystem/J2DGraph/J2DManage.h b/libs/JSystem/include/JSystem/J2DGraph/J2DManage.h similarity index 95% rename from include/JSystem/J2DGraph/J2DManage.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DManage.h index abccbe04c2..ebbf3cf46d 100644 --- a/include/JSystem/J2DGraph/J2DManage.h +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DManage.h @@ -1,7 +1,7 @@ #ifndef J2DMANAGE_H #define J2DMANAGE_H -#include +#include class JSUInputStream; diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/libs/JSystem/include/JSystem/J2DGraph/J2DMatBlock.h similarity index 100% rename from include/JSystem/J2DGraph/J2DMatBlock.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DMatBlock.h diff --git a/include/JSystem/J2DGraph/J2DMaterial.h b/libs/JSystem/include/JSystem/J2DGraph/J2DMaterial.h similarity index 100% rename from include/JSystem/J2DGraph/J2DMaterial.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DMaterial.h diff --git a/include/JSystem/J2DGraph/J2DMaterialFactory.h b/libs/JSystem/include/JSystem/J2DGraph/J2DMaterialFactory.h similarity index 100% rename from include/JSystem/J2DGraph/J2DMaterialFactory.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DMaterialFactory.h diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.h similarity index 100% rename from include/JSystem/J2DGraph/J2DOrthoGraph.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.h diff --git a/include/JSystem/J2DGraph/J2DPane.h b/libs/JSystem/include/JSystem/J2DGraph/J2DPane.h similarity index 99% rename from include/JSystem/J2DGraph/J2DPane.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DPane.h index 3a17405b97..60f382f064 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DPane.h @@ -3,8 +3,8 @@ #include "JSystem/JGeometry.h" #include "JSystem/JSupport/JSUList.h" -#include -#include +#include +#include #include "dusk/endian.h" class J2DAnmBase; diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/libs/JSystem/include/JSystem/J2DGraph/J2DPicture.h similarity index 100% rename from include/JSystem/J2DGraph/J2DPicture.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DPicture.h diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/libs/JSystem/include/JSystem/J2DGraph/J2DPictureEx.h similarity index 100% rename from include/JSystem/J2DGraph/J2DPictureEx.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DPictureEx.h diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/libs/JSystem/include/JSystem/J2DGraph/J2DPrint.h similarity index 100% rename from include/JSystem/J2DGraph/J2DPrint.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DPrint.h diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/libs/JSystem/include/JSystem/J2DGraph/J2DScreen.h similarity index 100% rename from include/JSystem/J2DGraph/J2DScreen.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DScreen.h diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/libs/JSystem/include/JSystem/J2DGraph/J2DTevs.h similarity index 99% rename from include/JSystem/J2DGraph/J2DTevs.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DTevs.h index 8bf27091ce..2d5f3ca2d6 100644 --- a/include/JSystem/J2DGraph/J2DTevs.h +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DTevs.h @@ -1,8 +1,8 @@ #ifndef J2DTEVS_H #define J2DTEVS_H -#include -#include +#include +#include #include "global.h" #include "dusk/endian.h" diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/libs/JSystem/include/JSystem/J2DGraph/J2DTextBox.h similarity index 100% rename from include/JSystem/J2DGraph/J2DTextBox.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DTextBox.h diff --git a/include/JSystem/J2DGraph/J2DTextBoxEx.h b/libs/JSystem/include/JSystem/J2DGraph/J2DTextBoxEx.h similarity index 100% rename from include/JSystem/J2DGraph/J2DTextBoxEx.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DTextBoxEx.h diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/libs/JSystem/include/JSystem/J2DGraph/J2DWindow.h similarity index 100% rename from include/JSystem/J2DGraph/J2DWindow.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DWindow.h diff --git a/include/JSystem/J2DGraph/J2DWindowEx.h b/libs/JSystem/include/JSystem/J2DGraph/J2DWindowEx.h similarity index 100% rename from include/JSystem/J2DGraph/J2DWindowEx.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DWindowEx.h diff --git a/include/JSystem/J3DAssert.h b/libs/JSystem/include/JSystem/J3DAssert.h similarity index 100% rename from include/JSystem/J3DAssert.h rename to libs/JSystem/include/JSystem/J3DAssert.h diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.h similarity index 99% rename from include/JSystem/J3DGraphAnimator/J3DAnimation.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 3ceccac8a4..7ba48add3f 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -3,7 +3,7 @@ #include "JSystem/J3DAssert.h" #include "JSystem/JUtility/JUTNameTab.h" -#include +#include #include "global.h" #include "dusk/endian.h" diff --git a/include/JSystem/J3DGraphAnimator/J3DCluster.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DCluster.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DCluster.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DCluster.h diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJoint.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DJoint.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJoint.h diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJointTree.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DJointTree.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJointTree.h diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.h similarity index 99% rename from include/JSystem/J3DGraphAnimator/J3DModel.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.h index 4de7175e85..5ec2aa5f2e 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModel.h +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h" #include "JSystem/J3DGraphBase/J3DPacket.h" -#include +#include enum J3DMdlFlag { J3DMdlFlag_None = 0x0, diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModelData.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DModelData.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModelData.h diff --git a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h diff --git a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DShapeTable.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DShapeTable.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DShapeTable.h diff --git a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h similarity index 99% rename from include/JSystem/J3DGraphAnimator/J3DSkinDeform.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h index 60fa5fc776..64923d761d 100644 --- a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphAnimator/J3DCluster.h" #include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h" -#include +#include #include class J3DModel; diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawBuffer.h similarity index 100% rename from include/JSystem/J3DGraphBase/J3DDrawBuffer.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawBuffer.h diff --git a/include/JSystem/J3DGraphBase/J3DEnum.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DEnum.h similarity index 100% rename from include/JSystem/J3DGraphBase/J3DEnum.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DEnum.h diff --git a/include/JSystem/J3DGraphBase/J3DFifo.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DFifo.h similarity index 97% rename from include/JSystem/J3DGraphBase/J3DFifo.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DFifo.h index a1cd2ff5b8..ac71c2afdd 100644 --- a/include/JSystem/J3DGraphBase/J3DFifo.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DFifo.h @@ -1,8 +1,8 @@ #ifndef J3DFIFO_H #define J3DFIFO_H -#include -#include +#include +#include inline void J3DFifoLoadBPCmd(u32 regval) { GXCmd1u8(GX_LOAD_BP_REG); diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DGD.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DGD.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DGD.h index 7ce625f753..e61ca2fa30 100644 --- a/include/JSystem/J3DGraphBase/J3DGD.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DGD.h @@ -1,8 +1,8 @@ #ifndef J3DGD_H #define J3DGD_H -#include -#include +#include +#include inline void J3DGDWrite_u8(u8 data) { __GDWrite(data); diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DMatBlock.h similarity index 100% rename from include/JSystem/J3DGraphBase/J3DMatBlock.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DMatBlock.h diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DMaterial.h similarity index 100% rename from include/JSystem/J3DGraphBase/J3DMaterial.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DMaterial.h diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DPacket.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DPacket.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DPacket.h index 3e94e1830c..79e19651e4 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DPacket.h @@ -4,8 +4,8 @@ #include "JSystem/J3DAssert.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DGraphBase/J3DEnum.h" -#include -#include +#include +#include #include class J3DMatPacket; diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DShape.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h index 0735d8aa6e..2a1ba0322b 100644 --- a/include/JSystem/J3DGraphBase/J3DShape.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphBase/J3DShapeDraw.h" #include "JSystem/J3DAssert.h" #include "JSystem/J3DGraphBase/J3DFifo.h" -#include +#include #include "dusk/endian_gx.hpp" class J3DShapeMtx; diff --git a/include/JSystem/J3DGraphBase/J3DShapeDraw.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeDraw.h similarity index 95% rename from include/JSystem/J3DGraphBase/J3DShapeDraw.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeDraw.h index ad3f7ec4cb..e6e8d61786 100644 --- a/include/JSystem/J3DGraphBase/J3DShapeDraw.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeDraw.h @@ -1,7 +1,7 @@ #ifndef J3DSHAPEDRAW_H #define J3DSHAPEDRAW_H -#include +#include /** * @ingroup jsystem-j3d diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeMtx.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DShapeMtx.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeMtx.h index e6bdcf1993..313fa1ef30 100644 --- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeMtx.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DShape.h" #include "JSystem/J3DAssert.h" -#include +#include #include "dusk/endian.h" class J3DTexMtx; diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.h similarity index 98% rename from include/JSystem/J3DGraphBase/J3DStruct.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.h index 59fb3b14c0..422cc0fcf6 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.h @@ -1,9 +1,9 @@ #ifndef J3DSTRUCT_H #define J3DSTRUCT_H -#include -#include -#include +#include +#include +#include #include "global.h" #include "JSystem/JMath/JMath.h" diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DSys.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h index bd870d07e4..417bd68790 100644 --- a/include/JSystem/J3DGraphBase/J3DSys.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h @@ -1,8 +1,8 @@ #ifndef J3DSYS_H #define J3DSYS_H -#include -#include +#include +#include #include "JSystem/J3DAssert.h" #include "JSystem/JMath/JMath.h" diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTevs.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DTevs.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DTevs.h index 4c21d1374f..36d2b467c2 100644 --- a/include/JSystem/J3DGraphBase/J3DTevs.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTevs.h @@ -1,8 +1,8 @@ #ifndef J3DTEVS_H #define J3DTEVS_H -#include -#include +#include +#include #include "JSystem/J3DGraphBase/J3DGD.h" #include "JSystem/J3DGraphBase/J3DStruct.h" diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTexture.h similarity index 100% rename from include/JSystem/J3DGraphBase/J3DTexture.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DTexture.h diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTransform.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DTransform.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DTransform.h index 523bf81c69..f8f27b26d9 100644 --- a/include/JSystem/J3DGraphBase/J3DTransform.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTransform.h @@ -1,7 +1,7 @@ #ifndef J3DTRANSFORM_H #define J3DTRANSFORM_H -#include +#include #include "JSystem/JMath/JMath.h" struct J3DTextureSRTInfo; diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.h similarity index 98% rename from include/JSystem/J3DGraphBase/J3DVertex.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.h index 50b2dbeec0..84eea5ad2a 100644 --- a/include/JSystem/J3DGraphBase/J3DVertex.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.h @@ -1,8 +1,8 @@ #ifndef J3DVERTEX_H #define J3DVERTEX_H -#include -#include +#include +#include #include "dusk/endian_gx.hpp" class J3DModel; diff --git a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DAnmLoader.h similarity index 100% rename from include/JSystem/J3DGraphLoader/J3DAnmLoader.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DAnmLoader.h diff --git a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DClusterLoader.h similarity index 100% rename from include/JSystem/J3DGraphLoader/J3DClusterLoader.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DClusterLoader.h diff --git a/include/JSystem/J3DGraphLoader/J3DJointFactory.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DJointFactory.h similarity index 100% rename from include/JSystem/J3DGraphLoader/J3DJointFactory.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DJointFactory.h diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h similarity index 99% rename from include/JSystem/J3DGraphLoader/J3DMaterialFactory.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h index e3834dc87f..9e5f9f14fe 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "JSystem/J3DGraphLoader/J3DModelLoader.h" -#include +#include class J3DMaterial; diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h similarity index 99% rename from include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h index e59d158959..381c27a1e7 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "JSystem/J3DGraphLoader/J3DModelLoader.h" -#include +#include class J3DMaterial; struct J3DTexCoord2Info; diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.h similarity index 99% rename from include/JSystem/J3DGraphLoader/J3DModelLoader.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.h index aea921eb81..1aa2bfb13c 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.h @@ -2,7 +2,7 @@ #define J3DMODELLOADER_H #include "JSystem/J3DGraphBase/J3DSys.h" -#include +#include #include "dusk/endian.h" diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h similarity index 79% rename from include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h index 2fec016614..f9a2347fdc 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h @@ -1,6 +1,6 @@ #ifndef J3DMODELLOADERCALCSIZE_H #define J3DMODELLOADERCALCSIZE_H -#include +#include #endif /* J3DMODELLOADERCALCSIZE_H */ diff --git a/include/JSystem/J3DGraphLoader/J3DModelSaver.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelSaver.h similarity index 100% rename from include/JSystem/J3DGraphLoader/J3DModelSaver.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelSaver.h diff --git a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DShapeFactory.h similarity index 99% rename from include/JSystem/J3DGraphLoader/J3DShapeFactory.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DShapeFactory.h index cacba467be..22ebd1a19b 100644 --- a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DShapeFactory.h @@ -2,7 +2,7 @@ #define J3DSHAPEFACTORY_H #include "JSystem/J3DGraphLoader/J3DModelLoader.h" -#include +#include class J3DShape; class J3DShapeMtx; diff --git a/include/JSystem/J3DU/J3DUClipper.h b/libs/JSystem/include/JSystem/J3DU/J3DUClipper.h similarity index 97% rename from include/JSystem/J3DU/J3DUClipper.h rename to libs/JSystem/include/JSystem/J3DU/J3DUClipper.h index af5d655f12..0a3c9de1ea 100644 --- a/include/JSystem/J3DU/J3DUClipper.h +++ b/libs/JSystem/include/JSystem/J3DU/J3DUClipper.h @@ -1,7 +1,7 @@ #ifndef J3DUCLIPPER_H #define J3DUCLIPPER_H -#include +#include /** * @ingroup jsystem-j3d diff --git a/include/JSystem/J3DU/J3DUD.h b/libs/JSystem/include/JSystem/J3DU/J3DUD.h similarity index 90% rename from include/JSystem/J3DU/J3DUD.h rename to libs/JSystem/include/JSystem/J3DU/J3DUD.h index 1386f1c6c8..48b501944c 100644 --- a/include/JSystem/J3DU/J3DUD.h +++ b/libs/JSystem/include/JSystem/J3DU/J3DUD.h @@ -1,7 +1,7 @@ #ifndef J3DUD_H #define J3DUD_H -#include "dolphin/types.h" +#include #ifndef __MWERKS__ #include #endif diff --git a/include/JSystem/J3DU/J3DUDL.h b/libs/JSystem/include/JSystem/J3DU/J3DUDL.h similarity index 100% rename from include/JSystem/J3DU/J3DUDL.h rename to libs/JSystem/include/JSystem/J3DU/J3DUDL.h diff --git a/include/JSystem/J3DU/J3DUFur.h b/libs/JSystem/include/JSystem/J3DU/J3DUFur.h similarity index 100% rename from include/JSystem/J3DU/J3DUFur.h rename to libs/JSystem/include/JSystem/J3DU/J3DUFur.h diff --git a/include/JSystem/J3DU/J3DUMotion.h b/libs/JSystem/include/JSystem/J3DU/J3DUMotion.h similarity index 100% rename from include/JSystem/J3DU/J3DUMotion.h rename to libs/JSystem/include/JSystem/J3DU/J3DUMotion.h diff --git a/include/JSystem/J3DU/J3DUShadow.h b/libs/JSystem/include/JSystem/J3DU/J3DUShadow.h similarity index 100% rename from include/JSystem/J3DU/J3DUShadow.h rename to libs/JSystem/include/JSystem/J3DU/J3DUShadow.h diff --git a/include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h b/libs/JSystem/include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h similarity index 100% rename from include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h rename to libs/JSystem/include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h diff --git a/include/JSystem/JAHostIO/JAHFrameNode.h b/libs/JSystem/include/JSystem/JAHostIO/JAHFrameNode.h similarity index 96% rename from include/JSystem/JAHostIO/JAHFrameNode.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHFrameNode.h index ed9830e8b3..1b4ad74043 100644 --- a/include/JSystem/JAHostIO/JAHFrameNode.h +++ b/libs/JSystem/include/JSystem/JAHostIO/JAHFrameNode.h @@ -1,7 +1,7 @@ #ifndef JAHFRAMENODE_H #define JAHFRAMENODE_H -#include +#include #include "JSystem/JAHostIO/JAHioNode.h" class JAHVirtualNode; diff --git a/include/JSystem/JAHostIO/JAHPubDefine.h b/libs/JSystem/include/JSystem/JAHostIO/JAHPubDefine.h similarity index 100% rename from include/JSystem/JAHostIO/JAHPubDefine.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHPubDefine.h diff --git a/include/JSystem/JAHostIO/JAHUTableEdit.h b/libs/JSystem/include/JSystem/JAHostIO/JAHUTableEdit.h similarity index 100% rename from include/JSystem/JAHostIO/JAHUTableEdit.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHUTableEdit.h diff --git a/include/JSystem/JAHostIO/JAHVirtualNode.h b/libs/JSystem/include/JSystem/JAHostIO/JAHVirtualNode.h similarity index 100% rename from include/JSystem/JAHostIO/JAHVirtualNode.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHVirtualNode.h diff --git a/include/JSystem/JAHostIO/JAHioMessage.h b/libs/JSystem/include/JSystem/JAHostIO/JAHioMessage.h similarity index 97% rename from include/JSystem/JAHostIO/JAHioMessage.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHioMessage.h index 766456bc10..558882bfa3 100644 --- a/include/JSystem/JAHostIO/JAHioMessage.h +++ b/libs/JSystem/include/JSystem/JAHostIO/JAHioMessage.h @@ -1,7 +1,7 @@ #ifndef JAHIOMESSAGE_H #define JAHIOMESSAGE_H -#include +#include class JAHioNode; class JORMContext; diff --git a/include/JSystem/JAHostIO/JAHioMgr.h b/libs/JSystem/include/JSystem/JAHostIO/JAHioMgr.h similarity index 100% rename from include/JSystem/JAHostIO/JAHioMgr.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHioMgr.h diff --git a/include/JSystem/JAHostIO/JAHioNode.h b/libs/JSystem/include/JSystem/JAHostIO/JAHioNode.h similarity index 100% rename from include/JSystem/JAHostIO/JAHioNode.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHioNode.h diff --git a/include/JSystem/JAHostIO/JAHioUtil.h b/libs/JSystem/include/JSystem/JAHostIO/JAHioUtil.h similarity index 100% rename from include/JSystem/JAHostIO/JAHioUtil.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHioUtil.h diff --git a/include/JSystem/JAWExtSystem/JAWExtSystem.h b/libs/JSystem/include/JSystem/JAWExtSystem/JAWExtSystem.h similarity index 100% rename from include/JSystem/JAWExtSystem/JAWExtSystem.h rename to libs/JSystem/include/JSystem/JAWExtSystem/JAWExtSystem.h diff --git a/include/JSystem/JAWExtSystem/JAWGraphContext.h b/libs/JSystem/include/JSystem/JAWExtSystem/JAWGraphContext.h similarity index 100% rename from include/JSystem/JAWExtSystem/JAWGraphContext.h rename to libs/JSystem/include/JSystem/JAWExtSystem/JAWGraphContext.h diff --git a/include/JSystem/JAWExtSystem/JAWSystem.h b/libs/JSystem/include/JSystem/JAWExtSystem/JAWSystem.h similarity index 100% rename from include/JSystem/JAWExtSystem/JAWSystem.h rename to libs/JSystem/include/JSystem/JAWExtSystem/JAWSystem.h diff --git a/include/JSystem/JAWExtSystem/JAWWindow.h b/libs/JSystem/include/JSystem/JAWExtSystem/JAWWindow.h similarity index 100% rename from include/JSystem/JAWExtSystem/JAWWindow.h rename to libs/JSystem/include/JSystem/JAWExtSystem/JAWWindow.h diff --git a/include/JSystem/JAWExtSystem/JAWWindow3D.h b/libs/JSystem/include/JSystem/JAWExtSystem/JAWWindow3D.h similarity index 100% rename from include/JSystem/JAWExtSystem/JAWWindow3D.h rename to libs/JSystem/include/JSystem/JAWExtSystem/JAWWindow3D.h diff --git a/include/JSystem/JAWWinLib/JAWBankView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWBankView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWBankView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWBankView.h diff --git a/include/JSystem/JAWWinLib/JAWChView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWChView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWChView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWChView.h diff --git a/include/JSystem/JAWWinLib/JAWEntrySeView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWEntrySeView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWEntrySeView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWEntrySeView.h diff --git a/include/JSystem/JAWWinLib/JAWHioBankEdit.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWHioBankEdit.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWHioBankEdit.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWHioBankEdit.h diff --git a/include/JSystem/JAWWinLib/JAWHioReceiver.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWHioReceiver.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWHioReceiver.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWHioReceiver.h diff --git a/include/JSystem/JAWWinLib/JAWPlaySeView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWPlaySeView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWPlaySeView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWPlaySeView.h diff --git a/include/JSystem/JAWWinLib/JAWPlayerChView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWPlayerChView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWPlayerChView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWPlayerChView.h diff --git a/include/JSystem/JAWWinLib/JAWReportView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWReportView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWReportView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWReportView.h diff --git a/include/JSystem/JAWWinLib/JAWSysMemView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWSysMemView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWSysMemView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWSysMemView.h diff --git a/include/JSystem/JAWWinLib/JAWVolume.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWVolume.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWVolume.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWVolume.h diff --git a/include/JSystem/JAudio2/JAIAudible.h b/libs/JSystem/include/JSystem/JAudio2/JAIAudible.h similarity index 100% rename from include/JSystem/JAudio2/JAIAudible.h rename to libs/JSystem/include/JSystem/JAudio2/JAIAudible.h diff --git a/include/JSystem/JAudio2/JAIAudience.h b/libs/JSystem/include/JSystem/JAudio2/JAIAudience.h similarity index 100% rename from include/JSystem/JAudio2/JAIAudience.h rename to libs/JSystem/include/JSystem/JAudio2/JAIAudience.h diff --git a/include/JSystem/JAudio2/JAISe.h b/libs/JSystem/include/JSystem/JAudio2/JAISe.h similarity index 100% rename from include/JSystem/JAudio2/JAISe.h rename to libs/JSystem/include/JSystem/JAudio2/JAISe.h diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAISeMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAISeMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAISeMgr.h diff --git a/include/JSystem/JAudio2/JAISeq.h b/libs/JSystem/include/JSystem/JAudio2/JAISeq.h similarity index 100% rename from include/JSystem/JAudio2/JAISeq.h rename to libs/JSystem/include/JSystem/JAudio2/JAISeq.h diff --git a/include/JSystem/JAudio2/JAISeqDataMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAISeqDataMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAISeqDataMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAISeqDataMgr.h diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAISeqMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAISeqMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAISeqMgr.h diff --git a/include/JSystem/JAudio2/JAISound.h b/libs/JSystem/include/JSystem/JAudio2/JAISound.h similarity index 100% rename from include/JSystem/JAudio2/JAISound.h rename to libs/JSystem/include/JSystem/JAudio2/JAISound.h diff --git a/include/JSystem/JAudio2/JAISoundChild.h b/libs/JSystem/include/JSystem/JAudio2/JAISoundChild.h similarity index 100% rename from include/JSystem/JAudio2/JAISoundChild.h rename to libs/JSystem/include/JSystem/JAudio2/JAISoundChild.h diff --git a/include/JSystem/JAudio2/JAISoundHandles.h b/libs/JSystem/include/JSystem/JAudio2/JAISoundHandles.h similarity index 100% rename from include/JSystem/JAudio2/JAISoundHandles.h rename to libs/JSystem/include/JSystem/JAudio2/JAISoundHandles.h diff --git a/include/JSystem/JAudio2/JAISoundInfo.h b/libs/JSystem/include/JSystem/JAudio2/JAISoundInfo.h similarity index 100% rename from include/JSystem/JAudio2/JAISoundInfo.h rename to libs/JSystem/include/JSystem/JAudio2/JAISoundInfo.h diff --git a/include/JSystem/JAudio2/JAISoundParams.h b/libs/JSystem/include/JSystem/JAudio2/JAISoundParams.h similarity index 100% rename from include/JSystem/JAudio2/JAISoundParams.h rename to libs/JSystem/include/JSystem/JAudio2/JAISoundParams.h diff --git a/include/JSystem/JAudio2/JAISoundStarter.h b/libs/JSystem/include/JSystem/JAudio2/JAISoundStarter.h similarity index 100% rename from include/JSystem/JAudio2/JAISoundStarter.h rename to libs/JSystem/include/JSystem/JAudio2/JAISoundStarter.h diff --git a/include/JSystem/JAudio2/JAIStream.h b/libs/JSystem/include/JSystem/JAudio2/JAIStream.h similarity index 100% rename from include/JSystem/JAudio2/JAIStream.h rename to libs/JSystem/include/JSystem/JAudio2/JAIStream.h diff --git a/include/JSystem/JAudio2/JAIStreamDataMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAIStreamDataMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAIStreamDataMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAIStreamDataMgr.h diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAIStreamMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAIStreamMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAIStreamMgr.h diff --git a/include/JSystem/JAudio2/JASAiCtrl.h b/libs/JSystem/include/JSystem/JAudio2/JASAiCtrl.h similarity index 98% rename from include/JSystem/JAudio2/JASAiCtrl.h rename to libs/JSystem/include/JSystem/JAudio2/JASAiCtrl.h index cebae770f8..5bba1b94ee 100644 --- a/include/JSystem/JAudio2/JASAiCtrl.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASAiCtrl.h @@ -1,7 +1,7 @@ #ifndef JASAICTRL_H #define JASAICTRL_H -#include +#include enum JASOutputRate { OUTPUT_RATE_0, diff --git a/include/JSystem/JAudio2/JASAramStream.h b/libs/JSystem/include/JSystem/JAudio2/JASAramStream.h similarity index 99% rename from include/JSystem/JAudio2/JASAramStream.h rename to libs/JSystem/include/JSystem/JAudio2/JASAramStream.h index 385b47f627..17d4c6f521 100644 --- a/include/JSystem/JAudio2/JASAramStream.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASAramStream.h @@ -3,7 +3,7 @@ #include "JSystem/JAudio2/JASTaskThread.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include class JASChannel; diff --git a/include/JSystem/JAudio2/JASAudioReseter.h b/libs/JSystem/include/JSystem/JAudio2/JASAudioReseter.h similarity index 94% rename from include/JSystem/JAudio2/JASAudioReseter.h rename to libs/JSystem/include/JSystem/JAudio2/JASAudioReseter.h index 2c699b0eb0..9b5065df89 100644 --- a/include/JSystem/JAudio2/JASAudioReseter.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASAudioReseter.h @@ -1,7 +1,7 @@ #ifndef JASAUDIORESETER_H #define JASAUDIORESETER_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASAudioThread.h b/libs/JSystem/include/JSystem/JAudio2/JASAudioThread.h similarity index 100% rename from include/JSystem/JAudio2/JASAudioThread.h rename to libs/JSystem/include/JSystem/JAudio2/JASAudioThread.h diff --git a/include/JSystem/JAudio2/JASBNKParser.h b/libs/JSystem/include/JSystem/JAudio2/JASBNKParser.h similarity index 100% rename from include/JSystem/JAudio2/JASBNKParser.h rename to libs/JSystem/include/JSystem/JAudio2/JASBNKParser.h diff --git a/include/JSystem/JAudio2/JASBank.h b/libs/JSystem/include/JSystem/JAudio2/JASBank.h similarity index 97% rename from include/JSystem/JAudio2/JASBank.h rename to libs/JSystem/include/JSystem/JAudio2/JASBank.h index 1a99601f3d..516eaa161b 100644 --- a/include/JSystem/JAudio2/JASBank.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASBank.h @@ -1,7 +1,7 @@ #ifndef JASBANK_H #define JASBANK_H -#include +#include class JASChannel; struct JASInstParam; diff --git a/include/JSystem/JAudio2/JASBankList.h b/libs/JSystem/include/JSystem/JAudio2/JASBankList.h similarity index 89% rename from include/JSystem/JAudio2/JASBankList.h rename to libs/JSystem/include/JSystem/JAudio2/JASBankList.h index 6d3fd44088..39ecb01935 100644 --- a/include/JSystem/JAudio2/JASBankList.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASBankList.h @@ -1,7 +1,7 @@ #ifndef JASBANKLIST_H #define JASBANKLIST_H -#include +#include class JASBank; diff --git a/include/JSystem/JAudio2/JASBankTable.h b/libs/JSystem/include/JSystem/JAudio2/JASBankTable.h similarity index 100% rename from include/JSystem/JAudio2/JASBankTable.h rename to libs/JSystem/include/JSystem/JAudio2/JASBankTable.h diff --git a/include/JSystem/JAudio2/JASBasicBank.h b/libs/JSystem/include/JSystem/JAudio2/JASBasicBank.h similarity index 100% rename from include/JSystem/JAudio2/JASBasicBank.h rename to libs/JSystem/include/JSystem/JAudio2/JASBasicBank.h diff --git a/include/JSystem/JAudio2/JASBasicInst.h b/libs/JSystem/include/JSystem/JAudio2/JASBasicInst.h similarity index 100% rename from include/JSystem/JAudio2/JASBasicInst.h rename to libs/JSystem/include/JSystem/JAudio2/JASBasicInst.h diff --git a/include/JSystem/JAudio2/JASBasicWaveBank.h b/libs/JSystem/include/JSystem/JAudio2/JASBasicWaveBank.h similarity index 100% rename from include/JSystem/JAudio2/JASBasicWaveBank.h rename to libs/JSystem/include/JSystem/JAudio2/JASBasicWaveBank.h diff --git a/include/JSystem/JAudio2/JASCalc.h b/libs/JSystem/include/JSystem/JAudio2/JASCalc.h similarity index 97% rename from include/JSystem/JAudio2/JASCalc.h rename to libs/JSystem/include/JSystem/JAudio2/JASCalc.h index 7e22ec1240..bb8054675f 100644 --- a/include/JSystem/JAudio2/JASCalc.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASCalc.h @@ -1,7 +1,7 @@ #ifndef JASCALC_H #define JASCALC_H -#include +#include #include /** diff --git a/include/JSystem/JAudio2/JASCallback.h b/libs/JSystem/include/JSystem/JAudio2/JASCallback.h similarity index 95% rename from include/JSystem/JAudio2/JASCallback.h rename to libs/JSystem/include/JSystem/JAudio2/JASCallback.h index f1dddc7492..4850f8d369 100644 --- a/include/JSystem/JAudio2/JASCallback.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASCallback.h @@ -1,7 +1,7 @@ #ifndef JASCALLBACK_H #define JASCALLBACK_H -#include +#include typedef s32 JASCallback(void*); diff --git a/include/JSystem/JAudio2/JASChannel.h b/libs/JSystem/include/JSystem/JAudio2/JASChannel.h similarity index 99% rename from include/JSystem/JAudio2/JASChannel.h rename to libs/JSystem/include/JSystem/JAudio2/JASChannel.h index 17cd0494b4..042e3343cd 100644 --- a/include/JSystem/JAudio2/JASChannel.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASChannel.h @@ -6,7 +6,7 @@ #include "JSystem/JAudio2/JASOscillator.h" #include "JSystem/JAudio2/JASSoundParams.h" #include "JSystem/JAudio2/JASWaveInfo.h" -#include +#include struct JASDSPChannel; diff --git a/include/JSystem/JAudio2/JASCmdStack.h b/libs/JSystem/include/JSystem/JAudio2/JASCmdStack.h similarity index 100% rename from include/JSystem/JAudio2/JASCmdStack.h rename to libs/JSystem/include/JSystem/JAudio2/JASCmdStack.h diff --git a/include/JSystem/JAudio2/JASCriticalSection.h b/libs/JSystem/include/JSystem/JAudio2/JASCriticalSection.h similarity index 93% rename from include/JSystem/JAudio2/JASCriticalSection.h rename to libs/JSystem/include/JSystem/JAudio2/JASCriticalSection.h index 44f5f21f4a..53faae80fe 100644 --- a/include/JSystem/JAudio2/JASCriticalSection.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASCriticalSection.h @@ -1,7 +1,7 @@ #ifndef JASCRITICALSECTION_H #define JASCRITICALSECTION_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASDSPChannel.h b/libs/JSystem/include/JSystem/JAudio2/JASDSPChannel.h similarity index 100% rename from include/JSystem/JAudio2/JASDSPChannel.h rename to libs/JSystem/include/JSystem/JAudio2/JASDSPChannel.h diff --git a/include/JSystem/JAudio2/JASDSPInterface.h b/libs/JSystem/include/JSystem/JAudio2/JASDSPInterface.h similarity index 99% rename from include/JSystem/JAudio2/JASDSPInterface.h rename to libs/JSystem/include/JSystem/JAudio2/JASDSPInterface.h index 0642fdc018..a653431bee 100644 --- a/include/JSystem/JAudio2/JASDSPInterface.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASDSPInterface.h @@ -1,7 +1,7 @@ #ifndef JASDSPINTERFACE_H #define JASDSPINTERFACE_H -#include +#include struct JASWaveInfo; diff --git a/include/JSystem/JAudio2/JASDriverIF.h b/libs/JSystem/include/JSystem/JAudio2/JASDriverIF.h similarity index 100% rename from include/JSystem/JAudio2/JASDriverIF.h rename to libs/JSystem/include/JSystem/JAudio2/JASDriverIF.h diff --git a/include/JSystem/JAudio2/JASDrumSet.h b/libs/JSystem/include/JSystem/JAudio2/JASDrumSet.h similarity index 100% rename from include/JSystem/JAudio2/JASDrumSet.h rename to libs/JSystem/include/JSystem/JAudio2/JASDrumSet.h diff --git a/include/JSystem/JAudio2/JASDvdThread.h b/libs/JSystem/include/JSystem/JAudio2/JASDvdThread.h similarity index 92% rename from include/JSystem/JAudio2/JASDvdThread.h rename to libs/JSystem/include/JSystem/JAudio2/JASDvdThread.h index 7fbe4e188f..553dffb7ca 100644 --- a/include/JSystem/JAudio2/JASDvdThread.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASDvdThread.h @@ -1,7 +1,7 @@ #ifndef JASDVDTHREAD_H #define JASDVDTHREAD_H -#include +#include class JASTaskThread; diff --git a/include/JSystem/JAudio2/JASGadget.h b/libs/JSystem/include/JSystem/JAudio2/JASGadget.h similarity index 100% rename from include/JSystem/JAudio2/JASGadget.h rename to libs/JSystem/include/JSystem/JAudio2/JASGadget.h diff --git a/include/JSystem/JAudio2/JASHeapCtrl.h b/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.h similarity index 99% rename from include/JSystem/JAudio2/JASHeapCtrl.h rename to libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.h index 196c79edd5..c3bc1a3702 100644 --- a/include/JSystem/JAudio2/JASHeapCtrl.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.h @@ -4,8 +4,8 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSUList.h" #include "JSystem/JUtility/JUTAssert.h" -#include -#include +#include +#include struct JASDisposer; class JKRHeap; diff --git a/include/JSystem/JAudio2/JASLfo.h b/libs/JSystem/include/JSystem/JAudio2/JASLfo.h similarity index 96% rename from include/JSystem/JAudio2/JASLfo.h rename to libs/JSystem/include/JSystem/JAudio2/JASLfo.h index ac76c9924a..adc27a8325 100644 --- a/include/JSystem/JAudio2/JASLfo.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASLfo.h @@ -1,7 +1,7 @@ #ifndef JASLFO_H #define JASLFO_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASMutex.h b/libs/JSystem/include/JSystem/JAudio2/JASMutex.h similarity index 92% rename from include/JSystem/JAudio2/JASMutex.h rename to libs/JSystem/include/JSystem/JAudio2/JASMutex.h index 3155f462c2..e6805d6029 100644 --- a/include/JSystem/JAudio2/JASMutex.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASMutex.h @@ -1,7 +1,7 @@ #ifndef JASMUTEX_H #define JASMUTEX_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASOscillator.h b/libs/JSystem/include/JSystem/JAudio2/JASOscillator.h similarity index 98% rename from include/JSystem/JAudio2/JASOscillator.h rename to libs/JSystem/include/JSystem/JAudio2/JASOscillator.h index 6797f40db5..746d462e12 100644 --- a/include/JSystem/JAudio2/JASOscillator.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASOscillator.h @@ -1,7 +1,7 @@ #ifndef JASOSCILLATOR_H #define JASOSCILLATOR_H -#include +#include #include "dusk/endian.h" /** diff --git a/include/JSystem/JAudio2/JASProbe.h b/libs/JSystem/include/JSystem/JAudio2/JASProbe.h similarity index 94% rename from include/JSystem/JAudio2/JASProbe.h rename to libs/JSystem/include/JSystem/JAudio2/JASProbe.h index a431f991f5..03337adce7 100644 --- a/include/JSystem/JAudio2/JASProbe.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASProbe.h @@ -1,7 +1,7 @@ #ifndef JASPROBE_H #define JASPROBE_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASRegisterParam.h b/libs/JSystem/include/JSystem/JAudio2/JASRegisterParam.h similarity index 93% rename from include/JSystem/JAudio2/JASRegisterParam.h rename to libs/JSystem/include/JSystem/JAudio2/JASRegisterParam.h index f02e3a1839..cd350d257b 100644 --- a/include/JSystem/JAudio2/JASRegisterParam.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASRegisterParam.h @@ -1,7 +1,7 @@ #ifndef JASREGISTERPARAM_H #define JASREGISTERPARAM_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASReport.h b/libs/JSystem/include/JSystem/JAudio2/JASReport.h similarity index 100% rename from include/JSystem/JAudio2/JASReport.h rename to libs/JSystem/include/JSystem/JAudio2/JASReport.h diff --git a/include/JSystem/JAudio2/JASResArcLoader.h b/libs/JSystem/include/JSystem/JAudio2/JASResArcLoader.h similarity index 98% rename from include/JSystem/JAudio2/JASResArcLoader.h rename to libs/JSystem/include/JSystem/JAudio2/JASResArcLoader.h index bcaf1fb06f..966b1199e7 100644 --- a/include/JSystem/JAudio2/JASResArcLoader.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASResArcLoader.h @@ -2,7 +2,7 @@ #define JASRESARCLOADER_H #include "JSystem/JKernel/JKRArchive.h" -#include +#include namespace JASResArcLoader { size_t getResSize(JKRArchive const*, u16); diff --git a/include/JSystem/JAudio2/JASSeqCtrl.h b/libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.h similarity index 100% rename from include/JSystem/JAudio2/JASSeqCtrl.h rename to libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.h diff --git a/include/JSystem/JAudio2/JASSeqParser.h b/libs/JSystem/include/JSystem/JAudio2/JASSeqParser.h similarity index 99% rename from include/JSystem/JAudio2/JASSeqParser.h rename to libs/JSystem/include/JSystem/JAudio2/JASSeqParser.h index e8f425de84..096cbadd98 100644 --- a/include/JSystem/JAudio2/JASSeqParser.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASSeqParser.h @@ -1,7 +1,7 @@ #ifndef JASSEQPARSER_H #define JASSEQPARSER_H -#include +#include struct JASTrack; diff --git a/include/JSystem/JAudio2/JASSeqReader.h b/libs/JSystem/include/JSystem/JAudio2/JASSeqReader.h similarity index 98% rename from include/JSystem/JAudio2/JASSeqReader.h rename to libs/JSystem/include/JSystem/JAudio2/JASSeqReader.h index 2fed6253fe..9dce7f56f7 100644 --- a/include/JSystem/JAudio2/JASSeqReader.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASSeqReader.h @@ -1,7 +1,7 @@ #ifndef JASSEQREADER_H #define JASSEQREADER_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASSimpleWaveBank.h b/libs/JSystem/include/JSystem/JAudio2/JASSimpleWaveBank.h similarity index 100% rename from include/JSystem/JAudio2/JASSimpleWaveBank.h rename to libs/JSystem/include/JSystem/JAudio2/JASSimpleWaveBank.h diff --git a/include/JSystem/JAudio2/JASSoundParams.h b/libs/JSystem/include/JSystem/JAudio2/JASSoundParams.h similarity index 98% rename from include/JSystem/JAudio2/JASSoundParams.h rename to libs/JSystem/include/JSystem/JAudio2/JASSoundParams.h index a7314da2f0..122e5b684d 100644 --- a/include/JSystem/JAudio2/JASSoundParams.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASSoundParams.h @@ -1,7 +1,7 @@ #ifndef JASSOUNDPARAMS_H #define JASSOUNDPARAMS_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASTaskThread.h b/libs/JSystem/include/JSystem/JAudio2/JASTaskThread.h similarity index 100% rename from include/JSystem/JAudio2/JASTaskThread.h rename to libs/JSystem/include/JSystem/JAudio2/JASTaskThread.h diff --git a/include/JSystem/JAudio2/JASTrack.h b/libs/JSystem/include/JSystem/JAudio2/JASTrack.h similarity index 100% rename from include/JSystem/JAudio2/JASTrack.h rename to libs/JSystem/include/JSystem/JAudio2/JASTrack.h diff --git a/include/JSystem/JAudio2/JASTrackPort.h b/libs/JSystem/include/JSystem/JAudio2/JASTrackPort.h similarity index 95% rename from include/JSystem/JAudio2/JASTrackPort.h rename to libs/JSystem/include/JSystem/JAudio2/JASTrackPort.h index 536f85eada..393a701c27 100644 --- a/include/JSystem/JAudio2/JASTrackPort.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASTrackPort.h @@ -1,7 +1,7 @@ #ifndef JASTRACKPORT_H #define JASTRACKPORT_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASVoiceBank.h b/libs/JSystem/include/JSystem/JAudio2/JASVoiceBank.h similarity index 100% rename from include/JSystem/JAudio2/JASVoiceBank.h rename to libs/JSystem/include/JSystem/JAudio2/JASVoiceBank.h diff --git a/include/JSystem/JAudio2/JASWSParser.h b/libs/JSystem/include/JSystem/JAudio2/JASWSParser.h similarity index 100% rename from include/JSystem/JAudio2/JASWSParser.h rename to libs/JSystem/include/JSystem/JAudio2/JASWSParser.h diff --git a/include/JSystem/JAudio2/JASWaveArcLoader.h b/libs/JSystem/include/JSystem/JAudio2/JASWaveArcLoader.h similarity index 98% rename from include/JSystem/JAudio2/JASWaveArcLoader.h rename to libs/JSystem/include/JSystem/JAudio2/JASWaveArcLoader.h index a3e930ebf1..593e69f1fd 100644 --- a/include/JSystem/JAudio2/JASWaveArcLoader.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASWaveArcLoader.h @@ -2,7 +2,7 @@ #define JASWAVEARCLOADER_H #include "JSystem/JAudio2/JASHeapCtrl.h" -#include +#include class JKRHeap; class JKRSolidHeap; diff --git a/include/JSystem/JAudio2/JASWaveInfo.h b/libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h similarity index 97% rename from include/JSystem/JAudio2/JASWaveInfo.h rename to libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h index 414895e41f..cbff6d3ac2 100644 --- a/include/JSystem/JAudio2/JASWaveInfo.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h @@ -1,7 +1,7 @@ #ifndef JASWAVEINFO_H #define JASWAVEINFO_H -#include +#include class JASWaveArc; diff --git a/include/JSystem/JAudio2/JAUAudibleParam.h b/libs/JSystem/include/JSystem/JAudio2/JAUAudibleParam.h similarity index 96% rename from include/JSystem/JAudio2/JAUAudibleParam.h rename to libs/JSystem/include/JSystem/JAudio2/JAUAudibleParam.h index 0fd3058f82..89b016cb0a 100644 --- a/include/JSystem/JAudio2/JAUAudibleParam.h +++ b/libs/JSystem/include/JSystem/JAudio2/JAUAudibleParam.h @@ -1,7 +1,7 @@ #ifndef JAUAUDIBLEPARAM_H #define JAUAUDIBLEPARAM_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JAUAudience.h b/libs/JSystem/include/JSystem/JAudio2/JAUAudience.h similarity index 100% rename from include/JSystem/JAudio2/JAUAudience.h rename to libs/JSystem/include/JSystem/JAudio2/JAUAudience.h diff --git a/include/JSystem/JAudio2/JAUAudioArcInterpreter.h b/libs/JSystem/include/JSystem/JAudio2/JAUAudioArcInterpreter.h similarity index 97% rename from include/JSystem/JAudio2/JAUAudioArcInterpreter.h rename to libs/JSystem/include/JSystem/JAudio2/JAUAudioArcInterpreter.h index 801b6ea465..c36ad44b22 100644 --- a/include/JSystem/JAudio2/JAUAudioArcInterpreter.h +++ b/libs/JSystem/include/JSystem/JAudio2/JAUAudioArcInterpreter.h @@ -1,7 +1,7 @@ #ifndef JAUAUDIOARCINTERPRETER_H #define JAUAUDIOARCINTERPRETER_H -#include +#include #include "dusk/endian.h" /** diff --git a/include/JSystem/JAudio2/JAUAudioArcLoader.h b/libs/JSystem/include/JSystem/JAudio2/JAUAudioArcLoader.h similarity index 100% rename from include/JSystem/JAudio2/JAUAudioArcLoader.h rename to libs/JSystem/include/JSystem/JAudio2/JAUAudioArcLoader.h diff --git a/include/JSystem/JAudio2/JAUAudioMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAUAudioMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAUAudioMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAUAudioMgr.h diff --git a/include/JSystem/JAudio2/JAUBankTable.h b/libs/JSystem/include/JSystem/JAudio2/JAUBankTable.h similarity index 100% rename from include/JSystem/JAudio2/JAUBankTable.h rename to libs/JSystem/include/JSystem/JAudio2/JAUBankTable.h diff --git a/include/JSystem/JAudio2/JAUClusterSound.h b/libs/JSystem/include/JSystem/JAudio2/JAUClusterSound.h similarity index 100% rename from include/JSystem/JAudio2/JAUClusterSound.h rename to libs/JSystem/include/JSystem/JAudio2/JAUClusterSound.h diff --git a/include/JSystem/JAudio2/JAUInitializer.h b/libs/JSystem/include/JSystem/JAudio2/JAUInitializer.h similarity index 97% rename from include/JSystem/JAudio2/JAUInitializer.h rename to libs/JSystem/include/JSystem/JAudio2/JAUInitializer.h index 77f28218dc..8b5090c580 100644 --- a/include/JSystem/JAudio2/JAUInitializer.h +++ b/libs/JSystem/include/JSystem/JAudio2/JAUInitializer.h @@ -1,7 +1,7 @@ #ifndef JAUINITIALIZER_H #define JAUINITIALIZER_H -#include +#include class JKRSolidHeap; diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/libs/JSystem/include/JSystem/JAudio2/JAUSectionHeap.h similarity index 100% rename from include/JSystem/JAudio2/JAUSectionHeap.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSectionHeap.h diff --git a/include/JSystem/JAudio2/JAUSeqCollection.h b/libs/JSystem/include/JSystem/JAudio2/JAUSeqCollection.h similarity index 100% rename from include/JSystem/JAudio2/JAUSeqCollection.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSeqCollection.h diff --git a/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAUSeqDataBlockMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h diff --git a/include/JSystem/JAudio2/JAUSoundAnimator.h b/libs/JSystem/include/JSystem/JAudio2/JAUSoundAnimator.h similarity index 100% rename from include/JSystem/JAudio2/JAUSoundAnimator.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSoundAnimator.h diff --git a/include/JSystem/JAudio2/JAUSoundInfo.h b/libs/JSystem/include/JSystem/JAudio2/JAUSoundInfo.h similarity index 100% rename from include/JSystem/JAudio2/JAUSoundInfo.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSoundInfo.h diff --git a/include/JSystem/JAudio2/JAUSoundObject.h b/libs/JSystem/include/JSystem/JAudio2/JAUSoundObject.h similarity index 100% rename from include/JSystem/JAudio2/JAUSoundObject.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSoundObject.h diff --git a/include/JSystem/JAudio2/JAUSoundTable.h b/libs/JSystem/include/JSystem/JAudio2/JAUSoundTable.h similarity index 100% rename from include/JSystem/JAudio2/JAUSoundTable.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSoundTable.h diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAUStreamAramMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAUStreamAramMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAUStreamAramMgr.h diff --git a/include/JSystem/JAudio2/JAUStreamFileTable.h b/libs/JSystem/include/JSystem/JAudio2/JAUStreamFileTable.h similarity index 100% rename from include/JSystem/JAudio2/JAUStreamFileTable.h rename to libs/JSystem/include/JSystem/JAudio2/JAUStreamFileTable.h diff --git a/include/JSystem/JAudio2/dspproc.h b/libs/JSystem/include/JSystem/JAudio2/dspproc.h similarity index 92% rename from include/JSystem/JAudio2/dspproc.h rename to libs/JSystem/include/JSystem/JAudio2/dspproc.h index 09266bbf81..868080031a 100644 --- a/include/JSystem/JAudio2/dspproc.h +++ b/libs/JSystem/include/JSystem/JAudio2/dspproc.h @@ -1,7 +1,7 @@ #ifndef DSPPROC_H #define DSPPROC_H -#include +#include void DSPReleaseHalt2(u32 msg); void DsetupTable(u32 param_0, u32 param_1, u32 param_2, u32 param_3, u32 param_4); diff --git a/include/JSystem/JAudio2/dsptask.h b/libs/JSystem/include/JSystem/JAudio2/dsptask.h similarity index 87% rename from include/JSystem/JAudio2/dsptask.h rename to libs/JSystem/include/JSystem/JAudio2/dsptask.h index b331a6c867..8042d1884b 100644 --- a/include/JSystem/JAudio2/dsptask.h +++ b/libs/JSystem/include/JSystem/JAudio2/dsptask.h @@ -1,7 +1,7 @@ #ifndef DSPTASK_H #define DSPTASK_H -#include +#include void DspBoot(void (*)(void*)); void DspFinishWork(u16 param_0); diff --git a/include/JSystem/JAudio2/osdsp.h b/libs/JSystem/include/JSystem/JAudio2/osdsp.h similarity index 85% rename from include/JSystem/JAudio2/osdsp.h rename to libs/JSystem/include/JSystem/JAudio2/osdsp.h index 7c3c91d0a3..8a929c4652 100644 --- a/include/JSystem/JAudio2/osdsp.h +++ b/libs/JSystem/include/JSystem/JAudio2/osdsp.h @@ -1,7 +1,7 @@ #ifndef OSDSP_H #define OSDSP_H -#include +#include extern "C" DSPTaskInfo* DSPAddTask(DSPTaskInfo*); void DSPAddPriorTask(STRUCT_DSP_TASK*); diff --git a/include/JSystem/JAudio2/osdsp_task.h b/libs/JSystem/include/JSystem/JAudio2/osdsp_task.h similarity index 86% rename from include/JSystem/JAudio2/osdsp_task.h rename to libs/JSystem/include/JSystem/JAudio2/osdsp_task.h index 6c662b50a3..4c74f290f1 100644 --- a/include/JSystem/JAudio2/osdsp_task.h +++ b/libs/JSystem/include/JSystem/JAudio2/osdsp_task.h @@ -1,7 +1,7 @@ #ifndef OSDSP_TASK_H #define OSDSP_TASK_H -#include +#include extern DSPTaskInfo* DSP_prior_task; diff --git a/include/JSystem/JFramework/JFWDisplay.h b/libs/JSystem/include/JSystem/JFramework/JFWDisplay.h similarity index 99% rename from include/JSystem/JFramework/JFWDisplay.h rename to libs/JSystem/include/JSystem/JFramework/JFWDisplay.h index 0df3b65171..28967cc0a2 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/libs/JSystem/include/JSystem/JFramework/JFWDisplay.h @@ -5,7 +5,7 @@ #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTFader.h" #include "JSystem/JUtility/JUTXfb.h" -#include +#include class JKRHeap; diff --git a/include/JSystem/JFramework/JFWSystem.h b/libs/JSystem/include/JSystem/JFramework/JFWSystem.h similarity index 96% rename from include/JSystem/JFramework/JFWSystem.h rename to libs/JSystem/include/JSystem/JFramework/JFWSystem.h index 230df0554f..bb4dfa01cd 100644 --- a/include/JSystem/JFramework/JFWSystem.h +++ b/libs/JSystem/include/JSystem/JFramework/JFWSystem.h @@ -1,7 +1,7 @@ #ifndef JFWSYSTEM_H #define JFWSYSTEM_H -#include +#include #include "JSystem/JUtility/JUTAssert.h" class JKRExpHeap; @@ -36,6 +36,7 @@ struct JFWSystem { static JUTConsole* getSystemConsole() { return systemConsole; } static JKRExpHeap* getSystemHeap() { return systemHeap; } + static JKRExpHeap* getRootHeap() { return rootHeap; } static JUTResFont* getSystemFont() { return systemFont; } static void setMaxStdHeap(int max) { diff --git a/include/JSystem/JGadget/binary.h b/libs/JSystem/include/JSystem/JGadget/binary.h similarity index 100% rename from include/JSystem/JGadget/binary.h rename to libs/JSystem/include/JSystem/JGadget/binary.h diff --git a/include/JSystem/JGadget/define.h b/libs/JSystem/include/JSystem/JGadget/define.h similarity index 98% rename from include/JSystem/JGadget/define.h rename to libs/JSystem/include/JSystem/JGadget/define.h index 3a1548e364..fa808985d8 100644 --- a/include/JSystem/JGadget/define.h +++ b/libs/JSystem/include/JSystem/JGadget/define.h @@ -1,7 +1,7 @@ #ifndef JGADGET_DEFINE_H #define JGADGET_DEFINE_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/JSystem/JGadget/linklist.h b/libs/JSystem/include/JSystem/JGadget/linklist.h similarity index 100% rename from include/JSystem/JGadget/linklist.h rename to libs/JSystem/include/JSystem/JGadget/linklist.h diff --git a/include/JSystem/JGadget/pointer.h b/libs/JSystem/include/JSystem/JGadget/pointer.h similarity index 100% rename from include/JSystem/JGadget/pointer.h rename to libs/JSystem/include/JSystem/JGadget/pointer.h diff --git a/include/JSystem/JGadget/search.h b/libs/JSystem/include/JSystem/JGadget/search.h similarity index 99% rename from include/JSystem/JGadget/search.h rename to libs/JSystem/include/JSystem/JGadget/search.h index 8ba98b79f1..c097d90c5b 100644 --- a/include/JSystem/JGadget/search.h +++ b/libs/JSystem/include/JSystem/JGadget/search.h @@ -1,7 +1,7 @@ #ifndef JGADGET_SEARCH_H #define JGADGET_SEARCH_H -#include +#include #include #include #include diff --git a/include/JSystem/JGadget/std-list.h b/libs/JSystem/include/JSystem/JGadget/std-list.h similarity index 100% rename from include/JSystem/JGadget/std-list.h rename to libs/JSystem/include/JSystem/JGadget/std-list.h diff --git a/include/JSystem/JGadget/std-memory.h b/libs/JSystem/include/JSystem/JGadget/std-memory.h similarity index 100% rename from include/JSystem/JGadget/std-memory.h rename to libs/JSystem/include/JSystem/JGadget/std-memory.h diff --git a/include/JSystem/JGadget/std-stream.h b/libs/JSystem/include/JSystem/JGadget/std-stream.h similarity index 100% rename from include/JSystem/JGadget/std-stream.h rename to libs/JSystem/include/JSystem/JGadget/std-stream.h diff --git a/include/JSystem/JGadget/std-streambuf.h b/libs/JSystem/include/JSystem/JGadget/std-streambuf.h similarity index 98% rename from include/JSystem/JGadget/std-streambuf.h rename to libs/JSystem/include/JSystem/JGadget/std-streambuf.h index dae56d317c..7f50621108 100644 --- a/include/JSystem/JGadget/std-streambuf.h +++ b/libs/JSystem/include/JSystem/JGadget/std-streambuf.h @@ -1,7 +1,7 @@ #ifndef JGADGET_STD_STREAMBUF_H #define JGADGET_STD_STREAMBUF_H -#include +#include #include namespace JGadget { diff --git a/include/JSystem/JGadget/std-vector.h b/libs/JSystem/include/JSystem/JGadget/std-vector.h similarity index 100% rename from include/JSystem/JGadget/std-vector.h rename to libs/JSystem/include/JSystem/JGadget/std-vector.h diff --git a/include/JSystem/JGadget/vector.h b/libs/JSystem/include/JSystem/JGadget/vector.h similarity index 100% rename from include/JSystem/JGadget/vector.h rename to libs/JSystem/include/JSystem/JGadget/vector.h diff --git a/include/JSystem/JGeometry.h b/libs/JSystem/include/JSystem/JGeometry.h similarity index 99% rename from include/JSystem/JGeometry.h rename to libs/JSystem/include/JSystem/JGeometry.h index 6177e366e2..5fd6484424 100644 --- a/include/JSystem/JGeometry.h +++ b/libs/JSystem/include/JSystem/JGeometry.h @@ -1,7 +1,7 @@ #ifndef JGEOMETRY_H #define JGEOMETRY_H -#include +#include #include #include "JSystem/JMath/JMath.h" diff --git a/include/JSystem/JHostIO/JHIComm.h b/libs/JSystem/include/JSystem/JHostIO/JHIComm.h similarity index 100% rename from include/JSystem/JHostIO/JHIComm.h rename to libs/JSystem/include/JSystem/JHostIO/JHIComm.h diff --git a/include/JSystem/JHostIO/JHICommonMem.h b/libs/JSystem/include/JSystem/JHostIO/JHICommonMem.h similarity index 98% rename from include/JSystem/JHostIO/JHICommonMem.h rename to libs/JSystem/include/JSystem/JHostIO/JHICommonMem.h index b0a08fa02e..3d8c452c72 100644 --- a/include/JSystem/JHostIO/JHICommonMem.h +++ b/libs/JSystem/include/JSystem/JHostIO/JHICommonMem.h @@ -1,7 +1,7 @@ #ifndef JHICOMMONMEM_H #define JHICOMMONMEM_H -#include +#include #include "dusk/endian.h" inline u32 JHIhtonl(u32 v) { diff --git a/include/JSystem/JHostIO/JHIMccBuf.h b/libs/JSystem/include/JSystem/JHostIO/JHIMccBuf.h similarity index 100% rename from include/JSystem/JHostIO/JHIMccBuf.h rename to libs/JSystem/include/JSystem/JHostIO/JHIMccBuf.h diff --git a/include/JSystem/JHostIO/JHIRMcc.h b/libs/JSystem/include/JSystem/JHostIO/JHIRMcc.h similarity index 77% rename from include/JSystem/JHostIO/JHIRMcc.h rename to libs/JSystem/include/JSystem/JHostIO/JHIRMcc.h index 9e8c00ca39..adcc95043f 100644 --- a/include/JSystem/JHostIO/JHIRMcc.h +++ b/libs/JSystem/include/JSystem/JHostIO/JHIRMcc.h @@ -1,7 +1,11 @@ #ifndef JHIRMCC_H #define JHIRMCC_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif struct JHIMccContext; diff --git a/include/JSystem/JHostIO/JHIhioASync.h b/libs/JSystem/include/JSystem/JHostIO/JHIhioASync.h similarity index 88% rename from include/JSystem/JHostIO/JHIhioASync.h rename to libs/JSystem/include/JSystem/JHostIO/JHIhioASync.h index fa9d90ef71..438da0235f 100644 --- a/include/JSystem/JHostIO/JHIhioASync.h +++ b/libs/JSystem/include/JSystem/JHostIO/JHIhioASync.h @@ -1,7 +1,7 @@ #ifndef JHIHIOASYNC_H #define JHIHIOASYNC_H -#include +#include struct JHIContext; diff --git a/include/JSystem/JHostIO/JOREntry.h b/libs/JSystem/include/JSystem/JHostIO/JOREntry.h similarity index 99% rename from include/JSystem/JHostIO/JOREntry.h rename to libs/JSystem/include/JSystem/JHostIO/JOREntry.h index da1ec2e68c..b4ab15a7bf 100644 --- a/include/JSystem/JHostIO/JOREntry.h +++ b/libs/JSystem/include/JSystem/JHostIO/JOREntry.h @@ -2,7 +2,7 @@ #define JORENTRY_H #include "JSystem/JHostIO/JHIComm.h" -#include +#include template class JHIpvector { diff --git a/include/JSystem/JHostIO/JORFile.h b/libs/JSystem/include/JSystem/JHostIO/JORFile.h similarity index 100% rename from include/JSystem/JHostIO/JORFile.h rename to libs/JSystem/include/JSystem/JHostIO/JORFile.h diff --git a/include/JSystem/JHostIO/JORHostInfo.h b/libs/JSystem/include/JSystem/JHostIO/JORHostInfo.h similarity index 94% rename from include/JSystem/JHostIO/JORHostInfo.h rename to libs/JSystem/include/JSystem/JHostIO/JORHostInfo.h index 965b00ef93..54ccd0ebf6 100644 --- a/include/JSystem/JHostIO/JORHostInfo.h +++ b/libs/JSystem/include/JSystem/JHostIO/JORHostInfo.h @@ -1,7 +1,11 @@ #ifndef JORHOSTINFO_H #define JORHOSTINFO_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #define HOSTINFO_REQ_COMPUTER_NAME 0 #define HOSTINFO_REQ_USERNAME 1 diff --git a/include/JSystem/JHostIO/JORMContext.h b/libs/JSystem/include/JSystem/JHostIO/JORMContext.h similarity index 99% rename from include/JSystem/JHostIO/JORMContext.h rename to libs/JSystem/include/JSystem/JHostIO/JORMContext.h index 551c2410f2..f80e34e7e8 100644 --- a/include/JSystem/JHostIO/JORMContext.h +++ b/libs/JSystem/include/JSystem/JHostIO/JORMContext.h @@ -1,14 +1,12 @@ #ifndef JORMCONTEXT_H #define JORMCONTEXT_H -#include - -#ifdef _MSVC_LANG -#include +#ifdef __REVOLUTION_SDK__ +#include #else -#include +#include #endif - +#include #include #include "JSystem/JHostIO/JORReflexible.h" #include "JSystem/JSupport/JSUMemoryStream.h" diff --git a/include/JSystem/JHostIO/JORReflexible.h b/libs/JSystem/include/JSystem/JHostIO/JORReflexible.h similarity index 98% rename from include/JSystem/JHostIO/JORReflexible.h rename to libs/JSystem/include/JSystem/JHostIO/JORReflexible.h index 9426611d02..6d65137e22 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/libs/JSystem/include/JSystem/JHostIO/JORReflexible.h @@ -1,7 +1,7 @@ #ifndef JORREFLEXIBLE_H #define JORREFLEXIBLE_H -#include +#include class JORReflexible; diff --git a/include/JSystem/JHostIO/JORServer.h b/libs/JSystem/include/JSystem/JHostIO/JORServer.h similarity index 98% rename from include/JSystem/JHostIO/JORServer.h rename to libs/JSystem/include/JSystem/JHostIO/JORServer.h index 32a9b6f19e..53f3283f6c 100644 --- a/include/JSystem/JHostIO/JORServer.h +++ b/libs/JSystem/include/JSystem/JHostIO/JORServer.h @@ -9,6 +9,7 @@ #include "JSystem/JUtility/JUTAssert.h" u32 JORMessageBox(const char* message, const char* title, u32 style); +int JORShellExecute(const char* param_0, const char* param_1, const char* param_2, const char* param_3, int param_4); struct JOREventCallbackListNode { JOREventCallbackListNode(u32, u32, bool); diff --git a/include/JSystem/JKernel/JKRAram.h b/libs/JSystem/include/JSystem/JKernel/JKRAram.h similarity index 100% rename from include/JSystem/JKernel/JKRAram.h rename to libs/JSystem/include/JSystem/JKernel/JKRAram.h diff --git a/include/JSystem/JKernel/JKRAramArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRAramArchive.h similarity index 100% rename from include/JSystem/JKernel/JKRAramArchive.h rename to libs/JSystem/include/JSystem/JKernel/JKRAramArchive.h diff --git a/include/JSystem/JKernel/JKRAramBlock.h b/libs/JSystem/include/JSystem/JKernel/JKRAramBlock.h similarity index 100% rename from include/JSystem/JKernel/JKRAramBlock.h rename to libs/JSystem/include/JSystem/JKernel/JKRAramBlock.h diff --git a/include/JSystem/JKernel/JKRAramHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRAramHeap.h similarity index 98% rename from include/JSystem/JKernel/JKRAramHeap.h rename to libs/JSystem/include/JSystem/JKernel/JKRAramHeap.h index 034a90c3eb..87a6e819a8 100644 --- a/include/JSystem/JKernel/JKRAramHeap.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRAramHeap.h @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRAramBlock.h" #include "JSystem/JKernel/JKRDisposer.h" -#include +#include /** * @ingroup jsystem-jkernel diff --git a/include/JSystem/JKernel/JKRAramPiece.h b/libs/JSystem/include/JSystem/JKernel/JKRAramPiece.h similarity index 96% rename from include/JSystem/JKernel/JKRAramPiece.h rename to libs/JSystem/include/JSystem/JKernel/JKRAramPiece.h index 130f81203b..51eeef27e9 100644 --- a/include/JSystem/JKernel/JKRAramPiece.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRAramPiece.h @@ -2,9 +2,13 @@ #define JKRARAMPIECE_H #include "JSystem/JSupport/JSUList.h" +#ifdef __REVOLUTION_SDK__ +#include +#include +#else #include #include -#include +#endif class JKRAramBlock; class JKRDecompCommand; diff --git a/include/JSystem/JKernel/JKRAramStream.h b/libs/JSystem/include/JSystem/JKernel/JKRAramStream.h similarity index 100% rename from include/JSystem/JKernel/JKRAramStream.h rename to libs/JSystem/include/JSystem/JKernel/JKRAramStream.h diff --git a/include/JSystem/JKernel/JKRArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRArchive.h similarity index 100% rename from include/JSystem/JKernel/JKRArchive.h rename to libs/JSystem/include/JSystem/JKernel/JKRArchive.h diff --git a/include/JSystem/JKernel/JKRAssertHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRAssertHeap.h similarity index 100% rename from include/JSystem/JKernel/JKRAssertHeap.h rename to libs/JSystem/include/JSystem/JKernel/JKRAssertHeap.h diff --git a/include/JSystem/JKernel/JKRCompArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRCompArchive.h similarity index 100% rename from include/JSystem/JKernel/JKRCompArchive.h rename to libs/JSystem/include/JSystem/JKernel/JKRCompArchive.h diff --git a/include/JSystem/JKernel/JKRCompression.h b/libs/JSystem/include/JSystem/JKernel/JKRCompression.h similarity index 100% rename from include/JSystem/JKernel/JKRCompression.h rename to libs/JSystem/include/JSystem/JKernel/JKRCompression.h diff --git a/include/JSystem/JKernel/JKRDecomp.h b/libs/JSystem/include/JSystem/JKernel/JKRDecomp.h similarity index 100% rename from include/JSystem/JKernel/JKRDecomp.h rename to libs/JSystem/include/JSystem/JKernel/JKRDecomp.h diff --git a/include/JSystem/JKernel/JKRDisposer.h b/libs/JSystem/include/JSystem/JKernel/JKRDisposer.h similarity index 100% rename from include/JSystem/JKernel/JKRDisposer.h rename to libs/JSystem/include/JSystem/JKernel/JKRDisposer.h diff --git a/include/JSystem/JKernel/JKRDvdAramRipper.h b/libs/JSystem/include/JSystem/JKernel/JKRDvdAramRipper.h similarity index 100% rename from include/JSystem/JKernel/JKRDvdAramRipper.h rename to libs/JSystem/include/JSystem/JKernel/JKRDvdAramRipper.h diff --git a/include/JSystem/JKernel/JKRDvdArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.h similarity index 100% rename from include/JSystem/JKernel/JKRDvdArchive.h rename to libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.h diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/libs/JSystem/include/JSystem/JKernel/JKRDvdFile.h similarity index 96% rename from include/JSystem/JKernel/JKRDvdFile.h rename to libs/JSystem/include/JSystem/JKernel/JKRDvdFile.h index b06d4e76d5..f32c8c6778 100644 --- a/include/JSystem/JKernel/JKRDvdFile.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRDvdFile.h @@ -2,9 +2,9 @@ #define JKRDVDFILE_H #include "JSystem/JKernel/JKRFile.h" -#include -#include -#include +#include +#include +#include struct OSThread; diff --git a/include/JSystem/JKernel/JKRDvdRipper.h b/libs/JSystem/include/JSystem/JKernel/JKRDvdRipper.h similarity index 100% rename from include/JSystem/JKernel/JKRDvdRipper.h rename to libs/JSystem/include/JSystem/JKernel/JKRDvdRipper.h diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRExpHeap.h similarity index 100% rename from include/JSystem/JKernel/JKRExpHeap.h rename to libs/JSystem/include/JSystem/JKernel/JKRExpHeap.h diff --git a/include/JSystem/JKernel/JKRFile.h b/libs/JSystem/include/JSystem/JKernel/JKRFile.h similarity index 100% rename from include/JSystem/JKernel/JKRFile.h rename to libs/JSystem/include/JSystem/JKernel/JKRFile.h diff --git a/include/JSystem/JKernel/JKRFileCache.h b/libs/JSystem/include/JSystem/JKernel/JKRFileCache.h similarity index 100% rename from include/JSystem/JKernel/JKRFileCache.h rename to libs/JSystem/include/JSystem/JKernel/JKRFileCache.h diff --git a/include/JSystem/JKernel/JKRFileFinder.h b/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.h similarity index 98% rename from include/JSystem/JKernel/JKRFileFinder.h rename to libs/JSystem/include/JSystem/JKernel/JKRFileFinder.h index 195fd9685e..1c9339cde0 100644 --- a/include/JSystem/JKernel/JKRFileFinder.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.h @@ -1,7 +1,7 @@ #ifndef JKRFILEFINDER_H #define JKRFILEFINDER_H -#include +#include /** * @ingroup jsystem-jkernel diff --git a/include/JSystem/JKernel/JKRFileLoader.h b/libs/JSystem/include/JSystem/JKernel/JKRFileLoader.h similarity index 100% rename from include/JSystem/JKernel/JKRFileLoader.h rename to libs/JSystem/include/JSystem/JKernel/JKRFileLoader.h diff --git a/include/JSystem/JKernel/JKRHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRHeap.h similarity index 99% rename from include/JSystem/JKernel/JKRHeap.h rename to libs/JSystem/include/JSystem/JKernel/JKRHeap.h index 05862bd85d..763718a585 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRHeap.h @@ -2,7 +2,7 @@ #define JKRHEAP_H #include "JSystem/JKernel/JKRDisposer.h" -#include +#include #include "global.h" #include #include diff --git a/include/JSystem/JKernel/JKRMemArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRMemArchive.h similarity index 100% rename from include/JSystem/JKernel/JKRMemArchive.h rename to libs/JSystem/include/JSystem/JKernel/JKRMemArchive.h diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRSolidHeap.h similarity index 100% rename from include/JSystem/JKernel/JKRSolidHeap.h rename to libs/JSystem/include/JSystem/JKernel/JKRSolidHeap.h diff --git a/include/JSystem/JKernel/JKRThread.h b/libs/JSystem/include/JSystem/JKernel/JKRThread.h similarity index 99% rename from include/JSystem/JKernel/JKRThread.h rename to libs/JSystem/include/JSystem/JKernel/JKRThread.h index 027d6640e4..b58dc6232d 100644 --- a/include/JSystem/JKernel/JKRThread.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRThread.h @@ -2,8 +2,8 @@ #define JKRTHREAD_H #include "JSystem/JKernel/JKRHeap.h" -#include -#include +#include +#include /** * @ingroup jsystem-jkernel diff --git a/include/JSystem/JKernel/SArc.h b/libs/JSystem/include/JSystem/JKernel/SArc.h similarity index 100% rename from include/JSystem/JKernel/SArc.h rename to libs/JSystem/include/JSystem/JKernel/SArc.h diff --git a/include/JSystem/JMath/JMATrigonometric.h b/libs/JSystem/include/JSystem/JMath/JMATrigonometric.h similarity index 99% rename from include/JSystem/JMath/JMATrigonometric.h rename to libs/JSystem/include/JSystem/JMath/JMATrigonometric.h index f764be5b6b..e51296ba3b 100644 --- a/include/JSystem/JMath/JMATrigonometric.h +++ b/libs/JSystem/include/JSystem/JMath/JMATrigonometric.h @@ -1,7 +1,7 @@ #ifndef JMATRIGONOMETRIC_H #define JMATRIGONOMETRIC_H -#include +#include #include #include diff --git a/include/JSystem/JMath/JMath.h b/libs/JSystem/include/JSystem/JMath/JMath.h similarity index 99% rename from include/JSystem/JMath/JMath.h rename to libs/JSystem/include/JSystem/JMath/JMath.h index 1bd1322063..8c7f2ffad1 100644 --- a/include/JSystem/JMath/JMath.h +++ b/libs/JSystem/include/JSystem/JMath/JMath.h @@ -1,7 +1,7 @@ #ifndef JMATH_H #define JMATH_H -#include "dolphin/mtx.h" +#include #include typedef f32 Mtx33[3][3]; diff --git a/include/JSystem/JMath/random.h b/libs/JSystem/include/JSystem/JMath/random.h similarity index 97% rename from include/JSystem/JMath/random.h rename to libs/JSystem/include/JSystem/JMath/random.h index 29b542d00d..5ea54ce704 100644 --- a/include/JSystem/JMath/random.h +++ b/libs/JSystem/include/JSystem/JMath/random.h @@ -1,7 +1,7 @@ #ifndef RANDOM_H #define RANDOM_H -#include +#include namespace JMath { diff --git a/include/JSystem/JMessage/JMessage.h b/libs/JSystem/include/JSystem/JMessage/JMessage.h similarity index 94% rename from include/JSystem/JMessage/JMessage.h rename to libs/JSystem/include/JSystem/JMessage/JMessage.h index b4144ddf00..dee1ada133 100644 --- a/include/JSystem/JMessage/JMessage.h +++ b/libs/JSystem/include/JSystem/JMessage/JMessage.h @@ -1,7 +1,11 @@ #ifndef JMESSAGE_H #define JMESSAGE_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif // Struct definitions might be wrong typedef struct bmg_header_t { diff --git a/include/JSystem/JMessage/control.h b/libs/JSystem/include/JSystem/JMessage/control.h similarity index 100% rename from include/JSystem/JMessage/control.h rename to libs/JSystem/include/JSystem/JMessage/control.h diff --git a/include/JSystem/JMessage/data.h b/libs/JSystem/include/JSystem/JMessage/data.h similarity index 100% rename from include/JSystem/JMessage/data.h rename to libs/JSystem/include/JSystem/JMessage/data.h diff --git a/include/JSystem/JMessage/locale.h b/libs/JSystem/include/JSystem/JMessage/locale.h similarity index 88% rename from include/JSystem/JMessage/locale.h rename to libs/JSystem/include/JSystem/JMessage/locale.h index c5dc58512a..76c4313f1a 100644 --- a/include/JSystem/JMessage/locale.h +++ b/libs/JSystem/include/JSystem/JMessage/locale.h @@ -1,7 +1,11 @@ #ifndef JMESSAGE_LOCALE_H #define JMESSAGE_LOCALE_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif namespace JMessage { diff --git a/include/JSystem/JMessage/processor.h b/libs/JSystem/include/JSystem/JMessage/processor.h similarity index 100% rename from include/JSystem/JMessage/processor.h rename to libs/JSystem/include/JSystem/JMessage/processor.h diff --git a/include/JSystem/JMessage/resource.h b/libs/JSystem/include/JSystem/JMessage/resource.h similarity index 100% rename from include/JSystem/JMessage/resource.h rename to libs/JSystem/include/JSystem/JMessage/resource.h diff --git a/include/JSystem/JParticle/JPABaseShape.h b/libs/JSystem/include/JSystem/JParticle/JPABaseShape.h similarity index 99% rename from include/JSystem/JParticle/JPABaseShape.h rename to libs/JSystem/include/JSystem/JParticle/JPABaseShape.h index e54b65bd72..d348859ebe 100644 --- a/include/JSystem/JParticle/JPABaseShape.h +++ b/libs/JSystem/include/JSystem/JParticle/JPABaseShape.h @@ -1,7 +1,7 @@ #ifndef JPABASESHAPE_H #define JPABASESHAPE_H -#include +#include struct JPAEmitterWorkData; class JPABaseParticle; diff --git a/include/JSystem/JParticle/JPAChildShape.h b/libs/JSystem/include/JSystem/JParticle/JPAChildShape.h similarity index 99% rename from include/JSystem/JParticle/JPAChildShape.h rename to libs/JSystem/include/JSystem/JParticle/JPAChildShape.h index 3a37f937e3..ee0516ef99 100644 --- a/include/JSystem/JParticle/JPAChildShape.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAChildShape.h @@ -1,7 +1,7 @@ #ifndef JPACHILDSHAPE_H #define JPACHILDSHAPE_H -#include +#include struct JPAEmitterWorkData; class JPABaseParticle; diff --git a/include/JSystem/JParticle/JPADrawInfo.h b/libs/JSystem/include/JSystem/JParticle/JPADrawInfo.h similarity index 96% rename from include/JSystem/JParticle/JPADrawInfo.h rename to libs/JSystem/include/JSystem/JParticle/JPADrawInfo.h index d98448f5f4..c9a62bfd6f 100644 --- a/include/JSystem/JParticle/JPADrawInfo.h +++ b/libs/JSystem/include/JSystem/JParticle/JPADrawInfo.h @@ -1,7 +1,7 @@ #ifndef JPADRAWINFO_H #define JPADRAWINFO_H -#include +#include /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/libs/JSystem/include/JSystem/JParticle/JPADynamicsBlock.h similarity index 99% rename from include/JSystem/JParticle/JPADynamicsBlock.h rename to libs/JSystem/include/JSystem/JParticle/JPADynamicsBlock.h index 60b35bde70..c69ddc07cb 100644 --- a/include/JSystem/JParticle/JPADynamicsBlock.h +++ b/libs/JSystem/include/JSystem/JParticle/JPADynamicsBlock.h @@ -3,7 +3,7 @@ #include "JSystem/JGeometry.h" -#include +#include #include "dusk/endian.h" struct JPAEmitterWorkData; diff --git a/include/JSystem/JParticle/JPAEmitter.h b/libs/JSystem/include/JSystem/JParticle/JPAEmitter.h similarity index 99% rename from include/JSystem/JParticle/JPAEmitter.h rename to libs/JSystem/include/JSystem/JParticle/JPAEmitter.h index 3e3a6cba02..99013105e0 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAEmitter.h @@ -1,7 +1,7 @@ #ifndef JPAEMITTER_H #define JPAEMITTER_H -#include +#include #include #include "JSystem/JParticle/JPAResource.h" #include "JSystem/JParticle/JPAList.h" diff --git a/include/JSystem/JParticle/JPAEmitterManager.h b/libs/JSystem/include/JSystem/JParticle/JPAEmitterManager.h similarity index 94% rename from include/JSystem/JParticle/JPAEmitterManager.h rename to libs/JSystem/include/JSystem/JParticle/JPAEmitterManager.h index 4508ef9cec..b10c4a69a0 100644 --- a/include/JSystem/JParticle/JPAEmitterManager.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAEmitterManager.h @@ -1,7 +1,7 @@ #ifndef JPAEMITTERMANAGER_H #define JPAEMITTERMANAGER_H -#include +#include #include "JSystem/JParticle/JPAList.h" #include "JSystem/JParticle/JPADrawInfo.h" #include "JSystem/JSupport/JSUList.h" @@ -39,6 +39,7 @@ public: return pResMgrAry[res_mgr_id]; } int getEmitterNumber() const { return emtrNum - mFreeEmtrList.getNumLinks(); } + int getParticleNumber() const { return ptclNum - mPtclPool.getNum(); } public: /* 0x00 */ JSUList* pEmtrUseList; diff --git a/include/JSystem/JParticle/JPAExTexShape.h b/libs/JSystem/include/JSystem/JParticle/JPAExTexShape.h similarity index 97% rename from include/JSystem/JParticle/JPAExTexShape.h rename to libs/JSystem/include/JSystem/JParticle/JPAExTexShape.h index 43959ecb18..95a480e5a1 100644 --- a/include/JSystem/JParticle/JPAExTexShape.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAExTexShape.h @@ -1,7 +1,7 @@ #ifndef JPAEXTEXSHAPE_H #define JPAEXTEXSHAPE_H -#include +#include struct JPAEmitterWorkData; diff --git a/include/JSystem/JParticle/JPAExtraShape.h b/libs/JSystem/include/JSystem/JParticle/JPAExtraShape.h similarity index 99% rename from include/JSystem/JParticle/JPAExtraShape.h rename to libs/JSystem/include/JSystem/JParticle/JPAExtraShape.h index 10b9c026ce..ea387bc4ed 100644 --- a/include/JSystem/JParticle/JPAExtraShape.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAExtraShape.h @@ -1,7 +1,7 @@ #ifndef JPAEXTRASHAPE_H #define JPAEXTRASHAPE_H -#include +#include struct JPAEmitterWorkData; class JPABaseParticle; diff --git a/include/JSystem/JParticle/JPAFieldBlock.h b/libs/JSystem/include/JSystem/JParticle/JPAFieldBlock.h similarity index 99% rename from include/JSystem/JParticle/JPAFieldBlock.h rename to libs/JSystem/include/JSystem/JParticle/JPAFieldBlock.h index ca123296aa..ded3c940cd 100644 --- a/include/JSystem/JParticle/JPAFieldBlock.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAFieldBlock.h @@ -2,7 +2,7 @@ #define JPAFIELDBLOCK_H #include "JSystem/JGeometry.h" -#include +#include class JKRHeap; struct JPAEmitterWorkData; diff --git a/include/JSystem/JParticle/JPAKeyBlock.h b/libs/JSystem/include/JSystem/JParticle/JPAKeyBlock.h similarity index 94% rename from include/JSystem/JParticle/JPAKeyBlock.h rename to libs/JSystem/include/JSystem/JParticle/JPAKeyBlock.h index 0cfaa6f41a..cc41aa71c4 100644 --- a/include/JSystem/JParticle/JPAKeyBlock.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAKeyBlock.h @@ -1,7 +1,7 @@ #ifndef JPAKEYBLOCK_H #define JPAKEYBLOCK_H -#include +#include /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPAList.h b/libs/JSystem/include/JSystem/JParticle/JPAList.h similarity index 99% rename from include/JSystem/JParticle/JPAList.h rename to libs/JSystem/include/JSystem/JParticle/JPAList.h index 6f201b73b8..3ea0bc4967 100644 --- a/include/JSystem/JParticle/JPAList.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAList.h @@ -1,7 +1,7 @@ #ifndef JPALIST_H #define JPALIST_H -#include +#include /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPAMath.h b/libs/JSystem/include/JSystem/JParticle/JPAMath.h similarity index 96% rename from include/JSystem/JParticle/JPAMath.h rename to libs/JSystem/include/JSystem/JParticle/JPAMath.h index a1a28f75e5..66e55e0370 100644 --- a/include/JSystem/JParticle/JPAMath.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAMath.h @@ -1,7 +1,7 @@ #ifndef JPAMATH_H #define JPAMATH_H -#include +#include #include "JSystem/JGeometry.h" void JPAGetDirMtx(JGeometry::TVec3 const& param_0, f32 (*param_1)[4]); diff --git a/include/JSystem/JParticle/JPAParticle.h b/libs/JSystem/include/JSystem/JParticle/JPAParticle.h similarity index 99% rename from include/JSystem/JParticle/JPAParticle.h rename to libs/JSystem/include/JSystem/JParticle/JPAParticle.h index 64d682cfa2..842f293286 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAParticle.h @@ -1,7 +1,7 @@ #ifndef JPAPARTICLE_H #define JPAPARTICLE_H -#include +#include #include "JSystem/JGeometry.h" class JKRHeap; diff --git a/include/JSystem/JParticle/JPARandom.h b/libs/JSystem/include/JSystem/JParticle/JPARandom.h similarity index 96% rename from include/JSystem/JParticle/JPARandom.h rename to libs/JSystem/include/JSystem/JParticle/JPARandom.h index 551e6f6934..be4420cad8 100644 --- a/include/JSystem/JParticle/JPARandom.h +++ b/libs/JSystem/include/JSystem/JParticle/JPARandom.h @@ -1,7 +1,7 @@ #ifndef JPARANDOM_H #define JPARANDOM_H -#include +#include /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPAResource.h b/libs/JSystem/include/JSystem/JParticle/JPAResource.h similarity index 98% rename from include/JSystem/JParticle/JPAResource.h rename to libs/JSystem/include/JSystem/JParticle/JPAResource.h index 6acdd144a4..ebf2127033 100644 --- a/include/JSystem/JParticle/JPAResource.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAResource.h @@ -1,7 +1,7 @@ #ifndef JPARESOURCE_H #define JPARESOURCE_H -#include +#include #include "dusk/endian.h" class JKRHeap; diff --git a/include/JSystem/JParticle/JPAResourceLoader.h b/libs/JSystem/include/JSystem/JParticle/JPAResourceLoader.h similarity index 90% rename from include/JSystem/JParticle/JPAResourceLoader.h rename to libs/JSystem/include/JSystem/JParticle/JPAResourceLoader.h index 7e411a8497..c49d1d8464 100644 --- a/include/JSystem/JParticle/JPAResourceLoader.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAResourceLoader.h @@ -1,7 +1,7 @@ #ifndef JPARESOURCELOADER_H #define JPARESOURCELOADER_H -#include +#include class JPAResourceManager; diff --git a/include/JSystem/JParticle/JPAResourceManager.h b/libs/JSystem/include/JSystem/JParticle/JPAResourceManager.h similarity index 100% rename from include/JSystem/JParticle/JPAResourceManager.h rename to libs/JSystem/include/JSystem/JParticle/JPAResourceManager.h diff --git a/include/JSystem/JParticle/JPATexture.h b/libs/JSystem/include/JSystem/JParticle/JPATexture.h similarity index 100% rename from include/JSystem/JParticle/JPATexture.h rename to libs/JSystem/include/JSystem/JParticle/JPATexture.h diff --git a/include/JSystem/JStage/JSGActor.h b/libs/JSystem/include/JSystem/JStage/JSGActor.h similarity index 100% rename from include/JSystem/JStage/JSGActor.h rename to libs/JSystem/include/JSystem/JStage/JSGActor.h diff --git a/include/JSystem/JStage/JSGAmbientLight.h b/libs/JSystem/include/JSystem/JStage/JSGAmbientLight.h similarity index 94% rename from include/JSystem/JStage/JSGAmbientLight.h rename to libs/JSystem/include/JSystem/JStage/JSGAmbientLight.h index 049ce7a479..a9e6f842a4 100644 --- a/include/JSystem/JStage/JSGAmbientLight.h +++ b/libs/JSystem/include/JSystem/JStage/JSGAmbientLight.h @@ -2,7 +2,7 @@ #define JSGAMBIENTLIGHT_H #include "JSystem/JStage/JSGObject.h" -#include +#include namespace JStage { diff --git a/include/JSystem/JStage/JSGCamera.h b/libs/JSystem/include/JSystem/JStage/JSGCamera.h similarity index 100% rename from include/JSystem/JStage/JSGCamera.h rename to libs/JSystem/include/JSystem/JStage/JSGCamera.h diff --git a/include/JSystem/JStage/JSGFog.h b/libs/JSystem/include/JSystem/JStage/JSGFog.h similarity index 96% rename from include/JSystem/JStage/JSGFog.h rename to libs/JSystem/include/JSystem/JStage/JSGFog.h index 1109da9a17..342b7049a1 100644 --- a/include/JSystem/JStage/JSGFog.h +++ b/libs/JSystem/include/JSystem/JStage/JSGFog.h @@ -2,7 +2,7 @@ #define JSGFOG_H #include "JSystem/JStage/JSGObject.h" -#include +#include namespace JStage { diff --git a/include/JSystem/JStage/JSGLight.h b/libs/JSystem/include/JSystem/JStage/JSGLight.h similarity index 97% rename from include/JSystem/JStage/JSGLight.h rename to libs/JSystem/include/JSystem/JStage/JSGLight.h index 3400f806d5..f1f274771c 100644 --- a/include/JSystem/JStage/JSGLight.h +++ b/libs/JSystem/include/JSystem/JStage/JSGLight.h @@ -2,7 +2,7 @@ #define JSGLIGHT_H #include "JSystem/JStage/JSGObject.h" -#include +#include namespace JStage { enum TELight { diff --git a/include/JSystem/JStage/JSGObject.h b/libs/JSystem/include/JSystem/JStage/JSGObject.h similarity index 97% rename from include/JSystem/JStage/JSGObject.h rename to libs/JSystem/include/JSystem/JStage/JSGObject.h index cdf1849a48..2080fbe439 100644 --- a/include/JSystem/JStage/JSGObject.h +++ b/libs/JSystem/include/JSystem/JStage/JSGObject.h @@ -1,7 +1,7 @@ #ifndef JSGOBJECT_H #define JSGOBJECT_H -#include +#include namespace JStage { /** diff --git a/include/JSystem/JStage/JSGSystem.h b/libs/JSystem/include/JSystem/JStage/JSGSystem.h similarity index 100% rename from include/JSystem/JStage/JSGSystem.h rename to libs/JSystem/include/JSystem/JStage/JSGSystem.h diff --git a/include/JSystem/JStudio/JStudio/ctb-data.h b/libs/JSystem/include/JSystem/JStudio/JStudio/ctb-data.h similarity index 100% rename from include/JSystem/JStudio/JStudio/ctb-data.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/ctb-data.h diff --git a/include/JSystem/JStudio/JStudio/ctb.h b/libs/JSystem/include/JSystem/JStudio/JStudio/ctb.h similarity index 100% rename from include/JSystem/JStudio/JStudio/ctb.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/ctb.h diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/libs/JSystem/include/JSystem/JStudio/JStudio/functionvalue.h similarity index 100% rename from include/JSystem/JStudio/JStudio/functionvalue.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/functionvalue.h diff --git a/include/JSystem/JStudio/JStudio/fvb-data-parse.h b/libs/JSystem/include/JSystem/JStudio/JStudio/fvb-data-parse.h similarity index 100% rename from include/JSystem/JStudio/JStudio/fvb-data-parse.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/fvb-data-parse.h diff --git a/include/JSystem/JStudio/JStudio/fvb-data.h b/libs/JSystem/include/JSystem/JStudio/JStudio/fvb-data.h similarity index 100% rename from include/JSystem/JStudio/JStudio/fvb-data.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/fvb-data.h diff --git a/include/JSystem/JStudio/JStudio/fvb.h b/libs/JSystem/include/JSystem/JStudio/JStudio/fvb.h similarity index 100% rename from include/JSystem/JStudio/JStudio/fvb.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/fvb.h diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-control.h similarity index 99% rename from include/JSystem/JStudio/JStudio/jstudio-control.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-control.h index f6a03c5cf7..37622dfd1e 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-control.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-control.h @@ -4,8 +4,8 @@ #include "JSystem/JStudio/JStudio/fvb.h" #include "JSystem/JStudio/JStudio/stb.h" #include "JSystem/JStudio/JStudio/ctb.h" -#include -#include +#include +#include namespace JStudio { struct TObject; diff --git a/include/JSystem/JStudio/JStudio/jstudio-data.h b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-data.h similarity index 100% rename from include/JSystem/JStudio/JStudio/jstudio-data.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-data.h diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-math.h similarity index 98% rename from include/JSystem/JStudio/JStudio/jstudio-math.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-math.h index 0c09c680bd..a23eed44e9 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-math.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-math.h @@ -1,7 +1,7 @@ #ifndef JSTUDIO_MATH_H #define JSTUDIO_MATH_H -#include +#include #include #define m_PI_D 3.141592653589793 diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-object.h similarity index 100% rename from include/JSystem/JStudio/JStudio/jstudio-object.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-object.h diff --git a/include/JSystem/JStudio/JStudio/object-id.h b/libs/JSystem/include/JSystem/JStudio/JStudio/object-id.h similarity index 97% rename from include/JSystem/JStudio/JStudio/object-id.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/object-id.h index 9aaebe9039..23ef72c952 100644 --- a/include/JSystem/JStudio/JStudio/object-id.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudio/object-id.h @@ -1,7 +1,7 @@ #ifndef OBJECT_ID_H #define OBJECT_ID_H -#include +#include namespace JStudio { namespace object { diff --git a/include/JSystem/JStudio/JStudio/stb-data-parse.h b/libs/JSystem/include/JSystem/JStudio/JStudio/stb-data-parse.h similarity index 100% rename from include/JSystem/JStudio/JStudio/stb-data-parse.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/stb-data-parse.h diff --git a/include/JSystem/JStudio/JStudio/stb-data.h b/libs/JSystem/include/JSystem/JStudio/JStudio/stb-data.h similarity index 98% rename from include/JSystem/JStudio/JStudio/stb-data.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/stb-data.h index 2cd1a29804..f66cd5f6f6 100644 --- a/include/JSystem/JStudio/JStudio/stb-data.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudio/stb-data.h @@ -1,7 +1,7 @@ #ifndef STB_DATA_H #define STB_DATA_H -#include +#include namespace JStudio { namespace stb { diff --git a/include/JSystem/JStudio/JStudio/stb.h b/libs/JSystem/include/JSystem/JStudio/JStudio/stb.h similarity index 99% rename from include/JSystem/JStudio/JStudio/stb.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/stb.h index ea1815c325..dfb489c8ec 100644 --- a/include/JSystem/JStudio/JStudio/stb.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudio/stb.h @@ -4,7 +4,7 @@ #include "JSystem/JGadget/linklist.h" #include "JSystem/JStudio/JStudio/object-id.h" #include "JSystem/JStudio/JStudio/stb-data-parse.h" -#include +#include #include namespace JStudio { diff --git a/include/JSystem/JStudio/JStudioCameraEditor/control.h b/libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/control.h similarity index 100% rename from include/JSystem/JStudio/JStudioCameraEditor/control.h rename to libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/control.h diff --git a/include/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h b/libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h similarity index 100% rename from include/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h rename to libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h diff --git a/include/JSystem/JStudio/JStudioCameraEditor/csb.h b/libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/csb.h similarity index 99% rename from include/JSystem/JStudio/JStudioCameraEditor/csb.h rename to libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/csb.h index de1a42421c..eb48ea835a 100644 --- a/include/JSystem/JStudio/JStudioCameraEditor/csb.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/csb.h @@ -1,7 +1,7 @@ #ifndef JSTUDIOCAMERAEDITOR_CSB_H #define JSTUDIOCAMERAEDITOR_CSB_H -#include +#include #include "JSystem/JGadget/linklist.h" #include "JSystem/JGadget/std-vector.h" #include "JSystem/JStudio/JStudio/functionvalue.h" diff --git a/include/JSystem/JStudio/JStudioCameraEditor/sequence.h b/libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/sequence.h similarity index 100% rename from include/JSystem/JStudio/JStudioCameraEditor/sequence.h rename to libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/sequence.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/anchor.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/anchor.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/anchor.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/anchor.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/console.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/console.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/console.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/console.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/controlset.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/controlset.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/interface.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/interface.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/interface.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/interface.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/scroll.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/scroll.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/scroll.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/scroll.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/visual.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/visual.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/visual.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/visual.h diff --git a/include/JSystem/JStudio/JStudio_JAudio2/control.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JAudio2/control.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JAudio2/control.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JAudio2/control.h diff --git a/include/JSystem/JStudio/JStudio_JAudio2/object-sound.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JAudio2/object-sound.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JAudio2/object-sound.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JAudio2/object-sound.h diff --git a/include/JSystem/JStudio/JStudio_JParticle/control.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JParticle/control.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JParticle/control.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JParticle/control.h diff --git a/include/JSystem/JStudio/JStudio_JParticle/object-particle.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JParticle/object-particle.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JParticle/object-particle.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JParticle/object-particle.h diff --git a/include/JSystem/JStudio/JStudio_JPreviewer/control.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JPreviewer/control.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JPreviewer/control.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JPreviewer/control.h diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/control.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/control.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/control.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object-actor.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-actor.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object-actor.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-actor.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object-camera.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-camera.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object-camera.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-camera.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object-fog.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-fog.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object-fog.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-fog.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object-light.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-light.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object-light.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-light.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object.h diff --git a/include/JSystem/JSupport/JSUFileStream.h b/libs/JSystem/include/JSystem/JSupport/JSUFileStream.h similarity index 100% rename from include/JSystem/JSupport/JSUFileStream.h rename to libs/JSystem/include/JSystem/JSupport/JSUFileStream.h diff --git a/include/JSystem/JSupport/JSUInputStream.h b/libs/JSystem/include/JSystem/JSupport/JSUInputStream.h similarity index 100% rename from include/JSystem/JSupport/JSUInputStream.h rename to libs/JSystem/include/JSystem/JSupport/JSUInputStream.h diff --git a/include/JSystem/JSupport/JSUIosBase.h b/libs/JSystem/include/JSystem/JSupport/JSUIosBase.h similarity index 95% rename from include/JSystem/JSupport/JSUIosBase.h rename to libs/JSystem/include/JSystem/JSupport/JSUIosBase.h index 64ad4dba05..395ce57745 100644 --- a/include/JSystem/JSupport/JSUIosBase.h +++ b/libs/JSystem/include/JSystem/JSupport/JSUIosBase.h @@ -1,7 +1,7 @@ #ifndef JSUIOSBASE_H_ #define JSUIOSBASE_H_ -#include +#include enum JSUStreamSeekFrom { JSUStreamSeekFrom_SET = 0, // absolute diff --git a/include/JSystem/JSupport/JSUList.h b/libs/JSystem/include/JSystem/JSupport/JSUList.h similarity index 99% rename from include/JSystem/JSupport/JSUList.h rename to libs/JSystem/include/JSystem/JSupport/JSUList.h index 30a28b57cf..3021a3a879 100644 --- a/include/JSystem/JSupport/JSUList.h +++ b/libs/JSystem/include/JSystem/JSupport/JSUList.h @@ -1,7 +1,7 @@ #ifndef JSULIST_H #define JSULIST_H -#include +#include template class JSUList; diff --git a/include/JSystem/JSupport/JSUMemoryStream.h b/libs/JSystem/include/JSystem/JSupport/JSUMemoryStream.h similarity index 100% rename from include/JSystem/JSupport/JSUMemoryStream.h rename to libs/JSystem/include/JSystem/JSupport/JSUMemoryStream.h diff --git a/include/JSystem/JSupport/JSUOutputStream.h b/libs/JSystem/include/JSystem/JSupport/JSUOutputStream.h similarity index 100% rename from include/JSystem/JSupport/JSUOutputStream.h rename to libs/JSystem/include/JSystem/JSupport/JSUOutputStream.h diff --git a/include/JSystem/JSupport/JSURandomInputStream.h b/libs/JSystem/include/JSystem/JSupport/JSURandomInputStream.h similarity index 100% rename from include/JSystem/JSupport/JSURandomInputStream.h rename to libs/JSystem/include/JSystem/JSupport/JSURandomInputStream.h diff --git a/include/JSystem/JSupport/JSURandomOutputStream.h b/libs/JSystem/include/JSystem/JSupport/JSURandomOutputStream.h similarity index 100% rename from include/JSystem/JSupport/JSURandomOutputStream.h rename to libs/JSystem/include/JSystem/JSupport/JSURandomOutputStream.h diff --git a/include/JSystem/JSupport/JSupport.h b/libs/JSystem/include/JSystem/JSupport/JSupport.h similarity index 91% rename from include/JSystem/JSupport/JSupport.h rename to libs/JSystem/include/JSystem/JSupport/JSupport.h index c982af6103..a9caccef08 100644 --- a/include/JSystem/JSupport/JSupport.h +++ b/libs/JSystem/include/JSystem/JSupport/JSupport.h @@ -1,7 +1,11 @@ #ifndef JSUPPORT_H #define JSUPPORT_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include /** diff --git a/include/JSystem/JSystem.h b/libs/JSystem/include/JSystem/JSystem.h similarity index 100% rename from include/JSystem/JSystem.h rename to libs/JSystem/include/JSystem/JSystem.h diff --git a/include/JSystem/JSystem.pch b/libs/JSystem/include/JSystem/JSystem.pch similarity index 100% rename from include/JSystem/JSystem.pch rename to libs/JSystem/include/JSystem/JSystem.pch diff --git a/include/JSystem/JUtility/JUTAssert.h b/libs/JSystem/include/JSystem/JUtility/JUTAssert.h similarity index 99% rename from include/JSystem/JUtility/JUTAssert.h rename to libs/JSystem/include/JSystem/JUtility/JUTAssert.h index 03306a8f8a..5ace3218bb 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTAssert.h @@ -1,7 +1,7 @@ #ifndef JUTASSERT_H #define JUTASSERT_H -#include +#include #if DEBUG #if __MWERKS__ diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/libs/JSystem/include/JSystem/JUtility/JUTCacheFont.h similarity index 100% rename from include/JSystem/JUtility/JUTCacheFont.h rename to libs/JSystem/include/JSystem/JUtility/JUTCacheFont.h diff --git a/include/JSystem/JUtility/JUTConsole.h b/libs/JSystem/include/JSystem/JUtility/JUTConsole.h similarity index 100% rename from include/JSystem/JUtility/JUTConsole.h rename to libs/JSystem/include/JSystem/JUtility/JUTConsole.h diff --git a/include/JSystem/JUtility/JUTDbPrint.h b/libs/JSystem/include/JSystem/JUtility/JUTDbPrint.h similarity index 100% rename from include/JSystem/JUtility/JUTDbPrint.h rename to libs/JSystem/include/JSystem/JUtility/JUTDbPrint.h diff --git a/include/JSystem/JUtility/JUTDirectFile.h b/libs/JSystem/include/JSystem/JUtility/JUTDirectFile.h similarity index 95% rename from include/JSystem/JUtility/JUTDirectFile.h rename to libs/JSystem/include/JSystem/JUtility/JUTDirectFile.h index caebf09dd1..f6b14fad3f 100644 --- a/include/JSystem/JUtility/JUTDirectFile.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTDirectFile.h @@ -1,7 +1,7 @@ #ifndef JUTDIRECTFILE_H #define JUTDIRECTFILE_H -#include +#include #define JUTDF_BUFSIZE (0x800) diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/libs/JSystem/include/JSystem/JUtility/JUTDirectPrint.h similarity index 100% rename from include/JSystem/JUtility/JUTDirectPrint.h rename to libs/JSystem/include/JSystem/JUtility/JUTDirectPrint.h diff --git a/include/JSystem/JUtility/JUTException.h b/libs/JSystem/include/JSystem/JUtility/JUTException.h similarity index 98% rename from include/JSystem/JUtility/JUTException.h rename to libs/JSystem/include/JSystem/JUtility/JUTException.h index fbf71ad6f1..698a02ed44 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTException.h @@ -4,8 +4,8 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTGamePad.h" #include -#include -#include +#include +#include #include "global.h" typedef struct OSContext OSContext; diff --git a/include/JSystem/JUtility/JUTFader.h b/libs/JSystem/include/JSystem/JUtility/JUTFader.h similarity index 100% rename from include/JSystem/JUtility/JUTFader.h rename to libs/JSystem/include/JSystem/JUtility/JUTFader.h diff --git a/include/JSystem/JUtility/JUTFont.h b/libs/JSystem/include/JSystem/JUtility/JUTFont.h similarity index 100% rename from include/JSystem/JUtility/JUTFont.h rename to libs/JSystem/include/JSystem/JUtility/JUTFont.h diff --git a/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h b/libs/JSystem/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h similarity index 80% rename from include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h rename to libs/JSystem/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h index da5d500653..d26d0287dd 100644 --- a/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h @@ -1,6 +1,6 @@ #ifndef JUTFONTDATA_ASCFONT_FIX12_H #define JUTFONTDATA_ASCFONT_FIX12_H -#include +#include #endif /* JUTFONTDATA_ASCFONT_FIX12_H */ diff --git a/include/JSystem/JUtility/JUTGamePad.h b/libs/JSystem/include/JSystem/JUtility/JUTGamePad.h similarity index 99% rename from include/JSystem/JUtility/JUTGamePad.h rename to libs/JSystem/include/JSystem/JUtility/JUTGamePad.h index 919ad23877..bf939f0831 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTGamePad.h @@ -3,7 +3,11 @@ #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif typedef void (*callbackFn)(int, void*); diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/libs/JSystem/include/JSystem/JUtility/JUTGraphFifo.h similarity index 97% rename from include/JSystem/JUtility/JUTGraphFifo.h rename to libs/JSystem/include/JSystem/JUtility/JUTGraphFifo.h index 97ae67541e..1680d00178 100644 --- a/include/JSystem/JUtility/JUTGraphFifo.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTGraphFifo.h @@ -1,7 +1,7 @@ #ifndef JUTGRAPHFIFO_H #define JUTGRAPHFIFO_H -#include +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTNameTab.h b/libs/JSystem/include/JSystem/JUtility/JUTNameTab.h similarity index 97% rename from include/JSystem/JUtility/JUTNameTab.h rename to libs/JSystem/include/JSystem/JUtility/JUTNameTab.h index 7cffb5b495..6affae8ecb 100644 --- a/include/JSystem/JUtility/JUTNameTab.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTNameTab.h @@ -1,7 +1,7 @@ #ifndef JUTNAMETAB_H #define JUTNAMETAB_H -#include +#include #include "dusk/endian.h" /** diff --git a/include/JSystem/JUtility/JUTPalette.h b/libs/JSystem/include/JSystem/JUtility/JUTPalette.h similarity index 98% rename from include/JSystem/JUtility/JUTPalette.h rename to libs/JSystem/include/JSystem/JUtility/JUTPalette.h index 95de8a995a..017d511d50 100644 --- a/include/JSystem/JUtility/JUTPalette.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTPalette.h @@ -1,7 +1,7 @@ #ifndef JUTPALETTE_H #define JUTPALETTE_H -#include +#include #include "dusk/endian.h" diff --git a/include/JSystem/JUtility/JUTProcBar.h b/libs/JSystem/include/JSystem/JUtility/JUTProcBar.h similarity index 99% rename from include/JSystem/JUtility/JUTProcBar.h rename to libs/JSystem/include/JSystem/JUtility/JUTProcBar.h index ac9811f8fd..c491641218 100644 --- a/include/JSystem/JUtility/JUTProcBar.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTProcBar.h @@ -2,7 +2,7 @@ #define JUTPROCBAR_H #include "JSystem/JUtility/TColor.h" -#include +#include class JKRHeap; diff --git a/include/JSystem/JUtility/JUTReport.h b/libs/JSystem/include/JSystem/JUtility/JUTReport.h similarity index 100% rename from include/JSystem/JUtility/JUTReport.h rename to libs/JSystem/include/JSystem/JUtility/JUTReport.h diff --git a/include/JSystem/JUtility/JUTResFont.h b/libs/JSystem/include/JSystem/JUtility/JUTResFont.h similarity index 100% rename from include/JSystem/JUtility/JUTResFont.h rename to libs/JSystem/include/JSystem/JUtility/JUTResFont.h diff --git a/include/JSystem/JUtility/JUTResource.h b/libs/JSystem/include/JSystem/JUtility/JUTResource.h similarity index 96% rename from include/JSystem/JUtility/JUTResource.h rename to libs/JSystem/include/JSystem/JUtility/JUTResource.h index 4a4b8e6c8c..f54dd8b1bb 100644 --- a/include/JSystem/JUtility/JUTResource.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTResource.h @@ -1,7 +1,7 @@ #ifndef JUTRESOURCE_H #define JUTRESOURCE_H -#include +#include class JKRArchive; class JSUInputStream; diff --git a/include/JSystem/JUtility/JUTTexture.h b/libs/JSystem/include/JSystem/JUtility/JUTTexture.h similarity index 99% rename from include/JSystem/JUtility/JUTTexture.h rename to libs/JSystem/include/JSystem/JUtility/JUTTexture.h index 370129fcc8..8911467439 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTTexture.h @@ -1,7 +1,7 @@ #ifndef JUTTEXTURE_H #define JUTTEXTURE_H -#include +#include #include #include "dusk/endian.h" diff --git a/include/JSystem/JUtility/JUTVideo.h b/libs/JSystem/include/JSystem/JUtility/JUTVideo.h similarity index 95% rename from include/JSystem/JUtility/JUTVideo.h rename to libs/JSystem/include/JSystem/JUtility/JUTVideo.h index 11278fa2b6..6a988b6337 100644 --- a/include/JSystem/JUtility/JUTVideo.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTVideo.h @@ -1,10 +1,9 @@ #ifndef JUTVIDEO_H #define JUTVIDEO_H -#include -#include -#include -#include +#include +#include +#include typedef u8 (*Pattern)[2]; diff --git a/include/JSystem/JUtility/JUTXfb.h b/libs/JSystem/include/JSystem/JUtility/JUTXfb.h similarity index 100% rename from include/JSystem/JUtility/JUTXfb.h rename to libs/JSystem/include/JSystem/JUtility/JUTXfb.h diff --git a/include/JSystem/JUtility/TColor.h b/libs/JSystem/include/JSystem/JUtility/TColor.h similarity index 96% rename from include/JSystem/JUtility/TColor.h rename to libs/JSystem/include/JSystem/JUtility/TColor.h index 0f2a684289..fdeadec5d4 100644 --- a/include/JSystem/JUtility/TColor.h +++ b/libs/JSystem/include/JSystem/JUtility/TColor.h @@ -1,7 +1,7 @@ #ifndef TCOLOR_H #define TCOLOR_H -#include +#include namespace JUtility { diff --git a/include/JSystem/TPosition3.h b/libs/JSystem/include/JSystem/TPosition3.h similarity index 98% rename from include/JSystem/TPosition3.h rename to libs/JSystem/include/JSystem/TPosition3.h index 7a8094e45e..0e973c9c50 100644 --- a/include/JSystem/TPosition3.h +++ b/libs/JSystem/include/JSystem/TPosition3.h @@ -1,7 +1,7 @@ #ifndef TPOSITION3_H #define TPOSITION3_H -#include +#include #include "JSystem/JMath/JMath.h" #include "JSystem/JGeometry.h" diff --git a/src/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/src/J2DGraph/J2DAnimation.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DAnimation.cpp rename to libs/JSystem/src/J2DGraph/J2DAnimation.cpp index 6b0968c764..92233d7af1 100644 --- a/src/JSystem/J2DGraph/J2DAnimation.cpp +++ b/libs/JSystem/src/J2DGraph/J2DAnimation.cpp @@ -6,7 +6,7 @@ #include "JSystem/J3DGraphBase/J3DTransform.h" #include "JSystem/JUtility/JUTPalette.h" #include "JSystem/JUtility/JUTResource.h" -#include +#include template f32 J2DGetKeyFrameInterpolation(f32 param_0, J3DAnmKeyTableBase* param_1, T* param_2) { diff --git a/src/JSystem/J2DGraph/J2DAnmLoader.cpp b/libs/JSystem/src/J2DGraph/J2DAnmLoader.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DAnmLoader.cpp rename to libs/JSystem/src/J2DGraph/J2DAnmLoader.cpp diff --git a/src/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/src/J2DGraph/J2DGrafContext.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DGrafContext.cpp rename to libs/JSystem/src/J2DGraph/J2DGrafContext.cpp index 9f676cd7e5..3ac3e5d197 100644 --- a/src/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/libs/JSystem/src/J2DGraph/J2DGrafContext.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DGrafContext.h" -#include +#include J2DGrafContext::J2DGrafContext(f32 x, f32 y, f32 width, f32 height) : mBounds(x, y, x + width, y + height), mScissorBounds(x, y, x + width, y + height) { diff --git a/src/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/src/J2DGraph/J2DManage.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DManage.cpp rename to libs/JSystem/src/J2DGraph/J2DManage.cpp diff --git a/src/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/src/J2DGraph/J2DMatBlock.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DMatBlock.cpp rename to libs/JSystem/src/J2DGraph/J2DMatBlock.cpp index 9bb4f87572..1bf28751ac 100644 --- a/src/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/libs/JSystem/src/J2DGraph/J2DMatBlock.cpp @@ -5,7 +5,7 @@ #include "JSystem/JUtility/JUTPalette.h" #include "JSystem/JUtility/JUTResFont.h" #include "JSystem/JUtility/JUTTexture.h" -#include +#include void J2DColorBlock::initialize() { for (int i = 0; i < 2; i++) { diff --git a/src/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/src/J2DGraph/J2DMaterial.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DMaterial.cpp rename to libs/JSystem/src/J2DGraph/J2DMaterial.cpp diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/src/J2DGraph/J2DMaterialFactory.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DMaterialFactory.cpp rename to libs/JSystem/src/J2DGraph/J2DMaterialFactory.cpp index 616fff2dd0..f0aae92990 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/libs/JSystem/src/J2DGraph/J2DMaterialFactory.cpp @@ -6,7 +6,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTResource.h" #include -#include +#include J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) { mMaterialNum = param_0.field_0x8; diff --git a/src/JSystem/J2DGraph/J2DOrthoGraph.cpp b/libs/JSystem/src/J2DGraph/J2DOrthoGraph.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DOrthoGraph.cpp rename to libs/JSystem/src/J2DGraph/J2DOrthoGraph.cpp index 5cd6778572..1830911802 100644 --- a/src/JSystem/J2DGraph/J2DOrthoGraph.cpp +++ b/libs/JSystem/src/J2DGraph/J2DOrthoGraph.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DOrthoGraph.h" -#include +#include J2DOrthoGraph::J2DOrthoGraph() : J2DGrafContext(0, 0, 0, 0) { this->setLookat(); diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/src/J2DGraph/J2DPane.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DPane.cpp rename to libs/JSystem/src/J2DGraph/J2DPane.cpp diff --git a/src/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/src/J2DGraph/J2DPicture.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DPicture.cpp rename to libs/JSystem/src/J2DGraph/J2DPicture.cpp index c06f38b649..530d6ad3f4 100644 --- a/src/JSystem/J2DGraph/J2DPicture.cpp +++ b/libs/JSystem/src/J2DGraph/J2DPicture.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTTexture.h" #include "JSystem/JUtility/JUTResource.h" #include "JSystem/JSupport/JSURandomInputStream.h" -#include +#include J2DPicture::J2DPicture() : mPalette(NULL) { for (u32 i = 0; i < 2; i++) { diff --git a/src/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/src/J2DGraph/J2DPictureEx.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DPictureEx.cpp rename to libs/JSystem/src/J2DGraph/J2DPictureEx.cpp index 36756ff411..64ef5298f7 100644 --- a/src/JSystem/J2DGraph/J2DPictureEx.cpp +++ b/libs/JSystem/src/J2DGraph/J2DPictureEx.cpp @@ -5,7 +5,7 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JSupport/JSURandomInputStream.h" #include "JSystem/JUtility/JUTTexture.h" -#include +#include void J2DPictureEx::initiate(ResTIMG const* param_0, ResTLUT const* param_1) { u32 texGenNum = mMaterial->getTexGenBlock()->getTexGenNum(); diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/src/J2DGraph/J2DPrint.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DPrint.cpp rename to libs/JSystem/src/J2DGraph/J2DPrint.cpp diff --git a/src/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/src/J2DGraph/J2DScreen.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DScreen.cpp rename to libs/JSystem/src/J2DGraph/J2DScreen.cpp index 65626a69a0..622f3c2fb0 100644 --- a/src/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/src/J2DGraph/J2DScreen.cpp @@ -9,7 +9,7 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSUMemoryStream.h" -#include +#include J2DScreen::J2DScreen() : J2DPane(NULL, true, 'root', JGeometry::TBox2(JGeometry::TVec2(0, 0), JGeometry::TVec2(640, 480))), mColor() { diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/libs/JSystem/src/J2DGraph/J2DTevs.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DTevs.cpp rename to libs/JSystem/src/J2DGraph/J2DTevs.cpp index bfe85d81ff..8daf82872c 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/libs/JSystem/src/J2DGraph/J2DTevs.cpp @@ -11,7 +11,7 @@ #else #include #endif -#include +#include void J2DTexMtx::load(u32 mtxIdx) { GXLoadTexMtxImm(mTexMtx, mtxIdx * 3 + GX_TEXMTX0, (GXTexMtxType)mInfo.mTexMtxType); diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/src/J2DGraph/J2DTextBox.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DTextBox.cpp rename to libs/JSystem/src/J2DGraph/J2DTextBox.cpp diff --git a/src/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/src/J2DGraph/J2DTextBoxEx.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DTextBoxEx.cpp rename to libs/JSystem/src/J2DGraph/J2DTextBoxEx.cpp diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/libs/JSystem/src/J2DGraph/J2DWindow.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DWindow.cpp rename to libs/JSystem/src/J2DGraph/J2DWindow.cpp diff --git a/src/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/src/J2DGraph/J2DWindowEx.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DWindowEx.cpp rename to libs/JSystem/src/J2DGraph/J2DWindowEx.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DAnimation.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DAnimation.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DAnimation.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DCluster.cpp similarity index 99% rename from src/JSystem/J3DGraphAnimator/J3DCluster.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DCluster.cpp index 3e0daccddd..8144ea04a5 100644 --- a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp +++ b/libs/JSystem/src/J3DGraphAnimator/J3DCluster.cpp @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/JMath/JMATrigonometric.h" -#include +#include #include "JSystem/JSupport/JSupport.h" diff --git a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DJoint.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DJoint.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DJoint.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DJointTree.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DJointTree.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DJointTree.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DMaterialAnm.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DMaterialAnm.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DMaterialAttach.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DMaterialAttach.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DModel.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DModel.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DModel.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DModelData.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DModelData.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DModelData.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DMtxBuffer.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DMtxBuffer.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DShapeTable.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DShapeTable.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DSkinDeform.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DSkinDeform.cpp diff --git a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp rename to libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/libs/JSystem/src/J3DGraphBase/J3DGD.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DGD.cpp rename to libs/JSystem/src/J3DGraphBase/J3DGD.cpp diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/src/J3DGraphBase/J3DMatBlock.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DMatBlock.cpp rename to libs/JSystem/src/J3DGraphBase/J3DMatBlock.cpp diff --git a/src/JSystem/J3DGraphBase/J3DMaterial.cpp b/libs/JSystem/src/J3DGraphBase/J3DMaterial.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DMaterial.cpp rename to libs/JSystem/src/J3DGraphBase/J3DMaterial.cpp diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/src/J3DGraphBase/J3DPacket.cpp similarity index 99% rename from src/JSystem/J3DGraphBase/J3DPacket.cpp rename to libs/JSystem/src/J3DGraphBase/J3DPacket.cpp index 5eb6e77392..71ddc165fc 100644 --- a/src/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DPacket.cpp @@ -6,7 +6,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DShapeMtx.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include #include #include "global.h" diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/libs/JSystem/src/J3DGraphBase/J3DShape.cpp similarity index 99% rename from src/JSystem/J3DGraphBase/J3DShape.cpp rename to libs/JSystem/src/J3DGraphBase/J3DShape.cpp index a78ac59a19..d365dc47ba 100644 --- a/src/JSystem/J3DGraphBase/J3DShape.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DShape.cpp @@ -6,6 +6,8 @@ #include "JSystem/J3DGraphBase/J3DFifo.h" #include "JSystem/J3DGraphBase/J3DPacket.h" #include "JSystem/J3DGraphBase/J3DVertex.h" +#include "JSystem/J3DGraphBase/J3DFifo.h" +#include void J3DGDSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList const*, bool); void J3DFifoLoadPosMtxImm(Mtx, u32); diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/src/J3DGraphBase/J3DShapeDraw.cpp similarity index 98% rename from src/JSystem/J3DGraphBase/J3DShapeDraw.cpp rename to libs/JSystem/src/J3DGraphBase/J3DShapeDraw.cpp index df9caa5b3e..f05d907e32 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DShapeDraw.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include #include -#include +#include u32 J3DShapeDraw::countVertex(u32 stride) { u32 count = 0; diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DShapeMtx.cpp rename to libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp diff --git a/src/JSystem/J3DGraphBase/J3DStruct.cpp b/libs/JSystem/src/J3DGraphBase/J3DStruct.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DStruct.cpp rename to libs/JSystem/src/J3DGraphBase/J3DStruct.cpp diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/src/J3DGraphBase/J3DSys.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DSys.cpp rename to libs/JSystem/src/J3DGraphBase/J3DSys.cpp diff --git a/src/JSystem/J3DGraphBase/J3DTevs.cpp b/libs/JSystem/src/J3DGraphBase/J3DTevs.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DTevs.cpp rename to libs/JSystem/src/J3DGraphBase/J3DTevs.cpp diff --git a/src/JSystem/J3DGraphBase/J3DTexture.cpp b/libs/JSystem/src/J3DGraphBase/J3DTexture.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DTexture.cpp rename to libs/JSystem/src/J3DGraphBase/J3DTexture.cpp diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/libs/JSystem/src/J3DGraphBase/J3DTransform.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DTransform.cpp rename to libs/JSystem/src/J3DGraphBase/J3DTransform.cpp diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/libs/JSystem/src/J3DGraphBase/J3DVertex.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DVertex.cpp rename to libs/JSystem/src/J3DGraphBase/J3DVertex.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/libs/JSystem/src/J3DGraphLoader/J3DAnmLoader.cpp similarity index 99% rename from src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DAnmLoader.cpp index a1170e64c0..b3772ea422 100644 --- a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp +++ b/libs/JSystem/src/J3DGraphLoader/J3DAnmLoader.cpp @@ -7,7 +7,7 @@ #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/JSupport/JSupport.h" -#include +#include J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseFlag flag) { const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data; diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/libs/JSystem/src/J3DGraphLoader/J3DClusterLoader.cpp similarity index 99% rename from src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DClusterLoader.cpp index df8a808deb..b222f447d7 100644 --- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/libs/JSystem/src/J3DGraphLoader/J3DClusterLoader.cpp @@ -8,7 +8,7 @@ #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h" #include "JSystem/JSupport/JSupport.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include #include void* J3DClusterLoaderDataBase::load(const void* i_data) { diff --git a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/libs/JSystem/src/J3DGraphLoader/J3DJointFactory.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DJointFactory.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DJointFactory.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory_v21.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory_v21.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DModelLoader.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/libs/JSystem/src/J3DGraphLoader/J3DModelLoaderCalcSize.cpp similarity index 99% rename from src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index f1ed201fc8..e332b491fc 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/libs/JSystem/src/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -8,7 +8,7 @@ #include "JSystem/J3DGraphAnimator/J3DJoint.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "JSystem/JSupport/JSupport.h" -#include +#include #include "global.h" u16 J3DModelLoader::countMaterialNum(const void* stream) { diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/src/J3DGraphLoader/J3DShapeFactory.cpp similarity index 99% rename from src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DShapeFactory.cpp index 8e679daf7a..4b357cd8e6 100644 --- a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/libs/JSystem/src/J3DGraphLoader/J3DShapeFactory.cpp @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DShapeMtx.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSupport.h" -#include +#include #include "global.h" #include diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/libs/JSystem/src/J3DU/J3DUClipper.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUClipper.cpp rename to libs/JSystem/src/J3DU/J3DUClipper.cpp diff --git a/src/JSystem/J3DU/J3DUDL.cpp b/libs/JSystem/src/J3DU/J3DUDL.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUDL.cpp rename to libs/JSystem/src/J3DU/J3DUDL.cpp diff --git a/src/JSystem/J3DU/J3DUFur.cpp b/libs/JSystem/src/J3DU/J3DUFur.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUFur.cpp rename to libs/JSystem/src/J3DU/J3DUFur.cpp diff --git a/src/JSystem/J3DU/J3DUMotion.cpp b/libs/JSystem/src/J3DU/J3DUMotion.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUMotion.cpp rename to libs/JSystem/src/J3DU/J3DUMotion.cpp diff --git a/src/JSystem/J3DU/J3DUShadow.cpp b/libs/JSystem/src/J3DU/J3DUShadow.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUShadow.cpp rename to libs/JSystem/src/J3DU/J3DUShadow.cpp diff --git a/src/JSystem/JAHostIO/JAHioMessage.cpp b/libs/JSystem/src/JAHostIO/JAHioMessage.cpp similarity index 100% rename from src/JSystem/JAHostIO/JAHioMessage.cpp rename to libs/JSystem/src/JAHostIO/JAHioMessage.cpp diff --git a/src/JSystem/JAHostIO/JAHioMgr.cpp b/libs/JSystem/src/JAHostIO/JAHioMgr.cpp similarity index 100% rename from src/JSystem/JAHostIO/JAHioMgr.cpp rename to libs/JSystem/src/JAHostIO/JAHioMgr.cpp diff --git a/src/JSystem/JAHostIO/JAHioNode.cpp b/libs/JSystem/src/JAHostIO/JAHioNode.cpp similarity index 100% rename from src/JSystem/JAHostIO/JAHioNode.cpp rename to libs/JSystem/src/JAHostIO/JAHioNode.cpp diff --git a/src/JSystem/JAHostIO/JAHioUtil.cpp b/libs/JSystem/src/JAHostIO/JAHioUtil.cpp similarity index 100% rename from src/JSystem/JAHostIO/JAHioUtil.cpp rename to libs/JSystem/src/JAHostIO/JAHioUtil.cpp diff --git a/src/JSystem/JAWExtSystem/JAWExtSystem.cpp b/libs/JSystem/src/JAWExtSystem/JAWExtSystem.cpp similarity index 100% rename from src/JSystem/JAWExtSystem/JAWExtSystem.cpp rename to libs/JSystem/src/JAWExtSystem/JAWExtSystem.cpp diff --git a/src/JSystem/JAWExtSystem/JAWGraphContext.cpp b/libs/JSystem/src/JAWExtSystem/JAWGraphContext.cpp similarity index 100% rename from src/JSystem/JAWExtSystem/JAWGraphContext.cpp rename to libs/JSystem/src/JAWExtSystem/JAWGraphContext.cpp diff --git a/src/JSystem/JAWExtSystem/JAWSystem.cpp b/libs/JSystem/src/JAWExtSystem/JAWSystem.cpp similarity index 100% rename from src/JSystem/JAWExtSystem/JAWSystem.cpp rename to libs/JSystem/src/JAWExtSystem/JAWSystem.cpp diff --git a/src/JSystem/JAWExtSystem/JAWWindow.cpp b/libs/JSystem/src/JAWExtSystem/JAWWindow.cpp similarity index 100% rename from src/JSystem/JAWExtSystem/JAWWindow.cpp rename to libs/JSystem/src/JAWExtSystem/JAWWindow.cpp diff --git a/src/JSystem/JAWExtSystem/JAWWindow3D.cpp b/libs/JSystem/src/JAWExtSystem/JAWWindow3D.cpp similarity index 100% rename from src/JSystem/JAWExtSystem/JAWWindow3D.cpp rename to libs/JSystem/src/JAWExtSystem/JAWWindow3D.cpp diff --git a/src/JSystem/JAudio2/JAIAudible.cpp b/libs/JSystem/src/JAudio2/JAIAudible.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIAudible.cpp rename to libs/JSystem/src/JAudio2/JAIAudible.cpp diff --git a/src/JSystem/JAudio2/JAIAudience.cpp b/libs/JSystem/src/JAudio2/JAIAudience.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIAudience.cpp rename to libs/JSystem/src/JAudio2/JAIAudience.cpp diff --git a/src/JSystem/JAudio2/JAISe.cpp b/libs/JSystem/src/JAudio2/JAISe.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISe.cpp rename to libs/JSystem/src/JAudio2/JAISe.cpp diff --git a/src/JSystem/JAudio2/JAISeMgr.cpp b/libs/JSystem/src/JAudio2/JAISeMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeMgr.cpp rename to libs/JSystem/src/JAudio2/JAISeMgr.cpp diff --git a/src/JSystem/JAudio2/JAISeq.cpp b/libs/JSystem/src/JAudio2/JAISeq.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeq.cpp rename to libs/JSystem/src/JAudio2/JAISeq.cpp diff --git a/src/JSystem/JAudio2/JAISeqDataMgr.cpp b/libs/JSystem/src/JAudio2/JAISeqDataMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeqDataMgr.cpp rename to libs/JSystem/src/JAudio2/JAISeqDataMgr.cpp diff --git a/src/JSystem/JAudio2/JAISeqMgr.cpp b/libs/JSystem/src/JAudio2/JAISeqMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeqMgr.cpp rename to libs/JSystem/src/JAudio2/JAISeqMgr.cpp diff --git a/src/JSystem/JAudio2/JAISound.cpp b/libs/JSystem/src/JAudio2/JAISound.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISound.cpp rename to libs/JSystem/src/JAudio2/JAISound.cpp diff --git a/src/JSystem/JAudio2/JAISoundChild.cpp b/libs/JSystem/src/JAudio2/JAISoundChild.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundChild.cpp rename to libs/JSystem/src/JAudio2/JAISoundChild.cpp diff --git a/src/JSystem/JAudio2/JAISoundHandles.cpp b/libs/JSystem/src/JAudio2/JAISoundHandles.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundHandles.cpp rename to libs/JSystem/src/JAudio2/JAISoundHandles.cpp diff --git a/src/JSystem/JAudio2/JAISoundInfo.cpp b/libs/JSystem/src/JAudio2/JAISoundInfo.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundInfo.cpp rename to libs/JSystem/src/JAudio2/JAISoundInfo.cpp diff --git a/src/JSystem/JAudio2/JAISoundParams.cpp b/libs/JSystem/src/JAudio2/JAISoundParams.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundParams.cpp rename to libs/JSystem/src/JAudio2/JAISoundParams.cpp diff --git a/src/JSystem/JAudio2/JAISoundStarter.cpp b/libs/JSystem/src/JAudio2/JAISoundStarter.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundStarter.cpp rename to libs/JSystem/src/JAudio2/JAISoundStarter.cpp diff --git a/src/JSystem/JAudio2/JAIStream.cpp b/libs/JSystem/src/JAudio2/JAIStream.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIStream.cpp rename to libs/JSystem/src/JAudio2/JAIStream.cpp diff --git a/src/JSystem/JAudio2/JAIStreamDataMgr.cpp b/libs/JSystem/src/JAudio2/JAIStreamDataMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIStreamDataMgr.cpp rename to libs/JSystem/src/JAudio2/JAIStreamDataMgr.cpp diff --git a/src/JSystem/JAudio2/JAIStreamMgr.cpp b/libs/JSystem/src/JAudio2/JAIStreamMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIStreamMgr.cpp rename to libs/JSystem/src/JAudio2/JAIStreamMgr.cpp diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/libs/JSystem/src/JAudio2/JASAiCtrl.cpp similarity index 99% rename from src/JSystem/JAudio2/JASAiCtrl.cpp rename to libs/JSystem/src/JAudio2/JASAiCtrl.cpp index f9f9ee97be..29eae172ed 100644 --- a/src/JSystem/JAudio2/JASAiCtrl.cpp +++ b/libs/JSystem/src/JAudio2/JASAiCtrl.cpp @@ -14,8 +14,8 @@ #include "JSystem/JAudio2/JASLfo.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include -#include +#include +#include #include s16* JASDriver::sDmaDacBuffer[3]; diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/libs/JSystem/src/JAudio2/JASAramStream.cpp similarity index 100% rename from src/JSystem/JAudio2/JASAramStream.cpp rename to libs/JSystem/src/JAudio2/JASAramStream.cpp diff --git a/src/JSystem/JAudio2/JASAudioReseter.cpp b/libs/JSystem/src/JAudio2/JASAudioReseter.cpp similarity index 98% rename from src/JSystem/JAudio2/JASAudioReseter.cpp rename to libs/JSystem/src/JAudio2/JASAudioReseter.cpp index 9ef9f57b31..4d4f3517c1 100644 --- a/src/JSystem/JAudio2/JASAudioReseter.cpp +++ b/libs/JSystem/src/JAudio2/JASAudioReseter.cpp @@ -5,7 +5,7 @@ #include "JSystem/JAudio2/JASCriticalSection.h" #include "JSystem/JAudio2/JASDriverIF.h" #include "JSystem/JAudio2/JASDSPChannel.h" -#include +#include JASAudioReseter::JASAudioReseter() { field_0x0 = 0; diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/libs/JSystem/src/JAudio2/JASAudioThread.cpp similarity index 99% rename from src/JSystem/JAudio2/JASAudioThread.cpp rename to libs/JSystem/src/JAudio2/JASAudioThread.cpp index 199b556033..42fc277fea 100644 --- a/src/JSystem/JAudio2/JASAudioThread.cpp +++ b/libs/JSystem/src/JAudio2/JASAudioThread.cpp @@ -9,7 +9,7 @@ #include "JSystem/JAudio2/JASProbe.h" #include "JSystem/JAudio2/JASReport.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include +#include #include JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority) diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/libs/JSystem/src/JAudio2/JASBNKParser.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBNKParser.cpp rename to libs/JSystem/src/JAudio2/JASBNKParser.cpp diff --git a/src/JSystem/JAudio2/JASBank.cpp b/libs/JSystem/src/JAudio2/JASBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBank.cpp rename to libs/JSystem/src/JAudio2/JASBank.cpp diff --git a/src/JSystem/JAudio2/JASBasicBank.cpp b/libs/JSystem/src/JAudio2/JASBasicBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBasicBank.cpp rename to libs/JSystem/src/JAudio2/JASBasicBank.cpp diff --git a/src/JSystem/JAudio2/JASBasicInst.cpp b/libs/JSystem/src/JAudio2/JASBasicInst.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBasicInst.cpp rename to libs/JSystem/src/JAudio2/JASBasicInst.cpp diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBasicWaveBank.cpp rename to libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/libs/JSystem/src/JAudio2/JASCalc.cpp similarity index 100% rename from src/JSystem/JAudio2/JASCalc.cpp rename to libs/JSystem/src/JAudio2/JASCalc.cpp diff --git a/src/JSystem/JAudio2/JASCallback.cpp b/libs/JSystem/src/JAudio2/JASCallback.cpp similarity index 100% rename from src/JSystem/JAudio2/JASCallback.cpp rename to libs/JSystem/src/JAudio2/JASCallback.cpp diff --git a/src/JSystem/JAudio2/JASChannel.cpp b/libs/JSystem/src/JAudio2/JASChannel.cpp similarity index 100% rename from src/JSystem/JAudio2/JASChannel.cpp rename to libs/JSystem/src/JAudio2/JASChannel.cpp diff --git a/src/JSystem/JAudio2/JASCmdStack.cpp b/libs/JSystem/src/JAudio2/JASCmdStack.cpp similarity index 98% rename from src/JSystem/JAudio2/JASCmdStack.cpp rename to libs/JSystem/src/JAudio2/JASCmdStack.cpp index 22b5a340e1..beaeee492e 100644 --- a/src/JSystem/JAudio2/JASCmdStack.cpp +++ b/libs/JSystem/src/JAudio2/JASCmdStack.cpp @@ -6,7 +6,7 @@ #include "JSystem/JAudio2/JASCmdStack.h" #include "JSystem/JAudio2/JASCriticalSection.h" -#include +#include JASPortCmd::TPortHead JASPortCmd::sCommandListOnce; diff --git a/src/JSystem/JAudio2/JASDSPChannel.cpp b/libs/JSystem/src/JAudio2/JASDSPChannel.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDSPChannel.cpp rename to libs/JSystem/src/JAudio2/JASDSPChannel.cpp diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/libs/JSystem/src/JAudio2/JASDSPInterface.cpp similarity index 99% rename from src/JSystem/JAudio2/JASDSPInterface.cpp rename to libs/JSystem/src/JAudio2/JASDSPInterface.cpp index 9b6bbc069f..39c9c486e2 100644 --- a/src/JSystem/JAudio2/JASDSPInterface.cpp +++ b/libs/JSystem/src/JAudio2/JASDSPInterface.cpp @@ -9,7 +9,7 @@ #include "JSystem/JAudio2/osdsp_task.h" #include "JSystem/JAudio2/JASCriticalSection.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include +#include JASDsp::TChannel* JASDsp::CH_BUF; diff --git a/src/JSystem/JAudio2/JASDriverIF.cpp b/libs/JSystem/src/JAudio2/JASDriverIF.cpp similarity index 98% rename from src/JSystem/JAudio2/JASDriverIF.cpp rename to libs/JSystem/src/JAudio2/JASDriverIF.cpp index 083a969413..2c9f305b61 100644 --- a/src/JSystem/JAudio2/JASDriverIF.cpp +++ b/libs/JSystem/src/JAudio2/JASDriverIF.cpp @@ -3,7 +3,7 @@ #include "JSystem/JAudio2/JASDriverIF.h" #include "JSystem/JAudio2/JASAiCtrl.h" #include "JSystem/JAudio2/JASDSPInterface.h" -#include +#include void JASDriver::setDSPLevel(f32 param_0) { JASDsp::setDSPMixerLevel(param_0); diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/libs/JSystem/src/JAudio2/JASDrumSet.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDrumSet.cpp rename to libs/JSystem/src/JAudio2/JASDrumSet.cpp diff --git a/src/JSystem/JAudio2/JASDvdThread.cpp b/libs/JSystem/src/JAudio2/JASDvdThread.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDvdThread.cpp rename to libs/JSystem/src/JAudio2/JASDvdThread.cpp diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/libs/JSystem/src/JAudio2/JASHeapCtrl.cpp similarity index 99% rename from src/JSystem/JAudio2/JASHeapCtrl.cpp rename to libs/JSystem/src/JAudio2/JASHeapCtrl.cpp index 70f3c0d5e4..65d19c03a9 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/libs/JSystem/src/JAudio2/JASHeapCtrl.cpp @@ -6,7 +6,12 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" + +#ifdef __REVOLUTION_SDK__ +#include +#else #include +#endif JASHeap::JASHeap(JASDisposer* disposer) : mTree(this) { mDisposer = disposer; diff --git a/src/JSystem/JAudio2/JASLfo.cpp b/libs/JSystem/src/JAudio2/JASLfo.cpp similarity index 100% rename from src/JSystem/JAudio2/JASLfo.cpp rename to libs/JSystem/src/JAudio2/JASLfo.cpp diff --git a/src/JSystem/JAudio2/JASOscillator.cpp b/libs/JSystem/src/JAudio2/JASOscillator.cpp similarity index 100% rename from src/JSystem/JAudio2/JASOscillator.cpp rename to libs/JSystem/src/JAudio2/JASOscillator.cpp diff --git a/src/JSystem/JAudio2/JASProbe.cpp b/libs/JSystem/src/JAudio2/JASProbe.cpp similarity index 100% rename from src/JSystem/JAudio2/JASProbe.cpp rename to libs/JSystem/src/JAudio2/JASProbe.cpp diff --git a/src/JSystem/JAudio2/JASRegisterParam.cpp b/libs/JSystem/src/JAudio2/JASRegisterParam.cpp similarity index 100% rename from src/JSystem/JAudio2/JASRegisterParam.cpp rename to libs/JSystem/src/JAudio2/JASRegisterParam.cpp diff --git a/src/JSystem/JAudio2/JASReport.cpp b/libs/JSystem/src/JAudio2/JASReport.cpp similarity index 100% rename from src/JSystem/JAudio2/JASReport.cpp rename to libs/JSystem/src/JAudio2/JASReport.cpp diff --git a/src/JSystem/JAudio2/JASResArcLoader.cpp b/libs/JSystem/src/JAudio2/JASResArcLoader.cpp similarity index 100% rename from src/JSystem/JAudio2/JASResArcLoader.cpp rename to libs/JSystem/src/JAudio2/JASResArcLoader.cpp diff --git a/src/JSystem/JAudio2/JASSeqCtrl.cpp b/libs/JSystem/src/JAudio2/JASSeqCtrl.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSeqCtrl.cpp rename to libs/JSystem/src/JAudio2/JASSeqCtrl.cpp diff --git a/src/JSystem/JAudio2/JASSeqParser.cpp b/libs/JSystem/src/JAudio2/JASSeqParser.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSeqParser.cpp rename to libs/JSystem/src/JAudio2/JASSeqParser.cpp diff --git a/src/JSystem/JAudio2/JASSeqReader.cpp b/libs/JSystem/src/JAudio2/JASSeqReader.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSeqReader.cpp rename to libs/JSystem/src/JAudio2/JASSeqReader.cpp diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/libs/JSystem/src/JAudio2/JASSimpleWaveBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSimpleWaveBank.cpp rename to libs/JSystem/src/JAudio2/JASSimpleWaveBank.cpp diff --git a/src/JSystem/JAudio2/JASSoundParams.cpp b/libs/JSystem/src/JAudio2/JASSoundParams.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSoundParams.cpp rename to libs/JSystem/src/JAudio2/JASSoundParams.cpp diff --git a/src/JSystem/JAudio2/JASTaskThread.cpp b/libs/JSystem/src/JAudio2/JASTaskThread.cpp similarity index 100% rename from src/JSystem/JAudio2/JASTaskThread.cpp rename to libs/JSystem/src/JAudio2/JASTaskThread.cpp diff --git a/src/JSystem/JAudio2/JASTrack.cpp b/libs/JSystem/src/JAudio2/JASTrack.cpp similarity index 100% rename from src/JSystem/JAudio2/JASTrack.cpp rename to libs/JSystem/src/JAudio2/JASTrack.cpp diff --git a/src/JSystem/JAudio2/JASTrackPort.cpp b/libs/JSystem/src/JAudio2/JASTrackPort.cpp similarity index 100% rename from src/JSystem/JAudio2/JASTrackPort.cpp rename to libs/JSystem/src/JAudio2/JASTrackPort.cpp diff --git a/src/JSystem/JAudio2/JASVoiceBank.cpp b/libs/JSystem/src/JAudio2/JASVoiceBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASVoiceBank.cpp rename to libs/JSystem/src/JAudio2/JASVoiceBank.cpp diff --git a/src/JSystem/JAudio2/JASWSParser.cpp b/libs/JSystem/src/JAudio2/JASWSParser.cpp similarity index 100% rename from src/JSystem/JAudio2/JASWSParser.cpp rename to libs/JSystem/src/JAudio2/JASWSParser.cpp diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp similarity index 99% rename from src/JSystem/JAudio2/JASWaveArcLoader.cpp rename to libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp index 277933fdb6..ad1a1e2a76 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp @@ -6,7 +6,7 @@ #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" #include -#include +#include #include JASHeap* JASWaveArcLoader::sAramHeap; diff --git a/src/JSystem/JAudio2/JAUAudience.cpp b/libs/JSystem/src/JAudio2/JAUAudience.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudience.cpp rename to libs/JSystem/src/JAudio2/JAUAudience.cpp diff --git a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp b/libs/JSystem/src/JAudio2/JAUAudioArcInterpreter.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp rename to libs/JSystem/src/JAudio2/JAUAudioArcInterpreter.cpp diff --git a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp b/libs/JSystem/src/JAudio2/JAUAudioArcLoader.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudioArcLoader.cpp rename to libs/JSystem/src/JAudio2/JAUAudioArcLoader.cpp diff --git a/src/JSystem/JAudio2/JAUAudioMgr.cpp b/libs/JSystem/src/JAudio2/JAUAudioMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudioMgr.cpp rename to libs/JSystem/src/JAudio2/JAUAudioMgr.cpp diff --git a/src/JSystem/JAudio2/JAUBankTable.cpp b/libs/JSystem/src/JAudio2/JAUBankTable.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUBankTable.cpp rename to libs/JSystem/src/JAudio2/JAUBankTable.cpp diff --git a/src/JSystem/JAudio2/JAUClusterSound.cpp b/libs/JSystem/src/JAudio2/JAUClusterSound.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUClusterSound.cpp rename to libs/JSystem/src/JAudio2/JAUClusterSound.cpp diff --git a/src/JSystem/JAudio2/JAUInitializer.cpp b/libs/JSystem/src/JAudio2/JAUInitializer.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUInitializer.cpp rename to libs/JSystem/src/JAudio2/JAUInitializer.cpp diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/src/JAudio2/JAUSectionHeap.cpp similarity index 99% rename from src/JSystem/JAudio2/JAUSectionHeap.cpp rename to libs/JSystem/src/JAudio2/JAUSectionHeap.cpp index f2592e3485..b0c127187d 100644 --- a/src/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/libs/JSystem/src/JAudio2/JAUSectionHeap.cpp @@ -14,7 +14,7 @@ #include "JSystem/JAudio2/JAUSoundTable.h" #include "JSystem/JAudio2/JAUStreamFileTable.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include +#include #include namespace { diff --git a/src/JSystem/JAudio2/JAUSeqCollection.cpp b/libs/JSystem/src/JAudio2/JAUSeqCollection.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSeqCollection.cpp rename to libs/JSystem/src/JAudio2/JAUSeqCollection.cpp diff --git a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/libs/JSystem/src/JAudio2/JAUSeqDataBlockMgr.cpp similarity index 99% rename from src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp rename to libs/JSystem/src/JAudio2/JAUSeqDataBlockMgr.cpp index 6b31c78a29..2fafe9a4bc 100644 --- a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp +++ b/libs/JSystem/src/JAudio2/JAUSeqDataBlockMgr.cpp @@ -7,7 +7,7 @@ #include "JSystem/JAudio2/JAUSeqDataBlockMgr.h" #include "JSystem/JAudio2/JAUSoundInfo.h" #include "JSystem/JAudio2/JASResArcLoader.h" -#include +#include JAUSeqDataBlock::JAUSeqDataBlock() : field_0x0(this) {} diff --git a/src/JSystem/JAudio2/JAUSoundAnimator.cpp b/libs/JSystem/src/JAudio2/JAUSoundAnimator.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSoundAnimator.cpp rename to libs/JSystem/src/JAudio2/JAUSoundAnimator.cpp diff --git a/src/JSystem/JAudio2/JAUSoundObject.cpp b/libs/JSystem/src/JAudio2/JAUSoundObject.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSoundObject.cpp rename to libs/JSystem/src/JAudio2/JAUSoundObject.cpp diff --git a/src/JSystem/JAudio2/JAUSoundTable.cpp b/libs/JSystem/src/JAudio2/JAUSoundTable.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSoundTable.cpp rename to libs/JSystem/src/JAudio2/JAUSoundTable.cpp diff --git a/src/JSystem/JAudio2/JAUStreamFileTable.cpp b/libs/JSystem/src/JAudio2/JAUStreamFileTable.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUStreamFileTable.cpp rename to libs/JSystem/src/JAudio2/JAUStreamFileTable.cpp diff --git a/src/JSystem/JAudio2/dspproc.cpp b/libs/JSystem/src/JAudio2/dspproc.cpp similarity index 100% rename from src/JSystem/JAudio2/dspproc.cpp rename to libs/JSystem/src/JAudio2/dspproc.cpp diff --git a/src/JSystem/JAudio2/dsptask.cpp b/libs/JSystem/src/JAudio2/dsptask.cpp similarity index 100% rename from src/JSystem/JAudio2/dsptask.cpp rename to libs/JSystem/src/JAudio2/dsptask.cpp diff --git a/src/JSystem/JAudio2/osdsp.cpp b/libs/JSystem/src/JAudio2/osdsp.cpp similarity index 94% rename from src/JSystem/JAudio2/osdsp.cpp rename to libs/JSystem/src/JAudio2/osdsp.cpp index f147b6e81b..a5641a7e6d 100644 --- a/src/JSystem/JAudio2/osdsp.cpp +++ b/libs/JSystem/src/JAudio2/osdsp.cpp @@ -2,8 +2,8 @@ #include "JSystem/JAudio2/osdsp.h" #include "JSystem/JAudio2/osdsp_task.h" -#include -#include +#include +#include extern "C" void __DSP_insert_task(DSPTaskInfo*); extern "C" void __DSP_boot_task(DSPTaskInfo*); diff --git a/src/JSystem/JAudio2/osdsp_task.cpp b/libs/JSystem/src/JAudio2/osdsp_task.cpp similarity index 98% rename from src/JSystem/JAudio2/osdsp_task.cpp rename to libs/JSystem/src/JAudio2/osdsp_task.cpp index 4643d93af8..d9f4973880 100644 --- a/src/JSystem/JAudio2/osdsp_task.cpp +++ b/libs/JSystem/src/JAudio2/osdsp_task.cpp @@ -2,8 +2,8 @@ #include "JSystem/JAudio2/osdsp_task.h" #include "JSystem/JAudio2/dspproc.h" -#include -#include +#include +#include extern DSPTaskInfo* __DSP_first_task; extern DSPTaskInfo* __DSP_curr_task; diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/src/JFramework/JFWDisplay.cpp similarity index 99% rename from src/JSystem/JFramework/JFWDisplay.cpp rename to libs/JSystem/src/JFramework/JFWDisplay.cpp index b7ca359da0..4041009ee7 100644 --- a/src/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/src/JFramework/JFWDisplay.cpp @@ -9,6 +9,8 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTProcBar.h" +#include +#include #include "global.h" #include "aurora/aurora.h" @@ -344,8 +346,8 @@ void JFWDisplay::waitBlanking(int param_0) { } static void waitForTick(u32 p1, u16 p2) { - - + + if (p1 != 0) { static OSTime nextTick = OSGetTime(); @@ -367,7 +369,7 @@ static void waitForTick(u32 p1, u16 p2) { } } while (((intptr_t)msg - (intptr_t)nextCount) < 0); nextCount = (intptr_t)msg + uVar1; - } + } } JSUList JFWAlarm::sList(false); diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/src/JFramework/JFWSystem.cpp similarity index 100% rename from src/JSystem/JFramework/JFWSystem.cpp rename to libs/JSystem/src/JFramework/JFWSystem.cpp diff --git a/src/JSystem/JGadget/binary.cpp b/libs/JSystem/src/JGadget/binary.cpp similarity index 100% rename from src/JSystem/JGadget/binary.cpp rename to libs/JSystem/src/JGadget/binary.cpp diff --git a/src/JSystem/JGadget/define.cpp b/libs/JSystem/src/JGadget/define.cpp similarity index 100% rename from src/JSystem/JGadget/define.cpp rename to libs/JSystem/src/JGadget/define.cpp diff --git a/src/JSystem/JGadget/dolphin-stream-JORFile.cpp b/libs/JSystem/src/JGadget/dolphin-stream-JORFile.cpp similarity index 100% rename from src/JSystem/JGadget/dolphin-stream-JORFile.cpp rename to libs/JSystem/src/JGadget/dolphin-stream-JORFile.cpp diff --git a/src/JSystem/JGadget/linklist.cpp b/libs/JSystem/src/JGadget/linklist.cpp similarity index 100% rename from src/JSystem/JGadget/linklist.cpp rename to libs/JSystem/src/JGadget/linklist.cpp diff --git a/src/JSystem/JGadget/search.cpp b/libs/JSystem/src/JGadget/search.cpp similarity index 100% rename from src/JSystem/JGadget/search.cpp rename to libs/JSystem/src/JGadget/search.cpp diff --git a/src/JSystem/JGadget/std-list.cpp b/libs/JSystem/src/JGadget/std-list.cpp similarity index 100% rename from src/JSystem/JGadget/std-list.cpp rename to libs/JSystem/src/JGadget/std-list.cpp diff --git a/src/JSystem/JGadget/std-stream.cpp b/libs/JSystem/src/JGadget/std-stream.cpp similarity index 100% rename from src/JSystem/JGadget/std-stream.cpp rename to libs/JSystem/src/JGadget/std-stream.cpp diff --git a/src/JSystem/JGadget/std-streambuf.cpp b/libs/JSystem/src/JGadget/std-streambuf.cpp similarity index 100% rename from src/JSystem/JGadget/std-streambuf.cpp rename to libs/JSystem/src/JGadget/std-streambuf.cpp diff --git a/src/JSystem/JGadget/std-string.cpp b/libs/JSystem/src/JGadget/std-string.cpp similarity index 100% rename from src/JSystem/JGadget/std-string.cpp rename to libs/JSystem/src/JGadget/std-string.cpp diff --git a/src/JSystem/JGadget/std-vector.cpp b/libs/JSystem/src/JGadget/std-vector.cpp similarity index 100% rename from src/JSystem/JGadget/std-vector.cpp rename to libs/JSystem/src/JGadget/std-vector.cpp diff --git a/src/JSystem/JGadget/textreader.cpp b/libs/JSystem/src/JGadget/textreader.cpp similarity index 100% rename from src/JSystem/JGadget/textreader.cpp rename to libs/JSystem/src/JGadget/textreader.cpp diff --git a/src/JSystem/JGadget/xml-scanner.cpp b/libs/JSystem/src/JGadget/xml-scanner.cpp similarity index 100% rename from src/JSystem/JGadget/xml-scanner.cpp rename to libs/JSystem/src/JGadget/xml-scanner.cpp diff --git a/src/JSystem/JHostIO/JHIComm.cpp b/libs/JSystem/src/JHostIO/JHIComm.cpp similarity index 100% rename from src/JSystem/JHostIO/JHIComm.cpp rename to libs/JSystem/src/JHostIO/JHIComm.cpp diff --git a/src/JSystem/JHostIO/JHICommonMem.cpp b/libs/JSystem/src/JHostIO/JHICommonMem.cpp similarity index 100% rename from src/JSystem/JHostIO/JHICommonMem.cpp rename to libs/JSystem/src/JHostIO/JHICommonMem.cpp diff --git a/src/JSystem/JHostIO/JHIMccBuf.cpp b/libs/JSystem/src/JHostIO/JHIMccBuf.cpp similarity index 100% rename from src/JSystem/JHostIO/JHIMccBuf.cpp rename to libs/JSystem/src/JHostIO/JHIMccBuf.cpp diff --git a/src/JSystem/JHostIO/JHIMemBuf.cpp b/libs/JSystem/src/JHostIO/JHIMemBuf.cpp similarity index 94% rename from src/JSystem/JHostIO/JHIMemBuf.cpp rename to libs/JSystem/src/JHostIO/JHIMemBuf.cpp index 7f02ca32b8..4fec9ad532 100644 --- a/src/JSystem/JHostIO/JHIMemBuf.cpp +++ b/libs/JSystem/src/JHostIO/JHIMemBuf.cpp @@ -2,7 +2,11 @@ #include "JSystem/JHostIO/JHICommonMem.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif int JHIMemBuf::create() { int rt = 1; diff --git a/src/JSystem/JHostIO/JHIRMcc.cpp b/libs/JSystem/src/JHostIO/JHIRMcc.cpp similarity index 100% rename from src/JSystem/JHostIO/JHIRMcc.cpp rename to libs/JSystem/src/JHostIO/JHIRMcc.cpp diff --git a/src/JSystem/JHostIO/JHIhioASync.cpp b/libs/JSystem/src/JHostIO/JHIhioASync.cpp similarity index 98% rename from src/JSystem/JHostIO/JHIhioASync.cpp rename to libs/JSystem/src/JHostIO/JHIhioASync.cpp index 0dc75b4e76..bc8c5b9e2c 100644 --- a/src/JSystem/JHostIO/JHIhioASync.cpp +++ b/libs/JSystem/src/JHostIO/JHIhioASync.cpp @@ -2,7 +2,11 @@ #include "JSystem/JHostIO/JHIMccBuf.h" #include "JSystem/JHostIO/JHIRMcc.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include "global.h" u32 gsEnableHostio; diff --git a/src/JSystem/JHostIO/JOREntry.cpp b/libs/JSystem/src/JHostIO/JOREntry.cpp similarity index 100% rename from src/JSystem/JHostIO/JOREntry.cpp rename to libs/JSystem/src/JHostIO/JOREntry.cpp diff --git a/src/JSystem/JHostIO/JORFile.cpp b/libs/JSystem/src/JHostIO/JORFile.cpp similarity index 98% rename from src/JSystem/JHostIO/JORFile.cpp rename to libs/JSystem/src/JHostIO/JORFile.cpp index 10dfa2af9a..f689f06534 100644 --- a/src/JSystem/JHostIO/JORFile.cpp +++ b/libs/JSystem/src/JHostIO/JORFile.cpp @@ -2,7 +2,11 @@ #include "JSystem/JHostIO/JORFile.h" #include "JSystem/JHostIO/JORServer.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif JORFile::JORFile() : mHandle(0), diff --git a/src/JSystem/JHostIO/JORHostInfo.cpp b/libs/JSystem/src/JHostIO/JORHostInfo.cpp similarity index 100% rename from src/JSystem/JHostIO/JORHostInfo.cpp rename to libs/JSystem/src/JHostIO/JORHostInfo.cpp diff --git a/src/JSystem/JHostIO/JORMessageBox.cpp b/libs/JSystem/src/JHostIO/JORMessageBox.cpp similarity index 100% rename from src/JSystem/JHostIO/JORMessageBox.cpp rename to libs/JSystem/src/JHostIO/JORMessageBox.cpp diff --git a/src/JSystem/JHostIO/JORServer.cpp b/libs/JSystem/src/JHostIO/JORServer.cpp similarity index 100% rename from src/JSystem/JHostIO/JORServer.cpp rename to libs/JSystem/src/JHostIO/JORServer.cpp diff --git a/src/JSystem/JHostIO/JORShellExecute.cpp b/libs/JSystem/src/JHostIO/JORShellExecute.cpp similarity index 100% rename from src/JSystem/JHostIO/JORShellExecute.cpp rename to libs/JSystem/src/JHostIO/JORShellExecute.cpp diff --git a/src/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/src/JKernel/JKRAram.cpp similarity index 99% rename from src/JSystem/JKernel/JKRAram.cpp rename to libs/JSystem/src/JKernel/JKRAram.cpp index bbc49ff7eb..59a2a7848e 100644 --- a/src/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/src/JKernel/JKRAram.cpp @@ -6,8 +6,13 @@ #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTException.h" +#ifdef __REVOLUTION_SDK__ +#include +#include +#else #include #include +#endif #include #if PLATFORM_GCN diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/src/JKernel/JKRAramArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramArchive.cpp rename to libs/JSystem/src/JKernel/JKRAramArchive.cpp diff --git a/src/JSystem/JKernel/JKRAramBlock.cpp b/libs/JSystem/src/JKernel/JKRAramBlock.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramBlock.cpp rename to libs/JSystem/src/JKernel/JKRAramBlock.cpp diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/libs/JSystem/src/JKernel/JKRAramHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramHeap.cpp rename to libs/JSystem/src/JKernel/JKRAramHeap.cpp diff --git a/src/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/src/JKernel/JKRAramPiece.cpp similarity index 99% rename from src/JSystem/JKernel/JKRAramPiece.cpp rename to libs/JSystem/src/JKernel/JKRAramPiece.cpp index d0b55ba07b..fd23501e97 100644 --- a/src/JSystem/JKernel/JKRAramPiece.cpp +++ b/libs/JSystem/src/JKernel/JKRAramPiece.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRAram.h" #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JUtility/JUTException.h" -#include +#include JKRAMCommand* JKRAramPiece::prepareCommand(int direction, uintptr_t src, uintptr_t dst, u32 length, JKRAramBlock* block, diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/src/JKernel/JKRAramStream.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramStream.cpp rename to libs/JSystem/src/JKernel/JKRAramStream.cpp diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/src/JKernel/JKRArchivePri.cpp similarity index 100% rename from src/JSystem/JKernel/JKRArchivePri.cpp rename to libs/JSystem/src/JKernel/JKRArchivePri.cpp diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/libs/JSystem/src/JKernel/JKRArchivePub.cpp similarity index 100% rename from src/JSystem/JKernel/JKRArchivePub.cpp rename to libs/JSystem/src/JKernel/JKRArchivePub.cpp diff --git a/src/JSystem/JKernel/JKRAssertHeap.cpp b/libs/JSystem/src/JKernel/JKRAssertHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAssertHeap.cpp rename to libs/JSystem/src/JKernel/JKRAssertHeap.cpp diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/src/JKernel/JKRCompArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRCompArchive.cpp rename to libs/JSystem/src/JKernel/JKRCompArchive.cpp diff --git a/src/JSystem/JKernel/JKRDecomp.cpp b/libs/JSystem/src/JKernel/JKRDecomp.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDecomp.cpp rename to libs/JSystem/src/JKernel/JKRDecomp.cpp diff --git a/src/JSystem/JKernel/JKRDisposer.cpp b/libs/JSystem/src/JKernel/JKRDisposer.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDisposer.cpp rename to libs/JSystem/src/JKernel/JKRDisposer.cpp diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp similarity index 99% rename from src/JSystem/JKernel/JKRDvdAramRipper.cpp rename to libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp index 2ab9b6497b..6829dcede0 100644 --- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp @@ -7,9 +7,9 @@ #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JSupport/JSUFileStream.h" -#include -#include -#include +#include +#include +#include #include "global.h" #include diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/src/JKernel/JKRDvdArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdArchive.cpp rename to libs/JSystem/src/JKernel/JKRDvdArchive.cpp diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/src/JKernel/JKRDvdFile.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdFile.cpp rename to libs/JSystem/src/JKernel/JKRDvdFile.cpp diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/src/JKernel/JKRDvdRipper.cpp similarity index 99% rename from src/JSystem/JKernel/JKRDvdRipper.cpp rename to libs/JSystem/src/JKernel/JKRDvdRipper.cpp index caa3b0ef88..ae644ee9e1 100644 --- a/src/JSystem/JKernel/JKRDvdRipper.cpp +++ b/libs/JSystem/src/JKernel/JKRDvdRipper.cpp @@ -9,8 +9,8 @@ #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JUtility/JUTException.h" #include -#include -#include +#include +#include #include static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*); diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/src/JKernel/JKRExpHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRExpHeap.cpp rename to libs/JSystem/src/JKernel/JKRExpHeap.cpp diff --git a/src/JSystem/JKernel/JKRFile.cpp b/libs/JSystem/src/JKernel/JKRFile.cpp similarity index 93% rename from src/JSystem/JKernel/JKRFile.cpp rename to libs/JSystem/src/JKernel/JKRFile.cpp index b267e93235..9aed6945fd 100644 --- a/src/JSystem/JKernel/JKRFile.cpp +++ b/libs/JSystem/src/JKernel/JKRFile.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRFile.h" -#include +#include void JKRFile::read(void* data, s32 length, s32 offset) { JUT_ASSERT(32, ( length & 0x1f ) == 0); diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/src/JKernel/JKRFileCache.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileCache.cpp rename to libs/JSystem/src/JKernel/JKRFileCache.cpp diff --git a/src/JSystem/JKernel/JKRFileFinder.cpp b/libs/JSystem/src/JKernel/JKRFileFinder.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileFinder.cpp rename to libs/JSystem/src/JKernel/JKRFileFinder.cpp diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/src/JKernel/JKRFileLoader.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileLoader.cpp rename to libs/JSystem/src/JKernel/JKRFileLoader.cpp diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/src/JKernel/JKRHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRHeap.cpp rename to libs/JSystem/src/JKernel/JKRHeap.cpp diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/src/JKernel/JKRMemArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRMemArchive.cpp rename to libs/JSystem/src/JKernel/JKRMemArchive.cpp diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/src/JKernel/JKRSolidHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRSolidHeap.cpp rename to libs/JSystem/src/JKernel/JKRSolidHeap.cpp diff --git a/src/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/src/JKernel/JKRThread.cpp similarity index 100% rename from src/JSystem/JKernel/JKRThread.cpp rename to libs/JSystem/src/JKernel/JKRThread.cpp diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/libs/JSystem/src/JMath/JMATrigonometric.cpp similarity index 100% rename from src/JSystem/JMath/JMATrigonometric.cpp rename to libs/JSystem/src/JMath/JMATrigonometric.cpp diff --git a/src/JSystem/JMath/JMath.cpp b/libs/JSystem/src/JMath/JMath.cpp similarity index 100% rename from src/JSystem/JMath/JMath.cpp rename to libs/JSystem/src/JMath/JMath.cpp diff --git a/src/JSystem/JMath/random.cpp b/libs/JSystem/src/JMath/random.cpp similarity index 100% rename from src/JSystem/JMath/random.cpp rename to libs/JSystem/src/JMath/random.cpp diff --git a/src/JSystem/JMessage/control.cpp b/libs/JSystem/src/JMessage/control.cpp similarity index 100% rename from src/JSystem/JMessage/control.cpp rename to libs/JSystem/src/JMessage/control.cpp diff --git a/src/JSystem/JMessage/data.cpp b/libs/JSystem/src/JMessage/data.cpp similarity index 100% rename from src/JSystem/JMessage/data.cpp rename to libs/JSystem/src/JMessage/data.cpp diff --git a/src/JSystem/JMessage/locale.cpp b/libs/JSystem/src/JMessage/locale.cpp similarity index 100% rename from src/JSystem/JMessage/locale.cpp rename to libs/JSystem/src/JMessage/locale.cpp diff --git a/src/JSystem/JMessage/processor.cpp b/libs/JSystem/src/JMessage/processor.cpp similarity index 100% rename from src/JSystem/JMessage/processor.cpp rename to libs/JSystem/src/JMessage/processor.cpp diff --git a/src/JSystem/JMessage/resource.cpp b/libs/JSystem/src/JMessage/resource.cpp similarity index 100% rename from src/JSystem/JMessage/resource.cpp rename to libs/JSystem/src/JMessage/resource.cpp diff --git a/src/JSystem/JParticle/JPABaseShape.cpp b/libs/JSystem/src/JParticle/JPABaseShape.cpp similarity index 99% rename from src/JSystem/JParticle/JPABaseShape.cpp rename to libs/JSystem/src/JParticle/JPABaseShape.cpp index 54991d2560..fffcf05cad 100644 --- a/src/JSystem/JParticle/JPABaseShape.cpp +++ b/libs/JSystem/src/JParticle/JPABaseShape.cpp @@ -6,8 +6,8 @@ #include "JSystem/JParticle/JPAEmitter.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JMath/JMATrigonometric.h" -#include -#include +#include +#include void JPASetPointSize(JPAEmitterWorkData* work) { GXSetPointSize((u8)(25.0f * work->mGlobalPtclScl.x), GX_TO_ONE); diff --git a/src/JSystem/JParticle/JPAChildShape.cpp b/libs/JSystem/src/JParticle/JPAChildShape.cpp similarity index 96% rename from src/JSystem/JParticle/JPAChildShape.cpp rename to libs/JSystem/src/JParticle/JPAChildShape.cpp index 4c2a0403b5..e360070022 100644 --- a/src/JSystem/JParticle/JPAChildShape.cpp +++ b/libs/JSystem/src/JParticle/JPAChildShape.cpp @@ -3,8 +3,8 @@ #include "JSystem/JParticle/JPAChildShape.h" #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAEmitter.h" -#include -#include +#include +#include void JPARegistChildPrmEnv(JPAEmitterWorkData* work) { JPAChildShape* csp = work->mpRes->getCsp(); diff --git a/src/JSystem/JParticle/JPADynamicsBlock.cpp b/libs/JSystem/src/JParticle/JPADynamicsBlock.cpp similarity index 100% rename from src/JSystem/JParticle/JPADynamicsBlock.cpp rename to libs/JSystem/src/JParticle/JPADynamicsBlock.cpp diff --git a/src/JSystem/JParticle/JPAEmitter.cpp b/libs/JSystem/src/JParticle/JPAEmitter.cpp similarity index 99% rename from src/JSystem/JParticle/JPAEmitter.cpp rename to libs/JSystem/src/JParticle/JPAEmitter.cpp index 5e7ccbc6dd..aa168a44a4 100644 --- a/src/JSystem/JParticle/JPAEmitter.cpp +++ b/libs/JSystem/src/JParticle/JPAEmitter.cpp @@ -5,7 +5,7 @@ #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JParticle/JPABaseShape.h" -#include +#include JPAEmitterCallBack::~JPAEmitterCallBack() { } diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/libs/JSystem/src/JParticle/JPAEmitterManager.cpp similarity index 99% rename from src/JSystem/JParticle/JPAEmitterManager.cpp rename to libs/JSystem/src/JParticle/JPAEmitterManager.cpp index 5af5785055..bd24df12d3 100644 --- a/src/JSystem/JParticle/JPAEmitterManager.cpp +++ b/libs/JSystem/src/JParticle/JPAEmitterManager.cpp @@ -6,7 +6,7 @@ #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHeap, u8 i_gidMax, u8 i_ridMax) { diff --git a/src/JSystem/JParticle/JPAExTexShape.cpp b/libs/JSystem/src/JParticle/JPAExTexShape.cpp similarity index 97% rename from src/JSystem/JParticle/JPAExTexShape.cpp rename to libs/JSystem/src/JParticle/JPAExTexShape.cpp index 0cf01703b9..bb9510050e 100644 --- a/src/JSystem/JParticle/JPAExTexShape.cpp +++ b/libs/JSystem/src/JParticle/JPAExTexShape.cpp @@ -3,7 +3,7 @@ #include "JSystem/JParticle/JPAExTexShape.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JParticle/JPAEmitter.h" -#include +#include void JPALoadExTex(JPAEmitterWorkData* work) { JPAExTexShape* ets = work->mpRes->getEts(); diff --git a/src/JSystem/JParticle/JPAExtraShape.cpp b/libs/JSystem/src/JParticle/JPAExtraShape.cpp similarity index 99% rename from src/JSystem/JParticle/JPAExtraShape.cpp rename to libs/JSystem/src/JParticle/JPAExtraShape.cpp index 43244dbce6..9fb84c36b6 100644 --- a/src/JSystem/JParticle/JPAExtraShape.cpp +++ b/libs/JSystem/src/JParticle/JPAExtraShape.cpp @@ -4,7 +4,7 @@ #include "JSystem/JMath/JMATrigonometric.h" #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAEmitter.h" -#include +#include void JPACalcScaleX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) { JPAExtraShape* esp = work->mpRes->getEsp(); diff --git a/src/JSystem/JParticle/JPAFieldBlock.cpp b/libs/JSystem/src/JParticle/JPAFieldBlock.cpp similarity index 100% rename from src/JSystem/JParticle/JPAFieldBlock.cpp rename to libs/JSystem/src/JParticle/JPAFieldBlock.cpp diff --git a/src/JSystem/JParticle/JPAKeyBlock.cpp b/libs/JSystem/src/JParticle/JPAKeyBlock.cpp similarity index 100% rename from src/JSystem/JParticle/JPAKeyBlock.cpp rename to libs/JSystem/src/JParticle/JPAKeyBlock.cpp diff --git a/src/JSystem/JParticle/JPAMath.cpp b/libs/JSystem/src/JParticle/JPAMath.cpp similarity index 100% rename from src/JSystem/JParticle/JPAMath.cpp rename to libs/JSystem/src/JParticle/JPAMath.cpp diff --git a/src/JSystem/JParticle/JPAParticle.cpp b/libs/JSystem/src/JParticle/JPAParticle.cpp similarity index 100% rename from src/JSystem/JParticle/JPAParticle.cpp rename to libs/JSystem/src/JParticle/JPAParticle.cpp diff --git a/src/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/src/JParticle/JPAResource.cpp similarity index 99% rename from src/JSystem/JParticle/JPAResource.cpp rename to libs/JSystem/src/JParticle/JPAResource.cpp index e6ffe884eb..56c8eec317 100644 --- a/src/JSystem/JParticle/JPAResource.cpp +++ b/libs/JSystem/src/JParticle/JPAResource.cpp @@ -11,7 +11,7 @@ #include "JSystem/JParticle/JPAKeyBlock.h" #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAResourceManager.h" -#include +#include #include "global.h" JPAResource::JPAResource() { diff --git a/src/JSystem/JParticle/JPAResourceLoader.cpp b/libs/JSystem/src/JParticle/JPAResourceLoader.cpp similarity index 100% rename from src/JSystem/JParticle/JPAResourceLoader.cpp rename to libs/JSystem/src/JParticle/JPAResourceLoader.cpp diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/libs/JSystem/src/JParticle/JPAResourceManager.cpp similarity index 100% rename from src/JSystem/JParticle/JPAResourceManager.cpp rename to libs/JSystem/src/JParticle/JPAResourceManager.cpp diff --git a/src/JSystem/JParticle/JPATexture.cpp b/libs/JSystem/src/JParticle/JPATexture.cpp similarity index 100% rename from src/JSystem/JParticle/JPATexture.cpp rename to libs/JSystem/src/JParticle/JPATexture.cpp diff --git a/src/JSystem/JStage/JSGActor.cpp b/libs/JSystem/src/JStage/JSGActor.cpp similarity index 100% rename from src/JSystem/JStage/JSGActor.cpp rename to libs/JSystem/src/JStage/JSGActor.cpp diff --git a/src/JSystem/JStage/JSGAmbientLight.cpp b/libs/JSystem/src/JStage/JSGAmbientLight.cpp similarity index 100% rename from src/JSystem/JStage/JSGAmbientLight.cpp rename to libs/JSystem/src/JStage/JSGAmbientLight.cpp diff --git a/src/JSystem/JStage/JSGCamera.cpp b/libs/JSystem/src/JStage/JSGCamera.cpp similarity index 100% rename from src/JSystem/JStage/JSGCamera.cpp rename to libs/JSystem/src/JStage/JSGCamera.cpp diff --git a/src/JSystem/JStage/JSGFog.cpp b/libs/JSystem/src/JStage/JSGFog.cpp similarity index 100% rename from src/JSystem/JStage/JSGFog.cpp rename to libs/JSystem/src/JStage/JSGFog.cpp diff --git a/src/JSystem/JStage/JSGLight.cpp b/libs/JSystem/src/JStage/JSGLight.cpp similarity index 100% rename from src/JSystem/JStage/JSGLight.cpp rename to libs/JSystem/src/JStage/JSGLight.cpp diff --git a/src/JSystem/JStage/JSGObject.cpp b/libs/JSystem/src/JStage/JSGObject.cpp similarity index 100% rename from src/JSystem/JStage/JSGObject.cpp rename to libs/JSystem/src/JStage/JSGObject.cpp diff --git a/src/JSystem/JStage/JSGSystem.cpp b/libs/JSystem/src/JStage/JSGSystem.cpp similarity index 100% rename from src/JSystem/JStage/JSGSystem.cpp rename to libs/JSystem/src/JStage/JSGSystem.cpp diff --git a/src/JSystem/JStudio/JStudio/ctb-data.cpp b/libs/JSystem/src/JStudio/JStudio/ctb-data.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/ctb-data.cpp rename to libs/JSystem/src/JStudio/JStudio/ctb-data.cpp diff --git a/src/JSystem/JStudio/JStudio/ctb.cpp b/libs/JSystem/src/JStudio/JStudio/ctb.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/ctb.cpp rename to libs/JSystem/src/JStudio/JStudio/ctb.cpp diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/src/JStudio/JStudio/functionvalue.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/functionvalue.cpp rename to libs/JSystem/src/JStudio/JStudio/functionvalue.cpp diff --git a/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp b/libs/JSystem/src/JStudio/JStudio/fvb-data-parse.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/fvb-data-parse.cpp rename to libs/JSystem/src/JStudio/JStudio/fvb-data-parse.cpp diff --git a/src/JSystem/JStudio/JStudio/fvb-data.cpp b/libs/JSystem/src/JStudio/JStudio/fvb-data.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/fvb-data.cpp rename to libs/JSystem/src/JStudio/JStudio/fvb-data.cpp diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/libs/JSystem/src/JStudio/JStudio/fvb.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/fvb.cpp rename to libs/JSystem/src/JStudio/JStudio/fvb.cpp diff --git a/src/JSystem/JStudio/JStudio/jstudio-control.cpp b/libs/JSystem/src/JStudio/JStudio/jstudio-control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/jstudio-control.cpp rename to libs/JSystem/src/JStudio/JStudio/jstudio-control.cpp diff --git a/src/JSystem/JStudio/JStudio/jstudio-data.cpp b/libs/JSystem/src/JStudio/JStudio/jstudio-data.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/jstudio-data.cpp rename to libs/JSystem/src/JStudio/JStudio/jstudio-data.cpp diff --git a/src/JSystem/JStudio/JStudio/jstudio-math.cpp b/libs/JSystem/src/JStudio/JStudio/jstudio-math.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/jstudio-math.cpp rename to libs/JSystem/src/JStudio/JStudio/jstudio-math.cpp diff --git a/src/JSystem/JStudio/JStudio/jstudio-object.cpp b/libs/JSystem/src/JStudio/JStudio/jstudio-object.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/jstudio-object.cpp rename to libs/JSystem/src/JStudio/JStudio/jstudio-object.cpp diff --git a/src/JSystem/JStudio/JStudio/object-id.cpp b/libs/JSystem/src/JStudio/JStudio/object-id.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/object-id.cpp rename to libs/JSystem/src/JStudio/JStudio/object-id.cpp diff --git a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp b/libs/JSystem/src/JStudio/JStudio/stb-data-parse.cpp similarity index 98% rename from src/JSystem/JStudio/JStudio/stb-data-parse.cpp rename to libs/JSystem/src/JStudio/JStudio/stb-data-parse.cpp index ec263a18e5..242f9f9beb 100644 --- a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp +++ b/libs/JSystem/src/JStudio/JStudio/stb-data-parse.cpp @@ -2,7 +2,7 @@ #include "JSystem/JStudio/JStudio/stb-data-parse.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include #include namespace JStudio { diff --git a/src/JSystem/JStudio/JStudio/stb-data.cpp b/libs/JSystem/src/JStudio/JStudio/stb-data.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/stb-data.cpp rename to libs/JSystem/src/JStudio/JStudio/stb-data.cpp diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/libs/JSystem/src/JStudio/JStudio/stb.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/stb.cpp rename to libs/JSystem/src/JStudio/JStudio/stb.cpp diff --git a/src/JSystem/JStudio/JStudioCameraEditor/control.cpp b/libs/JSystem/src/JStudio/JStudioCameraEditor/control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioCameraEditor/control.cpp rename to libs/JSystem/src/JStudio/JStudioCameraEditor/control.cpp diff --git a/src/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp b/libs/JSystem/src/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp rename to libs/JSystem/src/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp diff --git a/src/JSystem/JStudio/JStudioCameraEditor/csb-data.cpp b/libs/JSystem/src/JStudio/JStudioCameraEditor/csb-data.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioCameraEditor/csb-data.cpp rename to libs/JSystem/src/JStudio/JStudioCameraEditor/csb-data.cpp diff --git a/src/JSystem/JStudio/JStudioCameraEditor/csb.cpp b/libs/JSystem/src/JStudio/JStudioCameraEditor/csb.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioCameraEditor/csb.cpp rename to libs/JSystem/src/JStudio/JStudioCameraEditor/csb.cpp diff --git a/src/JSystem/JStudio/JStudioCameraEditor/sequence.cpp b/libs/JSystem/src/JStudio/JStudioCameraEditor/sequence.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioCameraEditor/sequence.cpp rename to libs/JSystem/src/JStudio/JStudioCameraEditor/sequence.cpp diff --git a/src/JSystem/JStudio/JStudioPreviewer/control.cpp b/libs/JSystem/src/JStudio/JStudioPreviewer/control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioPreviewer/control.cpp rename to libs/JSystem/src/JStudio/JStudioPreviewer/control.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/anchor.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/anchor.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/anchor.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/anchor.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/console.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/console.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/console.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/console.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/controlset-anchor.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/controlset-anchor.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/controlset-anchor.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/controlset-anchor.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/controlset-preview.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/controlset-preview.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/controlset-preview.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/controlset-preview.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/controlset.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/controlset.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/controlset.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/controlset.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/interface.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/interface.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/interface.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/interface.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/scroll.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/scroll.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/scroll.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/scroll.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/visual.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/visual.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/visual.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/visual.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/xml.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/xml.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/xml.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/xml.cpp diff --git a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp b/libs/JSystem/src/JStudio/JStudio_JAudio2/control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JAudio2/control.cpp rename to libs/JSystem/src/JStudio/JStudio_JAudio2/control.cpp diff --git a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/libs/JSystem/src/JStudio/JStudio_JAudio2/object-sound.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp rename to libs/JSystem/src/JStudio/JStudio_JAudio2/object-sound.cpp diff --git a/src/JSystem/JStudio/JStudio_JParticle/control.cpp b/libs/JSystem/src/JStudio/JStudio_JParticle/control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JParticle/control.cpp rename to libs/JSystem/src/JStudio/JStudio_JParticle/control.cpp diff --git a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/libs/JSystem/src/JStudio/JStudio_JParticle/object-particle.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp rename to libs/JSystem/src/JStudio/JStudio_JParticle/object-particle.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/control.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/control.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/control.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object-actor.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object-actor.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object-actor.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object-ambientlight.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object-ambientlight.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object-camera.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object-camera.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object-camera.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object-fog.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object-fog.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object-fog.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object-fog.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object-light.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object-light.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object-light.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object.cpp diff --git a/src/JSystem/JSupport/JSUFileStream.cpp b/libs/JSystem/src/JSupport/JSUFileStream.cpp similarity index 100% rename from src/JSystem/JSupport/JSUFileStream.cpp rename to libs/JSystem/src/JSupport/JSUFileStream.cpp diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/libs/JSystem/src/JSupport/JSUInputStream.cpp similarity index 96% rename from src/JSystem/JSupport/JSUInputStream.cpp rename to libs/JSystem/src/JSupport/JSUInputStream.cpp index 4a0c638699..10db7bdc96 100644 --- a/src/JSystem/JSupport/JSUInputStream.cpp +++ b/libs/JSystem/src/JSupport/JSUInputStream.cpp @@ -2,7 +2,11 @@ #include "JSystem/JSupport/JSUInputStream.h" #include "JSystem/JSupport/JSURandomInputStream.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif JSUInputStream::~JSUInputStream() { if (!isGood()) { diff --git a/src/JSystem/JSupport/JSUList.cpp b/libs/JSystem/src/JSupport/JSUList.cpp similarity index 100% rename from src/JSystem/JSupport/JSUList.cpp rename to libs/JSystem/src/JSupport/JSUList.cpp diff --git a/src/JSystem/JSupport/JSUMemoryStream.cpp b/libs/JSystem/src/JSupport/JSUMemoryStream.cpp similarity index 100% rename from src/JSystem/JSupport/JSUMemoryStream.cpp rename to libs/JSystem/src/JSupport/JSUMemoryStream.cpp diff --git a/src/JSystem/JSupport/JSUOutputStream.cpp b/libs/JSystem/src/JSupport/JSUOutputStream.cpp similarity index 94% rename from src/JSystem/JSupport/JSUOutputStream.cpp rename to libs/JSystem/src/JSupport/JSUOutputStream.cpp index dec0976ad3..d9f4a78100 100644 --- a/src/JSystem/JSupport/JSUOutputStream.cpp +++ b/libs/JSystem/src/JSupport/JSUOutputStream.cpp @@ -2,7 +2,11 @@ #include "JSystem/JSupport/JSUOutputStream.h" #include "JSystem/JSupport/JSURandomOutputStream.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include JSUOutputStream::~JSUOutputStream() { diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/libs/JSystem/src/JUtility/JUTAssert.cpp similarity index 99% rename from src/JSystem/JUtility/JUTAssert.cpp rename to libs/JSystem/src/JUtility/JUTAssert.cpp index 89182e7709..3f54bf511d 100644 --- a/src/JSystem/JUtility/JUTAssert.cpp +++ b/libs/JSystem/src/JUtility/JUTAssert.cpp @@ -5,7 +5,7 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include -#include +#include namespace JUTAssertion { diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/libs/JSystem/src/JUtility/JUTCacheFont.cpp similarity index 99% rename from src/JSystem/JUtility/JUTCacheFont.cpp rename to libs/JSystem/src/JUtility/JUTCacheFont.cpp index 64adcd84dc..37ba023d04 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/libs/JSystem/src/JUtility/JUTCacheFont.cpp @@ -5,7 +5,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JKernel/JKRAram.h" -#include +#include #include #include #include "angle_utils.h" diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/src/JUtility/JUTConsole.cpp similarity index 99% rename from src/JSystem/JUtility/JUTConsole.cpp rename to libs/JSystem/src/JUtility/JUTConsole.cpp index bd76a0cb9f..4fb9e43547 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/src/JUtility/JUTConsole.cpp @@ -6,7 +6,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTVideo.h" -#include +#include #include #include "global.h" diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/libs/JSystem/src/JUtility/JUTDbPrint.cpp similarity index 100% rename from src/JSystem/JUtility/JUTDbPrint.cpp rename to libs/JSystem/src/JUtility/JUTDbPrint.cpp diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/libs/JSystem/src/JUtility/JUTDirectFile.cpp similarity index 99% rename from src/JSystem/JUtility/JUTDirectFile.cpp rename to libs/JSystem/src/JUtility/JUTDirectFile.cpp index ce2c4354d5..52d124d74e 100644 --- a/src/JSystem/JUtility/JUTDirectFile.cpp +++ b/libs/JSystem/src/JUtility/JUTDirectFile.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTDirectFile.h" -#include +#include #include "global.h" #include diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/libs/JSystem/src/JUtility/JUTDirectPrint.cpp similarity index 99% rename from src/JSystem/JUtility/JUTDirectPrint.cpp rename to libs/JSystem/src/JUtility/JUTDirectPrint.cpp index ccb1f5c2e0..b8d5345c1d 100644 --- a/src/JSystem/JUtility/JUTDirectPrint.cpp +++ b/libs/JSystem/src/JUtility/JUTDirectPrint.cpp @@ -2,7 +2,7 @@ #include "JSystem/JUtility/JUTDirectPrint.h" #include -#include +#include #include "global.h" #include "angle_utils.h" diff --git a/src/JSystem/JUtility/JUTException.cpp b/libs/JSystem/src/JUtility/JUTException.cpp similarity index 99% rename from src/JSystem/JUtility/JUTException.cpp rename to libs/JSystem/src/JUtility/JUTException.cpp index f09f65089c..608b805977 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/src/JUtility/JUTException.cpp @@ -9,7 +9,11 @@ #include #include #include -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include #include diff --git a/src/JSystem/JUtility/JUTFader.cpp b/libs/JSystem/src/JUtility/JUTFader.cpp similarity index 100% rename from src/JSystem/JUtility/JUTFader.cpp rename to libs/JSystem/src/JUtility/JUTFader.cpp diff --git a/src/JSystem/JUtility/JUTFont.cpp b/libs/JSystem/src/JUtility/JUTFont.cpp similarity index 100% rename from src/JSystem/JUtility/JUTFont.cpp rename to libs/JSystem/src/JUtility/JUTFont.cpp diff --git a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp b/libs/JSystem/src/JUtility/JUTFontData_Ascfont_fix12.cpp similarity index 99% rename from src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp rename to libs/JSystem/src/JUtility/JUTFontData_Ascfont_fix12.cpp index f37bad6200..35979ebc9f 100644 --- a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp +++ b/libs/JSystem/src/JUtility/JUTFontData_Ascfont_fix12.cpp @@ -1,7 +1,11 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTResFont.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include "global.h" u8 const JUTResFONT_Ascfont_fix12[] ATTRIBUTE_ALIGN(32) = { diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/src/JUtility/JUTGamePad.cpp similarity index 100% rename from src/JSystem/JUtility/JUTGamePad.cpp rename to libs/JSystem/src/JUtility/JUTGamePad.cpp diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/libs/JSystem/src/JUtility/JUTGraphFifo.cpp similarity index 100% rename from src/JSystem/JUtility/JUTGraphFifo.cpp rename to libs/JSystem/src/JUtility/JUTGraphFifo.cpp diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/libs/JSystem/src/JUtility/JUTNameTab.cpp similarity index 100% rename from src/JSystem/JUtility/JUTNameTab.cpp rename to libs/JSystem/src/JUtility/JUTNameTab.cpp diff --git a/src/JSystem/JUtility/JUTPalette.cpp b/libs/JSystem/src/JUtility/JUTPalette.cpp similarity index 95% rename from src/JSystem/JUtility/JUTPalette.cpp rename to libs/JSystem/src/JUtility/JUTPalette.cpp index a62998442b..d98bf98c2e 100644 --- a/src/JSystem/JUtility/JUTPalette.cpp +++ b/libs/JSystem/src/JUtility/JUTPalette.cpp @@ -1,8 +1,8 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTPalette.h" -#include -#include +#include +#include void JUTPalette::storeTLUT(GXTlut param_0, ResTLUT* tlut) { if (tlut == NULL) { diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/libs/JSystem/src/JUtility/JUTProcBar.cpp similarity index 100% rename from src/JSystem/JUtility/JUTProcBar.cpp rename to libs/JSystem/src/JUtility/JUTProcBar.cpp diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/src/JUtility/JUTResFont.cpp similarity index 99% rename from src/JSystem/JUtility/JUTResFont.cpp rename to libs/JSystem/src/JUtility/JUTResFont.cpp index 7f36bc6d08..9efd746392 100644 --- a/src/JSystem/JUtility/JUTResFont.cpp +++ b/libs/JSystem/src/JUtility/JUTResFont.cpp @@ -5,7 +5,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" -#include +#include JUTResFont::JUTResFont() { initialize_state(); diff --git a/src/JSystem/JUtility/JUTResource.cpp b/libs/JSystem/src/JUtility/JUTResource.cpp similarity index 100% rename from src/JSystem/JUtility/JUTResource.cpp rename to libs/JSystem/src/JUtility/JUTResource.cpp diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/libs/JSystem/src/JUtility/JUTTexture.cpp similarity index 99% rename from src/JSystem/JUtility/JUTTexture.cpp rename to libs/JSystem/src/JUtility/JUTTexture.cpp index 8a3c00997c..271f036ba3 100644 --- a/src/JSystem/JUtility/JUTTexture.cpp +++ b/libs/JSystem/src/JUtility/JUTTexture.cpp @@ -2,7 +2,7 @@ #include "JSystem/JUtility/JUTTexture.h" #include "JSystem/JUtility/JUTPalette.h" -#include +#include JUTTexture::~JUTTexture() { if (getCaptureFlag()) { diff --git a/src/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/src/JUtility/JUTVideo.cpp similarity index 99% rename from src/JSystem/JUtility/JUTVideo.cpp rename to libs/JSystem/src/JUtility/JUTVideo.cpp index e54edcb51c..338a3b6f4d 100644 --- a/src/JSystem/JUtility/JUTVideo.cpp +++ b/libs/JSystem/src/JUtility/JUTVideo.cpp @@ -3,8 +3,8 @@ #include "JSystem/JUtility/JUTVideo.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTXfb.h" -#include -#include +#include +#include JUTVideo* JUTVideo::sManager; diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/libs/JSystem/src/JUtility/JUTXfb.cpp similarity index 98% rename from src/JSystem/JUtility/JUTXfb.cpp rename to libs/JSystem/src/JUtility/JUTXfb.cpp index 8e2f0a9173..2ce6085bf9 100644 --- a/src/JSystem/JUtility/JUTXfb.cpp +++ b/libs/JSystem/src/JUtility/JUTXfb.cpp @@ -3,7 +3,7 @@ #include "JSystem/JUtility/JUTXfb.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include void JUTXfb::clearIndex() { mDrawingXfbIndex = -1; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath similarity index 98% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath index a9e6715c74..fa856b9b80 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath @@ -2,7 +2,7 @@ #define MSL_CMATH_H_ #include -//#include +#include #define NAN (*(float*) __float_nan) #define HUGE_VALF (*(float*) __float_huge) @@ -175,6 +175,10 @@ inline float abs(float x) { return ::fabsf(x); } +inline long abs(long x) { + return ::labs(x); +} + inline float fmod(float x, float y) { return ::fmod(x, y); } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wcstoul.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wcstoul.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wcstoul.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wcstoul.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wmem.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wmem.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wmem.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wmem.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wprintf.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wprintf.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wprintf.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wprintf.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wscanf.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wscanf.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wscanf.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wscanf.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wcstoul.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wcstoul.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wcstoul.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wcstoul.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wmem.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wmem.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wmem.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wmem.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wprintf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wprintf.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wprintf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wprintf.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wscanf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wscanf.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wscanf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wscanf.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c similarity index 97% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c index 3916d03315..e94e6773c7 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c @@ -1,5 +1,5 @@ #include "uart_console_io_gcn.h" -#include +#include int InitializeUART(size_t); int WriteUARTN(unsigned char*, size_t); diff --git a/src/PowerPC_EABI_Support/MetroTRK/trk.h b/libs/PowerPC_EABI_Support/MetroTRK/trk.h similarity index 99% rename from src/PowerPC_EABI_Support/MetroTRK/trk.h rename to libs/PowerPC_EABI_Support/MetroTRK/trk.h index a90cf24d75..a831892236 100644 --- a/src/PowerPC_EABI_Support/MetroTRK/trk.h +++ b/libs/PowerPC_EABI_Support/MetroTRK/trk.h @@ -1,7 +1,7 @@ #ifndef __METROTRK_TRK_H__ #define __METROTRK_TRK_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h b/libs/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h similarity index 73% rename from src/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h index 6ef61bc186..28a45130e2 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h +++ b/libs/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h @@ -1,6 +1,6 @@ #ifndef CPLUSLIBPPC_H #define CPLUSLIBPPC_H -#include +#include #endif /* CPLUSLIBPPC_H */ diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h b/libs/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h b/libs/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h b/libs/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/NMWException.h b/libs/PowerPC_EABI_Support/Runtime/Inc/NMWException.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/NMWException.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/NMWException.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h b/libs/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h similarity index 79% rename from src/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h index 63cc422514..ba17672d64 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h +++ b/libs/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h @@ -1,6 +1,6 @@ #ifndef __INIT_CPP_EXCEPTIONS_H #define __INIT_CPP_EXCEPTIONS_H -#include +#include #endif /* __INIT_CPP_EXCEPTIONS_H */ diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/__ppc_eabi_linker.h b/libs/PowerPC_EABI_Support/Runtime/Inc/__ppc_eabi_linker.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/__ppc_eabi_linker.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/__ppc_eabi_linker.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h b/libs/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/ptmf.h b/libs/PowerPC_EABI_Support/Runtime/Inc/ptmf.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/ptmf.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/ptmf.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/runtime.h b/libs/PowerPC_EABI_Support/Runtime/Inc/runtime.h similarity index 69% rename from src/PowerPC_EABI_Support/Runtime/Inc/runtime.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/runtime.h index b70bc02086..5d2ba1cce4 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/runtime.h +++ b/libs/PowerPC_EABI_Support/Runtime/Inc/runtime.h @@ -1,6 +1,6 @@ #ifndef RUNTIME_H #define RUNTIME_H -#include +#include #endif /* RUNTIME_H */ diff --git a/src/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp b/libs/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp rename to libs/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp diff --git a/src/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c b/libs/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c similarity index 96% rename from src/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c rename to libs/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c index 33b700446d..6e59889e96 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c +++ b/libs/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c @@ -3,7 +3,7 @@ * Description: */ -#include +#include inline static void InitDefaultHeap(void) { void* arenaLo; diff --git a/src/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp b/libs/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp rename to libs/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp diff --git a/src/PowerPC_EABI_Support/Runtime/Src/NMWException.cp b/libs/PowerPC_EABI_Support/Runtime/Src/NMWException.cp similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/NMWException.cp rename to libs/PowerPC_EABI_Support/Runtime/Src/NMWException.cp diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp b/libs/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp rename to libs/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__mem.c b/libs/PowerPC_EABI_Support/Runtime/Src/__mem.c similarity index 95% rename from src/PowerPC_EABI_Support/Runtime/Src/__mem.c rename to libs/PowerPC_EABI_Support/Runtime/Src/__mem.c index bdf3410251..84c77474c0 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/__mem.c +++ b/libs/PowerPC_EABI_Support/Runtime/Src/__mem.c @@ -1,4 +1,8 @@ -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif __declspec(section ".init") void* memcpy(void* dst, const void* src, size_t n) { const unsigned char* s; diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c b/libs/PowerPC_EABI_Support/Runtime/Src/__va_arg.c similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c rename to libs/PowerPC_EABI_Support/Runtime/Src/__va_arg.c diff --git a/src/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c b/libs/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c rename to libs/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c diff --git a/src/PowerPC_EABI_Support/Runtime/Src/ptmf.c b/libs/PowerPC_EABI_Support/Runtime/Src/ptmf.c similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/ptmf.c rename to libs/PowerPC_EABI_Support/Runtime/Src/ptmf.c diff --git a/src/PowerPC_EABI_Support/Runtime/Src/runtime.c b/libs/PowerPC_EABI_Support/Runtime/Src/runtime.c similarity index 99% rename from src/PowerPC_EABI_Support/Runtime/Src/runtime.c rename to libs/PowerPC_EABI_Support/Runtime/Src/runtime.c index c06b108a4d..db6721f101 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/runtime.c +++ b/libs/PowerPC_EABI_Support/Runtime/Src/runtime.c @@ -1,4 +1,8 @@ -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #ifdef __cplusplus extern "C" { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c similarity index 99% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c index d881cbad20..13a30383ba 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c +++ b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c @@ -3,7 +3,11 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h" #include "TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h" #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" +#ifdef __REVOLUTION_SDK__ +#include +#else #include +#endif #include "global.h" extern u32 _db_stack_addr; diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c similarity index 99% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c index 9bfd2e02fd..4bf7447b6b 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c +++ b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c @@ -2,7 +2,7 @@ #include "TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h" #include "TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h" #include "TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h" -#include +#include #include "trk.h" void TRKInterruptHandler(); diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c similarity index 95% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c index 0a73fe5f10..f70141de34 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c +++ b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c @@ -4,7 +4,7 @@ */ #include "TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h" -// #include +// #include // void OSReport(char* fmt, ...) causes extra crclr instruction. // look into issue later diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c similarity index 93% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c index 53db0e46ba..3b2c408715 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c +++ b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c @@ -3,7 +3,7 @@ * Description: */ -#include +#include asm void TRK_flush_cache(u32, int) { // clang-format off diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c similarity index 98% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c index 43c1dbe374..a5abd68cdb 100644 --- a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c +++ b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c @@ -1,6 +1,6 @@ #include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" -#include +#include #define DDH_ERR_NOT_INITIALIZED -0x2711 #define DDH_ERR_ALREADY_INITIALIZED -0x2715 diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c similarity index 97% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c index 50e60d6ea9..6b99d18e01 100644 --- a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c +++ b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c @@ -1,8 +1,8 @@ #include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include "global.h" -#include -#include +#include +#include #define GDEV_BUF_SIZE (0x500) diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c diff --git a/include/dolphin/G2D.h b/libs/dolphin/include/dolphin/G2D.h similarity index 100% rename from include/dolphin/G2D.h rename to libs/dolphin/include/dolphin/G2D.h diff --git a/include/dolphin/ai.h b/libs/dolphin/include/dolphin/ai.h similarity index 94% rename from include/dolphin/ai.h rename to libs/dolphin/include/dolphin/ai.h index a42a59da2f..84db3343b0 100644 --- a/include/dolphin/ai.h +++ b/libs/dolphin/include/dolphin/ai.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_AI_H_ #define _DOLPHIN_AI_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -51,4 +48,3 @@ void AIReset(void); #endif #endif -#endif diff --git a/include/dolphin/am.h b/libs/dolphin/include/dolphin/am.h similarity index 100% rename from include/dolphin/am.h rename to libs/dolphin/include/dolphin/am.h diff --git a/include/dolphin/amc/AmcExi2Comm.h b/libs/dolphin/include/dolphin/amc/AmcExi2Comm.h similarity index 100% rename from include/dolphin/amc/AmcExi2Comm.h rename to libs/dolphin/include/dolphin/amc/AmcExi2Comm.h diff --git a/include/dolphin/amc/AmcTypes.h b/libs/dolphin/include/dolphin/amc/AmcTypes.h similarity index 100% rename from include/dolphin/amc/AmcTypes.h rename to libs/dolphin/include/dolphin/amc/AmcTypes.h diff --git a/include/dolphin/ar.h b/libs/dolphin/include/dolphin/ar.h similarity index 96% rename from include/dolphin/ar.h rename to libs/dolphin/include/dolphin/ar.h index 46f163aef9..a1206b4ea4 100644 --- a/include/dolphin/ar.h +++ b/libs/dolphin/include/dolphin/ar.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_AR_H_ #define _DOLPHIN_AR_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -75,4 +72,3 @@ void __ARClearInterrupt(void); #endif #endif -#endif diff --git a/include/dolphin/ax.h b/libs/dolphin/include/dolphin/ax.h similarity index 99% rename from include/dolphin/ax.h rename to libs/dolphin/include/dolphin/ax.h index c43a3cb639..0148446ee8 100644 --- a/include/dolphin/ax.h +++ b/libs/dolphin/include/dolphin/ax.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_AX_H_ #define _DOLPHIN_AX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -325,5 +322,4 @@ extern u16 axDspSlave[AX_DSP_SLAVE_LENGTH]; } #endif -#endif #endif // _DOLPHIN_AX_H_ diff --git a/include/dolphin/axart.h b/libs/dolphin/include/dolphin/axart.h similarity index 98% rename from include/dolphin/axart.h rename to libs/dolphin/include/dolphin/axart.h index 1f12409f8f..46c375f71c 100644 --- a/include/dolphin/axart.h +++ b/libs/dolphin/include/dolphin/axart.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_AXART_H_ #define _DOLPHIN_AXART_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -224,5 +221,4 @@ void AXARTLpf(AXART_LPF*, AXVPB*); } #endif -#endif #endif // _DOLPHIN_AXART_H_ diff --git a/include/dolphin/axfx.h b/libs/dolphin/include/dolphin/axfx.h similarity index 98% rename from include/dolphin/axfx.h rename to libs/dolphin/include/dolphin/axfx.h index 93b34d33b6..53933c858f 100644 --- a/include/dolphin/axfx.h +++ b/libs/dolphin/include/dolphin/axfx.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_AXFX_H_ #define _DOLPHIN_AXFX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -196,5 +193,4 @@ void AXFXReverbStdCallback(AXFX_BUFFERUPDATE* bufferUpdate, AXFX_REVERBSTD* reve } #endif -#endif #endif // _DOLPHIN_AXFX_H_ diff --git a/include/dolphin/base/PPCArch.h b/libs/dolphin/include/dolphin/base/PPCArch.h similarity index 99% rename from include/dolphin/base/PPCArch.h rename to libs/dolphin/include/dolphin/base/PPCArch.h index bb9e2845ab..8bdd0dd976 100644 --- a/include/dolphin/base/PPCArch.h +++ b/libs/dolphin/include/dolphin/base/PPCArch.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_PPCARCH #define _DOLPHIN_PPCARCH -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -542,5 +539,4 @@ void PMInstructions(void); } #endif -#endif #endif // _DOLPHIN_PPCARCH diff --git a/include/dolphin/card.h b/libs/dolphin/include/dolphin/card.h similarity index 99% rename from include/dolphin/card.h rename to libs/dolphin/include/dolphin/card.h index 6487d88f43..6ed175b71c 100644 --- a/include/dolphin/card.h +++ b/libs/dolphin/include/dolphin/card.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_CARD_H_ #define _DOLPHIN_CARD_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -323,4 +320,3 @@ s32 CARDWrite(CARDFileInfo* fileInfo, void* buf, s32 length, s32 offset); #endif #endif -#endif diff --git a/include/dolphin/charPipeline/fileCache.h b/libs/dolphin/include/dolphin/charPipeline/fileCache.h similarity index 100% rename from include/dolphin/charPipeline/fileCache.h rename to libs/dolphin/include/dolphin/charPipeline/fileCache.h diff --git a/include/dolphin/charPipeline/structures.h b/libs/dolphin/include/dolphin/charPipeline/structures.h similarity index 100% rename from include/dolphin/charPipeline/structures.h rename to libs/dolphin/include/dolphin/charPipeline/structures.h diff --git a/include/dolphin/charPipeline/structures/HTable.h b/libs/dolphin/include/dolphin/charPipeline/structures/HTable.h similarity index 100% rename from include/dolphin/charPipeline/structures/HTable.h rename to libs/dolphin/include/dolphin/charPipeline/structures/HTable.h diff --git a/include/dolphin/charPipeline/structures/List.h b/libs/dolphin/include/dolphin/charPipeline/structures/List.h similarity index 100% rename from include/dolphin/charPipeline/structures/List.h rename to libs/dolphin/include/dolphin/charPipeline/structures/List.h diff --git a/include/dolphin/charPipeline/structures/Tree.h b/libs/dolphin/include/dolphin/charPipeline/structures/Tree.h similarity index 100% rename from include/dolphin/charPipeline/structures/Tree.h rename to libs/dolphin/include/dolphin/charPipeline/structures/Tree.h diff --git a/include/dolphin/charPipeline/structures/dolphinString.h b/libs/dolphin/include/dolphin/charPipeline/structures/dolphinString.h similarity index 100% rename from include/dolphin/charPipeline/structures/dolphinString.h rename to libs/dolphin/include/dolphin/charPipeline/structures/dolphinString.h diff --git a/include/dolphin/charPipeline/texPalette.h b/libs/dolphin/include/dolphin/charPipeline/texPalette.h similarity index 100% rename from include/dolphin/charPipeline/texPalette.h rename to libs/dolphin/include/dolphin/charPipeline/texPalette.h diff --git a/include/dolphin/db.h b/libs/dolphin/include/dolphin/db.h similarity index 84% rename from include/dolphin/db.h rename to libs/dolphin/include/dolphin/db.h index 0a35c06198..c62f188e40 100644 --- a/include/dolphin/db.h +++ b/libs/dolphin/include/dolphin/db.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_DB_H_ #define _DOLPHIN_DB_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -22,5 +19,4 @@ u32 DBRead(u8*, u32); } #endif -#endif #endif // _DOLPHIN_DB_H_ diff --git a/include/dolphin/db/DBInterface.h b/libs/dolphin/include/dolphin/db/DBInterface.h similarity index 89% rename from include/dolphin/db/DBInterface.h rename to libs/dolphin/include/dolphin/db/DBInterface.h index 58a90f1e5d..7bfa354272 100644 --- a/include/dolphin/db/DBInterface.h +++ b/libs/dolphin/include/dolphin/db/DBInterface.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_DBINTERFACE_H_ #define _DOLPHIN_DBINTERFACE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -32,4 +29,3 @@ void __DBSetPresent(u32 value); #endif #endif -#endif diff --git a/include/dolphin/demo.h b/libs/dolphin/include/dolphin/demo.h similarity index 100% rename from include/dolphin/demo.h rename to libs/dolphin/include/dolphin/demo.h diff --git a/include/dolphin/demo/DEMOAVX.h b/libs/dolphin/include/dolphin/demo/DEMOAVX.h similarity index 100% rename from include/dolphin/demo/DEMOAVX.h rename to libs/dolphin/include/dolphin/demo/DEMOAVX.h diff --git a/include/dolphin/demo/DEMOInit.h b/libs/dolphin/include/dolphin/demo/DEMOInit.h similarity index 100% rename from include/dolphin/demo/DEMOInit.h rename to libs/dolphin/include/dolphin/demo/DEMOInit.h diff --git a/include/dolphin/demo/DEMOPad.h b/libs/dolphin/include/dolphin/demo/DEMOPad.h similarity index 100% rename from include/dolphin/demo/DEMOPad.h rename to libs/dolphin/include/dolphin/demo/DEMOPad.h diff --git a/include/dolphin/demo/DEMOPuts.h b/libs/dolphin/include/dolphin/demo/DEMOPuts.h similarity index 100% rename from include/dolphin/demo/DEMOPuts.h rename to libs/dolphin/include/dolphin/demo/DEMOPuts.h diff --git a/include/dolphin/demo/DEMOStats.h b/libs/dolphin/include/dolphin/demo/DEMOStats.h similarity index 100% rename from include/dolphin/demo/DEMOStats.h rename to libs/dolphin/include/dolphin/demo/DEMOStats.h diff --git a/include/dolphin/demo/DEMOWin.h b/libs/dolphin/include/dolphin/demo/DEMOWin.h similarity index 100% rename from include/dolphin/demo/DEMOWin.h rename to libs/dolphin/include/dolphin/demo/DEMOWin.h diff --git a/include/dolphin/dolphin.h b/libs/dolphin/include/dolphin/dolphin.h similarity index 87% rename from include/dolphin/dolphin.h rename to libs/dolphin/include/dolphin/dolphin.h index a81740a6cf..ac1ebcf7b0 100644 --- a/include/dolphin/dolphin.h +++ b/libs/dolphin/include/dolphin/dolphin.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_H_ #define _DOLPHIN_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -25,4 +22,3 @@ #include #endif -#endif diff --git a/include/dolphin/dsp.h b/libs/dolphin/include/dolphin/dsp.h similarity index 95% rename from include/dolphin/dsp.h rename to libs/dolphin/include/dolphin/dsp.h index 42c5e5f97f..72ffa82e62 100644 --- a/include/dolphin/dsp.h +++ b/libs/dolphin/include/dolphin/dsp.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_DSP_H_ #define _DOLPHIN_DSP_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -58,4 +55,3 @@ DSPTaskInfo* __DSPGetCurrentTask(void); #endif #endif -#endif diff --git a/include/dolphin/dtk.h b/libs/dolphin/include/dolphin/dtk.h similarity index 100% rename from include/dolphin/dtk.h rename to libs/dolphin/include/dolphin/dtk.h diff --git a/include/dolphin/dvd.h b/libs/dolphin/include/dolphin/dvd.h similarity index 99% rename from include/dolphin/dvd.h rename to libs/dolphin/include/dolphin/dvd.h index 382e82c318..ae036cad3f 100644 --- a/include/dolphin/dvd.h +++ b/libs/dolphin/include/dolphin/dvd.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_DVD_H_ #define _DOLPHIN_DVD_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -237,4 +234,3 @@ void DVDDumpWaitingQueue(void); #endif #endif -#endif diff --git a/include/dolphin/exi.h b/libs/dolphin/include/dolphin/exi.h similarity index 97% rename from include/dolphin/exi.h rename to libs/dolphin/include/dolphin/exi.h index 17cfc7d563..f094c36130 100644 --- a/include/dolphin/exi.h +++ b/libs/dolphin/include/dolphin/exi.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_EXI_H_ #define _DOLPHIN_EXI_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -104,4 +101,3 @@ char* EXIGetTypeString(u32 type); #endif #endif -#endif diff --git a/include/dolphin/gd.h b/libs/dolphin/include/dolphin/gd.h similarity index 84% rename from include/dolphin/gd.h rename to libs/dolphin/include/dolphin/gd.h index 2a39517353..57c929dad6 100644 --- a/include/dolphin/gd.h +++ b/libs/dolphin/include/dolphin/gd.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_H_ #define _DOLPHIN_GD_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -15,4 +12,3 @@ #include #endif -#endif diff --git a/include/dolphin/gd/GDBase.h b/libs/dolphin/include/dolphin/gd/GDBase.h similarity index 97% rename from include/dolphin/gd/GDBase.h rename to libs/dolphin/include/dolphin/gd/GDBase.h index 264f25bc4d..3e148c3228 100644 --- a/include/dolphin/gd/GDBase.h +++ b/libs/dolphin/include/dolphin/gd/GDBase.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_BASE_H #define _DOLPHIN_GD_BASE_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -152,4 +149,3 @@ static inline u32 GDGetGDLObjOffset(const GDLObj* dl) { #endif #endif -#endif diff --git a/include/dolphin/gd/GDFile.h b/libs/dolphin/include/dolphin/gd/GDFile.h similarity index 88% rename from include/dolphin/gd/GDFile.h rename to libs/dolphin/include/dolphin/gd/GDFile.h index 8ccd30a19b..3589fbb7ee 100644 --- a/include/dolphin/gd/GDFile.h +++ b/libs/dolphin/include/dolphin/gd/GDFile.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_FILE_H #define _DOLPHIN_GD_FILE_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -32,4 +29,3 @@ s32 GDReadDLFile(const char* fName, u32* numDLs, u32* numPLs, GDGList** DLDescAr #endif #endif -#endif diff --git a/include/dolphin/gd/GDGeometry.h b/libs/dolphin/include/dolphin/gd/GDGeometry.h similarity index 99% rename from include/dolphin/gd/GDGeometry.h rename to libs/dolphin/include/dolphin/gd/GDGeometry.h index 77bb313725..3b0424fbd4 100644 --- a/include/dolphin/gd/GDGeometry.h +++ b/libs/dolphin/include/dolphin/gd/GDGeometry.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_GEOMETRY_H_ #define _DOLPHIN_GD_GEOMETRY_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -525,4 +522,3 @@ void GDSetCoPlanar(u8 enable); #endif #endif -#endif diff --git a/include/dolphin/gd/GDIndirect.h b/libs/dolphin/include/dolphin/gd/GDIndirect.h similarity index 97% rename from include/dolphin/gd/GDIndirect.h rename to libs/dolphin/include/dolphin/gd/GDIndirect.h index 80064d577c..4ca854c31b 100644 --- a/include/dolphin/gd/GDIndirect.h +++ b/libs/dolphin/include/dolphin/gd/GDIndirect.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_INDIRECT_H_ #define _DOLPHIN_GD_INDIRECT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -92,4 +89,3 @@ void __GDSetIndTexMask(u32 mask); #endif #endif -#endif diff --git a/include/dolphin/gd/GDLight.h b/libs/dolphin/include/dolphin/gd/GDLight.h similarity index 96% rename from include/dolphin/gd/GDLight.h rename to libs/dolphin/include/dolphin/gd/GDLight.h index bc53ec4954..9c4f68d38d 100644 --- a/include/dolphin/gd/GDLight.h +++ b/libs/dolphin/include/dolphin/gd/GDLight.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_LIGHT_H_ #define _DOLPHIN_GD_LIGHT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include "global.h" @@ -79,4 +76,3 @@ inline static u16 __GDLightID2Offset(GXLightID id) { #endif #endif -#endif diff --git a/include/dolphin/gd/GDPixel.h b/libs/dolphin/include/dolphin/gd/GDPixel.h similarity index 97% rename from include/dolphin/gd/GDPixel.h rename to libs/dolphin/include/dolphin/gd/GDPixel.h index 8d9611f22f..158b04ec1f 100644 --- a/include/dolphin/gd/GDPixel.h +++ b/libs/dolphin/include/dolphin/gd/GDPixel.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_PIXEL_H #define _DOLPHIN_GD_PIXEL_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -96,4 +93,3 @@ void GDSetDrawSync(u16 token); #endif #endif -#endif diff --git a/include/dolphin/gd/GDTev.h b/libs/dolphin/include/dolphin/gd/GDTev.h similarity index 98% rename from include/dolphin/gd/GDTev.h rename to libs/dolphin/include/dolphin/gd/GDTev.h index f81cba54ed..baec8b5e2e 100644 --- a/include/dolphin/gd/GDTev.h +++ b/libs/dolphin/include/dolphin/gd/GDTev.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_TEV_H #define _DOLPHIN_GD_TEV_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -134,4 +131,3 @@ void GDSetTevOrder(GXTevStageID evenStage, GXTexCoordID coord0, GXTexMapID map0, #endif #endif -#endif diff --git a/include/dolphin/gd/GDTexture.h b/libs/dolphin/include/dolphin/gd/GDTexture.h similarity index 97% rename from include/dolphin/gd/GDTexture.h rename to libs/dolphin/include/dolphin/gd/GDTexture.h index d041de665b..2370cbb52b 100644 --- a/include/dolphin/gd/GDTexture.h +++ b/libs/dolphin/include/dolphin/gd/GDTexture.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_TEXTURE_H #define _DOLPHIN_GD_TEXTURE_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -128,4 +125,3 @@ void GDLoadTlutRaw(u32 tlut_ptr_raw, u32 tmem_addr, GXTlutSize size); #endif #endif -#endif diff --git a/include/dolphin/gd/GDTransform.h b/libs/dolphin/include/dolphin/gd/GDTransform.h similarity index 95% rename from include/dolphin/gd/GDTransform.h rename to libs/dolphin/include/dolphin/gd/GDTransform.h index e3699519f9..8d0159fdb0 100644 --- a/include/dolphin/gd/GDTransform.h +++ b/libs/dolphin/include/dolphin/gd/GDTransform.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_TRANSFORM_H_ #define _DOLPHIN_GD_TRANSFORM_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -57,4 +54,3 @@ void GDSetProjection(const Mtx44 mtx, GXProjectionType type); #endif #endif -#endif diff --git a/include/dolphin/gf.h b/libs/dolphin/include/dolphin/gf.h similarity index 73% rename from include/dolphin/gf.h rename to libs/dolphin/include/dolphin/gf.h index 31a7fd5910..50676aeab8 100644 --- a/include/dolphin/gf.h +++ b/libs/dolphin/include/dolphin/gf.h @@ -1,13 +1,9 @@ #ifndef _DOLPHIN_GF_H_ #define _DOLPHIN_GF_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include #include #endif -#endif diff --git a/include/dolphin/gf/GFGeometry.h b/libs/dolphin/include/dolphin/gf/GFGeometry.h similarity index 92% rename from include/dolphin/gf/GFGeometry.h rename to libs/dolphin/include/dolphin/gf/GFGeometry.h index 4d6c885807..c0866a5e10 100644 --- a/include/dolphin/gf/GFGeometry.h +++ b/libs/dolphin/include/dolphin/gf/GFGeometry.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GF_GFGEOMETRY_H_ #define _DOLPHIN_GF_GFGEOMETRY_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #define GF_GEN_MODE(nTexGens, nChans, nTevs, cm, nInds) \ @@ -41,5 +38,4 @@ static inline void GFWriteXFCmd(u16 addr, u32 val) { void GFSetGenMode2(u8 nTexGens, u8 nChans, u8 nTevs, u8 nInds, GXCullMode cm); -#endif #endif /* _DOLPHIN_GF_GFGEOMETRY_H_ */ diff --git a/include/dolphin/gf/GFLight.h b/libs/dolphin/include/dolphin/gf/GFLight.h similarity index 70% rename from include/dolphin/gf/GFLight.h rename to libs/dolphin/include/dolphin/gf/GFLight.h index 570f58e88e..3c4e222ae6 100644 --- a/include/dolphin/gf/GFLight.h +++ b/libs/dolphin/include/dolphin/gf/GFLight.h @@ -1,12 +1,8 @@ #ifndef _DOLPHIN_GF_GFLIGHT_H #define _DOLPHIN_GF_GFLIGHT_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include void GFSetChanAmbColor(GXChannelID chan, GXColor color); -#endif #endif /* _DOLPHIN_GF_GFLIGHT_H */ diff --git a/include/dolphin/gf/GFPixel.h b/libs/dolphin/include/dolphin/gf/GFPixel.h similarity index 87% rename from include/dolphin/gf/GFPixel.h rename to libs/dolphin/include/dolphin/gf/GFPixel.h index a200b776f1..93b7ff99a1 100644 --- a/include/dolphin/gf/GFPixel.h +++ b/libs/dolphin/include/dolphin/gf/GFPixel.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GF_GFPIXEL_H #define _DOLPHIN_GF_GFPIXEL_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include void GFSetFog(GXFogType type, f32 startz, f32 endz, f32 nearz, f32 farz, GXColor color); @@ -13,5 +10,4 @@ void GFSetBlendModeEtc(GXBlendMode type, GXBlendFactor src_factor, u8 dither_enable); void GFSetZMode(u8 compare_enable, GXCompare func, u8 update_enable); -#endif #endif /* _DOLPHIN_GF_GFPIXEL_H */ diff --git a/include/dolphin/gf/GFTev.h b/libs/dolphin/include/dolphin/gf/GFTev.h similarity index 70% rename from include/dolphin/gf/GFTev.h rename to libs/dolphin/include/dolphin/gf/GFTev.h index 2a20479e70..ade4c412ae 100644 --- a/include/dolphin/gf/GFTev.h +++ b/libs/dolphin/include/dolphin/gf/GFTev.h @@ -1,12 +1,8 @@ #ifndef _DOLPHIN_GF_GFTEV_H #define _DOLPHIN_GF_GFTEV_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include void GFSetTevColorS10(GXTevRegID reg, GXColorS10 color); -#endif #endif /* _DOLPHIN_GF_GFTEV_H */ diff --git a/include/dolphin/gx.h b/libs/dolphin/include/dolphin/gx.h similarity index 93% rename from include/dolphin/gx.h rename to libs/dolphin/include/dolphin/gx.h index 100fe8a8d9..0e90e543e1 100644 --- a/include/dolphin/gx.h +++ b/libs/dolphin/include/dolphin/gx.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_H_ #define _DOLPHIN_GX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -41,4 +38,3 @@ void GXSetDrawSync(u16 token); #endif #endif -#endif diff --git a/include/dolphin/gx/GXBump.h b/libs/dolphin/include/dolphin/gx/GXBump.h similarity index 95% rename from include/dolphin/gx/GXBump.h rename to libs/dolphin/include/dolphin/gx/GXBump.h index 61118c0876..2a24dc69f8 100644 --- a/include/dolphin/gx/GXBump.h +++ b/libs/dolphin/include/dolphin/gx/GXBump.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXBUMP_H_ #define _DOLPHIN_GX_GXBUMP_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -30,4 +27,3 @@ void __GXSetIndirectMask(u32 mask); #endif #endif -#endif diff --git a/include/dolphin/gx/GXCommandList.h b/libs/dolphin/include/dolphin/gx/GXCommandList.h similarity index 92% rename from include/dolphin/gx/GXCommandList.h rename to libs/dolphin/include/dolphin/gx/GXCommandList.h index e89037e774..9adae3cb79 100644 --- a/include/dolphin/gx/GXCommandList.h +++ b/libs/dolphin/include/dolphin/gx/GXCommandList.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXCOMMANDLIST_H_ #define _DOLPHIN_GX_GXCOMMANDLIST_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #define GX_NOP 0x00 @@ -38,4 +35,3 @@ extern u8 GXTexImage3Ids[8]; extern u8 GXTexTlutIds[8]; #endif -#endif diff --git a/include/dolphin/gx/GXCpu2Efb.h b/libs/dolphin/include/dolphin/gx/GXCpu2Efb.h similarity index 91% rename from include/dolphin/gx/GXCpu2Efb.h rename to libs/dolphin/include/dolphin/gx/GXCpu2Efb.h index 32263310b9..46aa3e3369 100644 --- a/include/dolphin/gx/GXCpu2Efb.h +++ b/libs/dolphin/include/dolphin/gx/GXCpu2Efb.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXCPU2EFB_H_ #define _DOLPHIN_GX_GXCPU2EFB_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -30,4 +27,3 @@ u32 GXDecompressZ16(u32 z16, GXZFmt16 zfmt); #endif #endif -#endif diff --git a/include/dolphin/gx/GXCull.h b/libs/dolphin/include/dolphin/gx/GXCull.h similarity index 80% rename from include/dolphin/gx/GXCull.h rename to libs/dolphin/include/dolphin/gx/GXCull.h index 14a3fcbfd3..cac4381812 100644 --- a/include/dolphin/gx/GXCull.h +++ b/libs/dolphin/include/dolphin/gx/GXCull.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXCULL_H_ #define _DOLPHIN_GX_GXCULL_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -19,4 +16,3 @@ void GXSetCoPlanar(GXBool enable); #endif #endif -#endif diff --git a/include/dolphin/gx/GXDispList.h b/libs/dolphin/include/dolphin/gx/GXDispList.h similarity index 79% rename from include/dolphin/gx/GXDispList.h rename to libs/dolphin/include/dolphin/gx/GXDispList.h index fb6fd3d400..357fb8f7e0 100644 --- a/include/dolphin/gx/GXDispList.h +++ b/libs/dolphin/include/dolphin/gx/GXDispList.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXDISPLIST_H_ #define _DOLPHIN_GX_GXDISPLIST_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -19,4 +16,3 @@ void GXCallDisplayList(void* list, u32 nbytes); #endif #endif -#endif diff --git a/include/dolphin/gx/GXDraw.h b/libs/dolphin/include/dolphin/gx/GXDraw.h similarity index 86% rename from include/dolphin/gx/GXDraw.h rename to libs/dolphin/include/dolphin/gx/GXDraw.h index 75e58d7408..c8e779345a 100644 --- a/include/dolphin/gx/GXDraw.h +++ b/libs/dolphin/include/dolphin/gx/GXDraw.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXDRAW_H_ #define _DOLPHIN_GX_GXDRAW_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -25,4 +22,3 @@ u32 GXGenNormalTable(u8 depth, f32* table); #endif #endif -#endif diff --git a/include/dolphin/gx/GXEnum.h b/libs/dolphin/include/dolphin/gx/GXEnum.h similarity index 99% rename from include/dolphin/gx/GXEnum.h rename to libs/dolphin/include/dolphin/gx/GXEnum.h index 49f97ace7b..cd84f22399 100644 --- a/include/dolphin/gx/GXEnum.h +++ b/libs/dolphin/include/dolphin/gx/GXEnum.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXENUM_H_ #define _DOLPHIN_GX_GXENUM_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include typedef u8 GXBool; @@ -925,4 +922,3 @@ typedef enum _GXCPRegs { } GXCPRegs; #endif -#endif diff --git a/include/dolphin/gx/GXFifo.h b/libs/dolphin/include/dolphin/gx/GXFifo.h similarity index 95% rename from include/dolphin/gx/GXFifo.h rename to libs/dolphin/include/dolphin/gx/GXFifo.h index 8dbc020363..069f36a4ea 100644 --- a/include/dolphin/gx/GXFifo.h +++ b/libs/dolphin/include/dolphin/gx/GXFifo.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXFIFO_H_ #define _DOLPHIN_GX_GXFIFO_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -47,4 +44,3 @@ void GXRestoreWriteGatherPipe(void); #endif #endif -#endif diff --git a/include/dolphin/gx/GXFrameBuffer.h b/libs/dolphin/include/dolphin/gx/GXFrameBuffer.h similarity index 96% rename from include/dolphin/gx/GXFrameBuffer.h rename to libs/dolphin/include/dolphin/gx/GXFrameBuffer.h index 99b1af436f..73b513fa32 100644 --- a/include/dolphin/gx/GXFrameBuffer.h +++ b/libs/dolphin/include/dolphin/gx/GXFrameBuffer.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXFRAMEBUFFER_H_ #define _DOLPHIN_GX_GXFRAMEBUFFER_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -67,4 +64,3 @@ f32 GXGetYScaleFactor(u16 efbHeight, u16 xfbHeight); #endif #endif -#endif diff --git a/include/dolphin/gx/GXGeometry.h b/libs/dolphin/include/dolphin/gx/GXGeometry.h similarity index 95% rename from include/dolphin/gx/GXGeometry.h rename to libs/dolphin/include/dolphin/gx/GXGeometry.h index 3b49a3ff37..614cd48310 100644 --- a/include/dolphin/gx/GXGeometry.h +++ b/libs/dolphin/include/dolphin/gx/GXGeometry.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXGEOMETRY_H_ #define _DOLPHIN_GX_GXGEOMETRY_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -53,4 +50,3 @@ void GXEnableTexOffsets(GXTexCoordID coord, u8 line_enable, u8 point_enable); #endif #endif -#endif diff --git a/include/dolphin/gx/GXGet.h b/libs/dolphin/include/dolphin/gx/GXGet.h similarity index 97% rename from include/dolphin/gx/GXGet.h rename to libs/dolphin/include/dolphin/gx/GXGet.h index 553201d51f..d1ba630a46 100644 --- a/include/dolphin/gx/GXGet.h +++ b/libs/dolphin/include/dolphin/gx/GXGet.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXGET_H_ #define _DOLPHIN_GX_GXGET_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -65,4 +62,3 @@ void GXGetScissor(u32* left, u32* top, u32* wd, u32* ht); #endif #endif -#endif diff --git a/include/dolphin/gx/GXLighting.h b/libs/dolphin/include/dolphin/gx/GXLighting.h similarity index 94% rename from include/dolphin/gx/GXLighting.h rename to libs/dolphin/include/dolphin/gx/GXLighting.h index fb1af06882..83c5aae423 100644 --- a/include/dolphin/gx/GXLighting.h +++ b/libs/dolphin/include/dolphin/gx/GXLighting.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXLIGHTING_H_ #define _DOLPHIN_GX_GXLIGHTING_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -33,4 +30,3 @@ void GXSetChanCtrl(GXChannelID chan, GXBool enable, GXColorSrc amb_src, GXColorS #endif #endif -#endif diff --git a/include/dolphin/gx/GXManage.h b/libs/dolphin/include/dolphin/gx/GXManage.h similarity index 91% rename from include/dolphin/gx/GXManage.h rename to libs/dolphin/include/dolphin/gx/GXManage.h index 2a5784b84a..fd899d3619 100644 --- a/include/dolphin/gx/GXManage.h +++ b/libs/dolphin/include/dolphin/gx/GXManage.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXMANAGE_H_ #define _DOLPHIN_GX_GXMANAGE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -37,4 +34,3 @@ GXDrawDoneCallback GXSetDrawDoneCallback(GXDrawDoneCallback cb); #endif #endif -#endif diff --git a/include/dolphin/gx/GXPerf.h b/libs/dolphin/include/dolphin/gx/GXPerf.h similarity index 93% rename from include/dolphin/gx/GXPerf.h rename to libs/dolphin/include/dolphin/gx/GXPerf.h index f579e4201a..bd1b474aa8 100644 --- a/include/dolphin/gx/GXPerf.h +++ b/libs/dolphin/include/dolphin/gx/GXPerf.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXPERF_H_ #define _DOLPHIN_GX_GXPERF_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -31,4 +28,3 @@ u32 GXReadClksPerVtx(void); #endif #endif -#endif diff --git a/include/dolphin/gx/GXPixel.h b/libs/dolphin/include/dolphin/gx/GXPixel.h similarity index 93% rename from include/dolphin/gx/GXPixel.h rename to libs/dolphin/include/dolphin/gx/GXPixel.h index ed3e245db5..d61838d1a9 100644 --- a/include/dolphin/gx/GXPixel.h +++ b/libs/dolphin/include/dolphin/gx/GXPixel.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXPIXEL_H_ #define _DOLPHIN_GX_GXPIXEL_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -31,4 +28,3 @@ void GXSetFogColor(GXColor color); #endif #endif -#endif diff --git a/include/dolphin/gx/GXStruct.h b/libs/dolphin/include/dolphin/gx/GXStruct.h similarity index 95% rename from include/dolphin/gx/GXStruct.h rename to libs/dolphin/include/dolphin/gx/GXStruct.h index d460f76d55..3e528e5069 100644 --- a/include/dolphin/gx/GXStruct.h +++ b/libs/dolphin/include/dolphin/gx/GXStruct.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXSTRUCT_H_ #define _DOLPHIN_GX_GXSTRUCT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -84,4 +81,3 @@ typedef struct _GXVtxAttrFmtList { #endif #endif -#endif diff --git a/include/dolphin/gx/GXTev.h b/libs/dolphin/include/dolphin/gx/GXTev.h similarity index 95% rename from include/dolphin/gx/GXTev.h rename to libs/dolphin/include/dolphin/gx/GXTev.h index a804fd0ccd..8deb22d083 100644 --- a/include/dolphin/gx/GXTev.h +++ b/libs/dolphin/include/dolphin/gx/GXTev.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXTEV_H_ #define _DOLPHIN_GX_GXTEV_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -34,4 +31,3 @@ void GXSetNumTevStages(u8 nStages); #endif #endif -#endif diff --git a/include/dolphin/gx/GXTexture.h b/libs/dolphin/include/dolphin/gx/GXTexture.h similarity index 97% rename from include/dolphin/gx/GXTexture.h rename to libs/dolphin/include/dolphin/gx/GXTexture.h index e84dcffe47..f42dc2295a 100644 --- a/include/dolphin/gx/GXTexture.h +++ b/libs/dolphin/include/dolphin/gx/GXTexture.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXTEXTURE_H_ #define _DOLPHIN_GX_GXTEXTURE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -53,4 +50,3 @@ void GXInitTexObjMaxAniso(GXTexObj* obj, GXAnisotropy max_aniso); #endif #endif -#endif diff --git a/include/dolphin/gx/GXTransform.h b/libs/dolphin/include/dolphin/gx/GXTransform.h similarity index 93% rename from include/dolphin/gx/GXTransform.h rename to libs/dolphin/include/dolphin/gx/GXTransform.h index f433f65f44..1e7f94e579 100644 --- a/include/dolphin/gx/GXTransform.h +++ b/libs/dolphin/include/dolphin/gx/GXTransform.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXTRANSFORM_H_ #define _DOLPHIN_GX_GXTRANSFORM_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -33,5 +30,5 @@ void GXSetZScaleOffset(f32 scale, f32 offset); #ifdef __cplusplus } #endif -#endif + #endif diff --git a/include/dolphin/gx/GXVerify.h b/libs/dolphin/include/dolphin/gx/GXVerify.h similarity index 88% rename from include/dolphin/gx/GXVerify.h rename to libs/dolphin/include/dolphin/gx/GXVerify.h index b1a299e0da..93a1b29e58 100644 --- a/include/dolphin/gx/GXVerify.h +++ b/libs/dolphin/include/dolphin/gx/GXVerify.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXVERIFY_H_ #define _DOLPHIN_GX_GXVERIFY_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -30,4 +27,3 @@ void __GXVerifyVATImm(GXAttr attr, GXCompCnt cnt, GXCompType type, u8 frac); #endif #endif -#endif diff --git a/include/dolphin/gx/GXVert.h b/libs/dolphin/include/dolphin/gx/GXVert.h similarity index 68% rename from include/dolphin/gx/GXVert.h rename to libs/dolphin/include/dolphin/gx/GXVert.h index ddf01179bf..91b7d7cc0b 100644 --- a/include/dolphin/gx/GXVert.h +++ b/libs/dolphin/include/dolphin/gx/GXVert.h @@ -1,49 +1,6 @@ #ifndef _DOLPHIN_GX_GXVERT_H_ #define _DOLPHIN_GX_GXVERT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#elif defined(TARGET_PC) -// On PC, include Aurora's GXVert for GXPosition/GXNormal/GXColor/GXTexCoord/GXEnd -// (extern functions implemented in Aurora's GXVert.cpp, stream-based vertex buffers) -#include "../../../extern/aurora/include/dolphin/gx/GXVert.h" - -// Aurora's GXVert.h does not provide GXCmd, GXParam, GXMatrixIndex, or a valid -// GXWGFifo target. J3D code uses these for low-level display list writes. -// We declare them as extern (implemented in stubs.cpp) and provide a dummy -// GXWGFifo that writes into a throw-away buffer so direct FIFO writes don't crash. - -// Replace Aurora's GXWGFifo macro (pointing to 0xCC008000) with an extern variable -#undef GXWGFifo -#ifdef __cplusplus -extern "C" { -#endif - -// PPCWGPipe is already typedef'd by Aurora's GXVert.h above. -// Dummy FIFO sink: direct GXWGFifo writes in J3DFifo.h land here harmlessly. -extern volatile PPCWGPipe GXWGFifo; - -void GXCmd1u8(const u8 x); -void GXCmd1u16(const u16 x); -void GXCmd1u32(const u32 x); - -void GXParam1u8(const u8 x); -void GXParam1u16(const u16 x); -void GXParam1u32(const u32 x); -void GXParam1s8(const s8 x); -void GXParam1s16(const s16 x); -void GXParam1s32(const s32 x); -void GXParam1f32(const f32 x); -void GXParam3f32(const f32 x, const f32 y, const f32 z); -void GXParam4f32(const f32 x, const f32 y, const f32 z, const f32 w); - -void GXMatrixIndex1u8(const u8 x); - -#ifdef __cplusplus -} -#endif - -#else #include #include @@ -181,4 +138,3 @@ FUNC_1PARAM(GXMatrixIndex, u8) #endif #endif -#endif diff --git a/include/dolphin/hio.h b/libs/dolphin/include/dolphin/hio.h similarity index 100% rename from include/dolphin/hio.h rename to libs/dolphin/include/dolphin/hio.h diff --git a/include/dolphin/hw_regs.h b/libs/dolphin/include/dolphin/hw_regs.h similarity index 100% rename from include/dolphin/hw_regs.h rename to libs/dolphin/include/dolphin/hw_regs.h diff --git a/include/dolphin/mcc.h b/libs/dolphin/include/dolphin/mcc.h similarity index 100% rename from include/dolphin/mcc.h rename to libs/dolphin/include/dolphin/mcc.h diff --git a/include/dolphin/mix.h b/libs/dolphin/include/dolphin/mix.h similarity index 97% rename from include/dolphin/mix.h rename to libs/dolphin/include/dolphin/mix.h index aa9a22b1dd..f58b3d63dc 100644 --- a/include/dolphin/mix.h +++ b/libs/dolphin/include/dolphin/mix.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_MIX_H_ #define _DOLPHIN_MIX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -95,5 +92,4 @@ void MIXUpdateSettings(void); } #endif -#endif #endif // _DOLPHIN_MIX_H_ diff --git a/include/dolphin/_mtx.h b/libs/dolphin/include/dolphin/mtx.h similarity index 99% rename from include/dolphin/_mtx.h rename to libs/dolphin/include/dolphin/mtx.h index 4201269dc8..23c832d7f1 100644 --- a/include/dolphin/_mtx.h +++ b/libs/dolphin/include/dolphin/mtx.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_MTX_H_ #define _DOLPHIN_MTX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -376,4 +373,3 @@ void C_QUATCompA(const Quaternion* qprev, const Quaternion* q, const Quaternion* #endif #endif -#endif diff --git a/include/dolphin/os.h b/libs/dolphin/include/dolphin/os.h similarity index 99% rename from include/dolphin/os.h rename to libs/dolphin/include/dolphin/os.h index 79ed4efc7c..4d536a6572 100644 --- a/include/dolphin/os.h +++ b/libs/dolphin/include/dolphin/os.h @@ -4,10 +4,6 @@ #include #include -#ifdef __REVOLUTION_SDK__ -#include -#else - #include #include @@ -421,5 +417,4 @@ static inline void OSInitFastCast(void) { } #endif -#endif // __REVOLUTION_SDK__ -#endif // _DOLPHIN_OS_H_ +#endif diff --git a/include/dolphin/os/OSAlarm.h b/libs/dolphin/include/dolphin/os/OSAlarm.h similarity index 92% rename from include/dolphin/os/OSAlarm.h rename to libs/dolphin/include/dolphin/os/OSAlarm.h index 43e4822142..3105039181 100644 --- a/include/dolphin/os/OSAlarm.h +++ b/libs/dolphin/include/dolphin/os/OSAlarm.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSALARM_H_ #define _DOLPHIN_OSALARM_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -36,5 +33,4 @@ void OSCancelAlarms(u32 tag); } #endif -#endif #endif // _DOLPHIN_OSALARM_H_ diff --git a/include/dolphin/os/OSAlloc.h b/libs/dolphin/include/dolphin/os/OSAlloc.h similarity index 91% rename from include/dolphin/os/OSAlloc.h rename to libs/dolphin/include/dolphin/os/OSAlloc.h index 426b6ae439..77eb88661f 100644 --- a/include/dolphin/os/OSAlloc.h +++ b/libs/dolphin/include/dolphin/os/OSAlloc.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSALLOC_H_ #define _DOLPHIN_OSALLOC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -35,4 +32,3 @@ void OSVisitAllocated(void (*visitor)(void*, u32)); #endif #endif -#endif diff --git a/include/dolphin/os/OSCache.h b/libs/dolphin/include/dolphin/os/OSCache.h similarity index 93% rename from include/dolphin/os/OSCache.h rename to libs/dolphin/include/dolphin/os/OSCache.h index 2b4bbfd07e..89e7ce96ba 100644 --- a/include/dolphin/os/OSCache.h +++ b/libs/dolphin/include/dolphin/os/OSCache.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSCACHE_H_ #define _DOLPHIN_OSCACHE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -39,4 +36,3 @@ void __OSCacheInit(void); #endif #endif -#endif diff --git a/include/dolphin/os/OSContext.h b/libs/dolphin/include/dolphin/os/OSContext.h similarity index 98% rename from include/dolphin/os/OSContext.h rename to libs/dolphin/include/dolphin/os/OSContext.h index 900baf40af..cbb0b92e4e 100644 --- a/include/dolphin/os/OSContext.h +++ b/libs/dolphin/include/dolphin/os/OSContext.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSCONTEXT_H_ #define _DOLPHIN_OSCONTEXT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -174,4 +171,3 @@ void OSFillFPUContext(OSContext* context); #endif #endif -#endif diff --git a/include/dolphin/os/OSDC.h b/libs/dolphin/include/dolphin/os/OSDC.h similarity index 84% rename from include/dolphin/os/OSDC.h rename to libs/dolphin/include/dolphin/os/OSDC.h index 995c1630cc..bab2d68edc 100644 --- a/include/dolphin/os/OSDC.h +++ b/libs/dolphin/include/dolphin/os/OSDC.h @@ -1,10 +1,6 @@ #ifndef _DOLPHIN_OSDC_H_ #define _DOLPHIN_OSDC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else - #ifdef __cplusplus extern "C" { #endif @@ -25,4 +21,3 @@ void DCBlockInvalidate(void* addr); #endif #endif -#endif diff --git a/include/dolphin/os/OSError.h b/libs/dolphin/include/dolphin/os/OSError.h similarity index 93% rename from include/dolphin/os/OSError.h rename to libs/dolphin/include/dolphin/os/OSError.h index aeeaede148..4a2fc7bd71 100644 --- a/include/dolphin/os/OSError.h +++ b/libs/dolphin/include/dolphin/os/OSError.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSERROR_H_ #define _DOLPHIN_OSERROR_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -39,4 +36,3 @@ extern OSErrorHandler __OSErrorTable[17]; #endif #endif -#endif diff --git a/include/dolphin/os/OSException.h b/libs/dolphin/include/dolphin/os/OSException.h similarity index 97% rename from include/dolphin/os/OSException.h rename to libs/dolphin/include/dolphin/os/OSException.h index 0b909ca202..e9a2f22569 100644 --- a/include/dolphin/os/OSException.h +++ b/libs/dolphin/include/dolphin/os/OSException.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSEXCEPTION_H_ #define _DOLPHIN_OSEXCEPTION_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -61,5 +58,4 @@ __OSExceptionHandler __OSGetExceptionHandler(__OSException exception); } #endif -#endif #endif // _DOLPHIN_OSEXCEPTION_H_ diff --git a/include/dolphin/os/OSExec.h b/libs/dolphin/include/dolphin/os/OSExec.h similarity index 91% rename from include/dolphin/os/OSExec.h rename to libs/dolphin/include/dolphin/os/OSExec.h index 7fd5380b70..af0dc4da0c 100644 --- a/include/dolphin/os/OSExec.h +++ b/libs/dolphin/include/dolphin/os/OSExec.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSEXEC_H_ #define _DOLPHIN_OSEXEC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -36,4 +33,3 @@ void OSExecl(const char* dolfile, const char* arg0, ...); #endif #endif -#endif diff --git a/include/dolphin/os/OSFont.h b/libs/dolphin/include/dolphin/os/OSFont.h similarity index 94% rename from include/dolphin/os/OSFont.h rename to libs/dolphin/include/dolphin/os/OSFont.h index 1c1d480ab4..1fff41a629 100644 --- a/include/dolphin/os/OSFont.h +++ b/libs/dolphin/include/dolphin/os/OSFont.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSFONT_H_ #define _DOLPHIN_OSFONT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -59,4 +56,3 @@ int OSSetFontWidth(int fixed); #endif #endif -#endif diff --git a/include/dolphin/os/OSIC.h b/libs/dolphin/include/dolphin/os/OSIC.h similarity index 80% rename from include/dolphin/os/OSIC.h rename to libs/dolphin/include/dolphin/os/OSIC.h index 20156e6874..3309d3a6f1 100644 --- a/include/dolphin/os/OSIC.h +++ b/libs/dolphin/include/dolphin/os/OSIC.h @@ -1,10 +1,6 @@ #ifndef _DOLPHIN_OSIC_H_ #define _DOLPHIN_OSIC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else - #ifdef __cplusplus extern "C" { #endif @@ -22,4 +18,3 @@ void ICSync(void); #endif #endif -#endif diff --git a/include/dolphin/os/OSInterrupt.h b/libs/dolphin/include/dolphin/os/OSInterrupt.h similarity index 98% rename from include/dolphin/os/OSInterrupt.h rename to libs/dolphin/include/dolphin/os/OSInterrupt.h index 37e4f96958..fb74135a2b 100644 --- a/include/dolphin/os/OSInterrupt.h +++ b/libs/dolphin/include/dolphin/os/OSInterrupt.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSINTERRUPT_H_ #define _DOLPHIN_OSINTERRUPT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -119,4 +116,3 @@ OSInterruptMask __OSUnmaskInterrupts(OSInterruptMask mask); #endif #endif -#endif diff --git a/include/dolphin/os/OSL2.h b/libs/dolphin/include/dolphin/os/OSL2.h similarity index 81% rename from include/dolphin/os/OSL2.h rename to libs/dolphin/include/dolphin/os/OSL2.h index 0622de06dd..01b4a620c0 100644 --- a/include/dolphin/os/OSL2.h +++ b/libs/dolphin/include/dolphin/os/OSL2.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSL2_H_ #define _DOLPHIN_OSL2_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -21,4 +18,3 @@ void L2SetWriteThrough(BOOL writeThrough); #endif #endif -#endif diff --git a/include/dolphin/os/OSLC.h b/libs/dolphin/include/dolphin/os/OSLC.h similarity index 83% rename from include/dolphin/os/OSLC.h rename to libs/dolphin/include/dolphin/os/OSLC.h index c266b20e7b..af49708b14 100644 --- a/include/dolphin/os/OSLC.h +++ b/libs/dolphin/include/dolphin/os/OSLC.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSLC_H_ #define _DOLPHIN_OSLC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -20,4 +17,3 @@ void LCAllocNoInvalidate(void *addr, u32 nBytes); #endif #endif -#endif diff --git a/include/dolphin/os/OSMemory.h b/libs/dolphin/include/dolphin/os/OSMemory.h similarity index 89% rename from include/dolphin/os/OSMemory.h rename to libs/dolphin/include/dolphin/os/OSMemory.h index b1eaaf498c..a5debebc90 100644 --- a/include/dolphin/os/OSMemory.h +++ b/libs/dolphin/include/dolphin/os/OSMemory.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSMEMORY_H_ #define _DOLPHIN_OSMEMORY_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -29,4 +26,3 @@ u32 OSGetConsoleSimulatedMemSize(void); #endif #endif -#endif diff --git a/include/dolphin/os/OSMessage.h b/libs/dolphin/include/dolphin/os/OSMessage.h similarity index 90% rename from include/dolphin/os/OSMessage.h rename to libs/dolphin/include/dolphin/os/OSMessage.h index 0660be565d..8cdd3f1b02 100644 --- a/include/dolphin/os/OSMessage.h +++ b/libs/dolphin/include/dolphin/os/OSMessage.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSMESSAGE_H_ #define _DOLPHIN_OSMESSAGE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -33,5 +30,4 @@ int OSJamMessage(OSMessageQueue* mq, void* msg, s32 flags); } #endif -#endif #endif // _DOLPHIN_OSMESSAGE_H_ diff --git a/include/dolphin/os/OSModule.h b/libs/dolphin/include/dolphin/os/OSModule.h similarity index 97% rename from include/dolphin/os/OSModule.h rename to libs/dolphin/include/dolphin/os/OSModule.h index d104cf7a18..6e66e9b003 100644 --- a/include/dolphin/os/OSModule.h +++ b/libs/dolphin/include/dolphin/os/OSModule.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSMODULE_H_ #define _DOLPHIN_OSMODULE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -118,4 +115,3 @@ void OSNotifyUnlink(OSModuleInfo* module); #endif #endif -#endif diff --git a/include/dolphin/os/OSMutex.h b/libs/dolphin/include/dolphin/os/OSMutex.h similarity index 89% rename from include/dolphin/os/OSMutex.h rename to libs/dolphin/include/dolphin/os/OSMutex.h index 58985f7a3c..ef5565eb67 100644 --- a/include/dolphin/os/OSMutex.h +++ b/libs/dolphin/include/dolphin/os/OSMutex.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSMUTEX_H_ #define _DOLPHIN_OSMUTEX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -34,4 +31,3 @@ void OSSignalCond(OSCond* cond); #endif #endif -#endif diff --git a/include/dolphin/os/OSReboot.h b/libs/dolphin/include/dolphin/os/OSReboot.h similarity index 82% rename from include/dolphin/os/OSReboot.h rename to libs/dolphin/include/dolphin/os/OSReboot.h index 517851aa34..6509534793 100644 --- a/include/dolphin/os/OSReboot.h +++ b/libs/dolphin/include/dolphin/os/OSReboot.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSREBOOT_H_ #define _DOLPHIN_OSREBOOT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -20,4 +17,3 @@ void __OSReboot(u32 resetCode, u32 bootDol); #endif #endif -#endif diff --git a/include/dolphin/os/OSReset.h b/libs/dolphin/include/dolphin/os/OSReset.h similarity index 91% rename from include/dolphin/os/OSReset.h rename to libs/dolphin/include/dolphin/os/OSReset.h index 221861a4a6..15c2ba62ff 100644 --- a/include/dolphin/os/OSReset.h +++ b/libs/dolphin/include/dolphin/os/OSReset.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSRESET_H_ #define _DOLPHIN_OSRESET_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -40,4 +37,3 @@ u32 OSSetBootDol(u32 dolOffset); #endif #endif -#endif diff --git a/include/dolphin/os/OSResetSW.h b/libs/dolphin/include/dolphin/os/OSResetSW.h similarity index 81% rename from include/dolphin/os/OSResetSW.h rename to libs/dolphin/include/dolphin/os/OSResetSW.h index 88a7f194f4..3c630b8573 100644 --- a/include/dolphin/os/OSResetSW.h +++ b/libs/dolphin/include/dolphin/os/OSResetSW.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSRESETSW_H_ #define _DOLPHIN_OSRESETSW_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -21,4 +18,3 @@ BOOL OSGetResetButtonState(void); #endif #endif -#endif diff --git a/include/dolphin/os/OSRtc.h b/libs/dolphin/include/dolphin/os/OSRtc.h similarity index 95% rename from include/dolphin/os/OSRtc.h rename to libs/dolphin/include/dolphin/os/OSRtc.h index e35525dae9..583043f4a4 100644 --- a/include/dolphin/os/OSRtc.h +++ b/libs/dolphin/include/dolphin/os/OSRtc.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSRTC_H_ #define _DOLPHIN_OSRTC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -84,5 +81,4 @@ void OSSetWirelessID(s32 chan, u16 id); } #endif -#endif #endif // _DOLPHIN_OSRTC_H_ diff --git a/include/dolphin/os/OSSemaphore.h b/libs/dolphin/include/dolphin/os/OSSemaphore.h similarity index 86% rename from include/dolphin/os/OSSemaphore.h rename to libs/dolphin/include/dolphin/os/OSSemaphore.h index 93b942f9e1..aac23811a8 100644 --- a/include/dolphin/os/OSSemaphore.h +++ b/libs/dolphin/include/dolphin/os/OSSemaphore.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSSEMAPHORE_H_ #define _DOLPHIN_OSSEMAPHORE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -25,5 +22,4 @@ s32 OSGetSemaphoreCount(OSSemaphore* sem); } #endif -#endif #endif // _DOLPHIN_OSSEMAPHORE_H_ diff --git a/include/dolphin/os/OSSerial.h b/libs/dolphin/include/dolphin/os/OSSerial.h similarity index 60% rename from include/dolphin/os/OSSerial.h rename to libs/dolphin/include/dolphin/os/OSSerial.h index c6dd0a59e4..7c38395f71 100644 --- a/include/dolphin/os/OSSerial.h +++ b/libs/dolphin/include/dolphin/os/OSSerial.h @@ -1,10 +1,6 @@ #ifndef _DOLPHIN_OSSERIAL_H #define _DOLPHIN_OSSERIAL_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include -#endif #endif // _DOLPHIN_OSSERIAL_H diff --git a/include/dolphin/os/OSThread.h b/libs/dolphin/include/dolphin/os/OSThread.h similarity index 97% rename from include/dolphin/os/OSThread.h rename to libs/dolphin/include/dolphin/os/OSThread.h index c113575983..5511c7595b 100644 --- a/include/dolphin/os/OSThread.h +++ b/libs/dolphin/include/dolphin/os/OSThread.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSTHREAD_H_ #define _DOLPHIN_OSTHREAD_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -113,4 +110,3 @@ OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback callback #endif #endif -#endif diff --git a/include/dolphin/os/OSTime.h b/libs/dolphin/include/dolphin/os/OSTime.h similarity index 93% rename from include/dolphin/os/OSTime.h rename to libs/dolphin/include/dolphin/os/OSTime.h index b6e9fd7b8c..118adee7c2 100644 --- a/include/dolphin/os/OSTime.h +++ b/libs/dolphin/include/dolphin/os/OSTime.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSTIME_H_ #define _DOLPHIN_OSTIME_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -44,5 +41,4 @@ extern "C" { } #endif -#endif #endif // _DOLPHIN_OSTIME_H_ diff --git a/include/dolphin/os/OSTimer.h b/libs/dolphin/include/dolphin/os/OSTimer.h similarity index 83% rename from include/dolphin/os/OSTimer.h rename to libs/dolphin/include/dolphin/os/OSTimer.h index caa4076ffe..490cccb67c 100644 --- a/include/dolphin/os/OSTimer.h +++ b/libs/dolphin/include/dolphin/os/OSTimer.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSTIMER_H_ #define _DOLPHIN_OSTIMER_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -21,5 +18,4 @@ void OSStopTimer(void); } #endif -#endif #endif // _DOLPHIN_OSTIMER_H_ diff --git a/include/dolphin/os/OSUtf.h b/libs/dolphin/include/dolphin/os/OSUtf.h similarity index 86% rename from include/dolphin/os/OSUtf.h rename to libs/dolphin/include/dolphin/os/OSUtf.h index 44c908ef0f..2f721d5787 100644 --- a/include/dolphin/os/OSUtf.h +++ b/libs/dolphin/include/dolphin/os/OSUtf.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSUTF_H_ #define _DOLPHIN_OSUTF_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -23,5 +20,4 @@ u32 OSSJIStoUTF32(u16 sjis); } #endif -#endif #endif // _DOLPHIN_OSUTF_H_ diff --git a/include/dolphin/pad.h b/libs/dolphin/include/dolphin/pad.h similarity index 97% rename from include/dolphin/pad.h rename to libs/dolphin/include/dolphin/pad.h index eb208d4287..d966b80945 100644 --- a/include/dolphin/pad.h +++ b/libs/dolphin/include/dolphin/pad.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_PAD_H_ #define _DOLPHIN_PAD_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -105,4 +102,3 @@ void PADClampCircle(PADStatus* status); #endif #endif -#endif diff --git a/include/dolphin/perf.h b/libs/dolphin/include/dolphin/perf.h similarity index 100% rename from include/dolphin/perf.h rename to libs/dolphin/include/dolphin/perf.h diff --git a/include/dolphin/sdk_math.h b/libs/dolphin/include/dolphin/sdk_math.h similarity index 100% rename from include/dolphin/sdk_math.h rename to libs/dolphin/include/dolphin/sdk_math.h diff --git a/include/dolphin/seq.h b/libs/dolphin/include/dolphin/seq.h similarity index 95% rename from include/dolphin/seq.h rename to libs/dolphin/include/dolphin/seq.h index 8c950ca2a3..754798093d 100644 --- a/include/dolphin/seq.h +++ b/libs/dolphin/include/dolphin/seq.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_SEQ_H_ #define _DOLPHIN_SEQ_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -54,5 +51,4 @@ s32 SEQGetVolume(SEQSEQUENCE* sequence); } #endif -#endif #endif // _DOLPHIN_SEQ_H_ diff --git a/include/dolphin/si.h b/libs/dolphin/include/dolphin/si.h similarity index 98% rename from include/dolphin/si.h rename to libs/dolphin/include/dolphin/si.h index ed1b442ad8..04b01ba4d7 100644 --- a/include/dolphin/si.h +++ b/libs/dolphin/include/dolphin/si.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_SI_H_ #define _DOLPHIN_SI_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -175,5 +172,4 @@ void SIControlSteering(s32 chan, u32 control, s32 level); } #endif -#endif #endif // _DOLPHIN_SI_H_ diff --git a/include/dolphin/sp.h b/libs/dolphin/include/dolphin/sp.h similarity index 92% rename from include/dolphin/sp.h rename to libs/dolphin/include/dolphin/sp.h index 4401b8c9fc..52f4fff020 100644 --- a/include/dolphin/sp.h +++ b/libs/dolphin/include/dolphin/sp.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_SP_H_ #define _DOLPHIN_SP_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -41,4 +38,3 @@ void SPPrepareEnd(SPSoundEntry* sound, AXVPB* axvpb); #endif #endif -#endif diff --git a/include/dolphin/syn.h b/libs/dolphin/include/dolphin/syn.h similarity index 98% rename from include/dolphin/syn.h rename to libs/dolphin/include/dolphin/syn.h index 0b8848f9d4..8373c5db91 100644 --- a/include/dolphin/syn.h +++ b/libs/dolphin/include/dolphin/syn.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_SYN_H_ #define _DOLPHIN_SYN_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -172,5 +169,4 @@ u8 SYNGetMidiController(SYNSYNTH* synth, u8 midiChannel, u8 function); } #endif -#endif #endif // _DOLPHIN_SYN_H_ diff --git a/include/dolphin/thp.h b/libs/dolphin/include/dolphin/thp.h similarity index 98% rename from include/dolphin/thp.h rename to libs/dolphin/include/dolphin/thp.h index 250c518f6b..455afe6ccb 100644 --- a/include/dolphin/thp.h +++ b/libs/dolphin/include/dolphin/thp.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_THP_H_ #define _DOLPHIN_THP_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -154,5 +151,4 @@ static s32 __THPHuffDecodeTab(THPFileInfo* info, THPHuffmanTab* h); } #endif -#endif #endif // _DOLPHIN_THP_H_ diff --git a/include/dolphin/types.h b/libs/dolphin/include/dolphin/types.h similarity index 96% rename from include/dolphin/types.h rename to libs/dolphin/include/dolphin/types.h index 8c7620a057..3ab6227062 100644 --- a/include/dolphin/types.h +++ b/libs/dolphin/include/dolphin/types.h @@ -1,10 +1,6 @@ #ifndef _DOLPHIN_TYPES_H_ #define _DOLPHIN_TYPES_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else - #if _WIN64 || __LP64__ #define BIT_64 1 #else @@ -117,4 +113,3 @@ typedef unsigned int uint; #endif #endif -#endif diff --git a/include/dolphin/vi.h b/libs/dolphin/include/dolphin/vi.h similarity index 64% rename from include/dolphin/vi.h rename to libs/dolphin/include/dolphin/vi.h index b8fa79160e..af41844266 100644 --- a/include/dolphin/vi.h +++ b/libs/dolphin/include/dolphin/vi.h @@ -1,11 +1,7 @@ #ifndef _DOLPHIN_VI_H_ #define _DOLPHIN_VI_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #endif -#endif diff --git a/include/dolphin/vi/vifuncs.h b/libs/dolphin/include/dolphin/vi/vifuncs.h similarity index 92% rename from include/dolphin/vi/vifuncs.h rename to libs/dolphin/include/dolphin/vi/vifuncs.h index b05611a427..eb95984ede 100644 --- a/include/dolphin/vi/vifuncs.h +++ b/libs/dolphin/include/dolphin/vi/vifuncs.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_VIFUNCS_H_ #define _DOLPHIN_VIFUNCS_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -37,4 +34,3 @@ u32 VIGetDTVStatus(void); #endif #endif -#endif diff --git a/include/dolphin/vi/vitypes.h b/libs/dolphin/include/dolphin/vi/vitypes.h similarity index 95% rename from include/dolphin/vi/vitypes.h rename to libs/dolphin/include/dolphin/vi/vitypes.h index 998082d3c9..983a89b7ea 100644 --- a/include/dolphin/vi/vitypes.h +++ b/libs/dolphin/include/dolphin/vi/vitypes.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_VITYPES_H_ #define _DOLPHIN_VITYPES_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #define VI_TVMODE(format, interlace) (((format) << 2) + (interlace)) @@ -42,4 +39,3 @@ typedef enum { typedef void (*VIRetraceCallback)(u32 retraceCount); #endif -#endif diff --git a/src/dolphin/G2D/G2D.c b/libs/dolphin/src/G2D/G2D.c similarity index 100% rename from src/dolphin/G2D/G2D.c rename to libs/dolphin/src/G2D/G2D.c diff --git a/src/dolphin/ai/ai.c b/libs/dolphin/src/ai/ai.c similarity index 100% rename from src/dolphin/ai/ai.c rename to libs/dolphin/src/ai/ai.c diff --git a/src/dolphin/am/__am.h b/libs/dolphin/src/am/__am.h similarity index 100% rename from src/dolphin/am/__am.h rename to libs/dolphin/src/am/__am.h diff --git a/src/dolphin/am/am.c b/libs/dolphin/src/am/am.c similarity index 100% rename from src/dolphin/am/am.c rename to libs/dolphin/src/am/am.c diff --git a/src/dolphin/amcnotstub/amcnotstub.c b/libs/dolphin/src/amcnotstub/amcnotstub.c similarity index 100% rename from src/dolphin/amcnotstub/amcnotstub.c rename to libs/dolphin/src/amcnotstub/amcnotstub.c diff --git a/src/dolphin/amcstubs/AmcExi2Stubs.c b/libs/dolphin/src/amcstubs/AmcExi2Stubs.c similarity index 100% rename from src/dolphin/amcstubs/AmcExi2Stubs.c rename to libs/dolphin/src/amcstubs/AmcExi2Stubs.c diff --git a/src/dolphin/ar/__ar.h b/libs/dolphin/src/ar/__ar.h similarity index 100% rename from src/dolphin/ar/__ar.h rename to libs/dolphin/src/ar/__ar.h diff --git a/src/dolphin/ar/ar.c b/libs/dolphin/src/ar/ar.c similarity index 100% rename from src/dolphin/ar/ar.c rename to libs/dolphin/src/ar/ar.c diff --git a/src/dolphin/ar/arq.c b/libs/dolphin/src/ar/arq.c similarity index 100% rename from src/dolphin/ar/arq.c rename to libs/dolphin/src/ar/arq.c diff --git a/src/dolphin/ax/AX.c b/libs/dolphin/src/ax/AX.c similarity index 100% rename from src/dolphin/ax/AX.c rename to libs/dolphin/src/ax/AX.c diff --git a/src/dolphin/ax/AXAlloc.c b/libs/dolphin/src/ax/AXAlloc.c similarity index 100% rename from src/dolphin/ax/AXAlloc.c rename to libs/dolphin/src/ax/AXAlloc.c diff --git a/src/dolphin/ax/AXAux.c b/libs/dolphin/src/ax/AXAux.c similarity index 100% rename from src/dolphin/ax/AXAux.c rename to libs/dolphin/src/ax/AXAux.c diff --git a/src/dolphin/ax/AXCL.c b/libs/dolphin/src/ax/AXCL.c similarity index 100% rename from src/dolphin/ax/AXCL.c rename to libs/dolphin/src/ax/AXCL.c diff --git a/src/dolphin/ax/AXComp.c b/libs/dolphin/src/ax/AXComp.c similarity index 100% rename from src/dolphin/ax/AXComp.c rename to libs/dolphin/src/ax/AXComp.c diff --git a/src/dolphin/ax/AXOut.c b/libs/dolphin/src/ax/AXOut.c similarity index 100% rename from src/dolphin/ax/AXOut.c rename to libs/dolphin/src/ax/AXOut.c diff --git a/src/dolphin/ax/AXProf.c b/libs/dolphin/src/ax/AXProf.c similarity index 100% rename from src/dolphin/ax/AXProf.c rename to libs/dolphin/src/ax/AXProf.c diff --git a/src/dolphin/ax/AXSPB.c b/libs/dolphin/src/ax/AXSPB.c similarity index 100% rename from src/dolphin/ax/AXSPB.c rename to libs/dolphin/src/ax/AXSPB.c diff --git a/src/dolphin/ax/AXVPB.c b/libs/dolphin/src/ax/AXVPB.c similarity index 100% rename from src/dolphin/ax/AXVPB.c rename to libs/dolphin/src/ax/AXVPB.c diff --git a/src/dolphin/ax/DSPCode.c b/libs/dolphin/src/ax/DSPCode.c similarity index 100% rename from src/dolphin/ax/DSPCode.c rename to libs/dolphin/src/ax/DSPCode.c diff --git a/src/dolphin/ax/__ax.h b/libs/dolphin/src/ax/__ax.h similarity index 100% rename from src/dolphin/ax/__ax.h rename to libs/dolphin/src/ax/__ax.h diff --git a/src/dolphin/axart/axart.c b/libs/dolphin/src/axart/axart.c similarity index 100% rename from src/dolphin/axart/axart.c rename to libs/dolphin/src/axart/axart.c diff --git a/src/dolphin/axart/axart3d.c b/libs/dolphin/src/axart/axart3d.c similarity index 100% rename from src/dolphin/axart/axart3d.c rename to libs/dolphin/src/axart/axart3d.c diff --git a/src/dolphin/axart/axartcents.c b/libs/dolphin/src/axart/axartcents.c similarity index 100% rename from src/dolphin/axart/axartcents.c rename to libs/dolphin/src/axart/axartcents.c diff --git a/src/dolphin/axart/axartenv.c b/libs/dolphin/src/axart/axartenv.c similarity index 100% rename from src/dolphin/axart/axartenv.c rename to libs/dolphin/src/axart/axartenv.c diff --git a/src/dolphin/axart/axartlfo.c b/libs/dolphin/src/axart/axartlfo.c similarity index 100% rename from src/dolphin/axart/axartlfo.c rename to libs/dolphin/src/axart/axartlfo.c diff --git a/src/dolphin/axart/axartlpf.c b/libs/dolphin/src/axart/axartlpf.c similarity index 100% rename from src/dolphin/axart/axartlpf.c rename to libs/dolphin/src/axart/axartlpf.c diff --git a/src/dolphin/axart/axartsound.c b/libs/dolphin/src/axart/axartsound.c similarity index 100% rename from src/dolphin/axart/axartsound.c rename to libs/dolphin/src/axart/axartsound.c diff --git a/src/dolphin/axfx/__axfx.h b/libs/dolphin/src/axfx/__axfx.h similarity index 100% rename from src/dolphin/axfx/__axfx.h rename to libs/dolphin/src/axfx/__axfx.h diff --git a/src/dolphin/axfx/axfx.c b/libs/dolphin/src/axfx/axfx.c similarity index 100% rename from src/dolphin/axfx/axfx.c rename to libs/dolphin/src/axfx/axfx.c diff --git a/src/dolphin/axfx/chorus.c b/libs/dolphin/src/axfx/chorus.c similarity index 100% rename from src/dolphin/axfx/chorus.c rename to libs/dolphin/src/axfx/chorus.c diff --git a/src/dolphin/axfx/delay.c b/libs/dolphin/src/axfx/delay.c similarity index 100% rename from src/dolphin/axfx/delay.c rename to libs/dolphin/src/axfx/delay.c diff --git a/src/dolphin/axfx/reverb_hi.c b/libs/dolphin/src/axfx/reverb_hi.c similarity index 100% rename from src/dolphin/axfx/reverb_hi.c rename to libs/dolphin/src/axfx/reverb_hi.c diff --git a/src/dolphin/axfx/reverb_hi_4ch.c b/libs/dolphin/src/axfx/reverb_hi_4ch.c similarity index 100% rename from src/dolphin/axfx/reverb_hi_4ch.c rename to libs/dolphin/src/axfx/reverb_hi_4ch.c diff --git a/src/dolphin/axfx/reverb_std.c b/libs/dolphin/src/axfx/reverb_std.c similarity index 100% rename from src/dolphin/axfx/reverb_std.c rename to libs/dolphin/src/axfx/reverb_std.c diff --git a/src/dolphin/base/PPCArch.c b/libs/dolphin/src/base/PPCArch.c similarity index 100% rename from src/dolphin/base/PPCArch.c rename to libs/dolphin/src/base/PPCArch.c diff --git a/src/dolphin/base/PPCPm.c b/libs/dolphin/src/base/PPCPm.c similarity index 100% rename from src/dolphin/base/PPCPm.c rename to libs/dolphin/src/base/PPCPm.c diff --git a/src/dolphin/card/CARDBios.c b/libs/dolphin/src/card/CARDBios.c similarity index 100% rename from src/dolphin/card/CARDBios.c rename to libs/dolphin/src/card/CARDBios.c diff --git a/src/dolphin/card/CARDBlock.c b/libs/dolphin/src/card/CARDBlock.c similarity index 100% rename from src/dolphin/card/CARDBlock.c rename to libs/dolphin/src/card/CARDBlock.c diff --git a/src/dolphin/card/CARDCheck.c b/libs/dolphin/src/card/CARDCheck.c similarity index 100% rename from src/dolphin/card/CARDCheck.c rename to libs/dolphin/src/card/CARDCheck.c diff --git a/src/dolphin/card/CARDCreate.c b/libs/dolphin/src/card/CARDCreate.c similarity index 100% rename from src/dolphin/card/CARDCreate.c rename to libs/dolphin/src/card/CARDCreate.c diff --git a/src/dolphin/card/CARDDelete.c b/libs/dolphin/src/card/CARDDelete.c similarity index 100% rename from src/dolphin/card/CARDDelete.c rename to libs/dolphin/src/card/CARDDelete.c diff --git a/src/dolphin/card/CARDDir.c b/libs/dolphin/src/card/CARDDir.c similarity index 100% rename from src/dolphin/card/CARDDir.c rename to libs/dolphin/src/card/CARDDir.c diff --git a/src/dolphin/card/CARDErase.c b/libs/dolphin/src/card/CARDErase.c similarity index 100% rename from src/dolphin/card/CARDErase.c rename to libs/dolphin/src/card/CARDErase.c diff --git a/src/dolphin/card/CARDFormat.c b/libs/dolphin/src/card/CARDFormat.c similarity index 100% rename from src/dolphin/card/CARDFormat.c rename to libs/dolphin/src/card/CARDFormat.c diff --git a/src/dolphin/card/CARDMount.c b/libs/dolphin/src/card/CARDMount.c similarity index 100% rename from src/dolphin/card/CARDMount.c rename to libs/dolphin/src/card/CARDMount.c diff --git a/src/dolphin/card/CARDNet.c b/libs/dolphin/src/card/CARDNet.c similarity index 100% rename from src/dolphin/card/CARDNet.c rename to libs/dolphin/src/card/CARDNet.c diff --git a/src/dolphin/card/CARDOpen.c b/libs/dolphin/src/card/CARDOpen.c similarity index 100% rename from src/dolphin/card/CARDOpen.c rename to libs/dolphin/src/card/CARDOpen.c diff --git a/src/dolphin/card/CARDProgram.c b/libs/dolphin/src/card/CARDProgram.c similarity index 100% rename from src/dolphin/card/CARDProgram.c rename to libs/dolphin/src/card/CARDProgram.c diff --git a/src/dolphin/card/CARDRaw.c b/libs/dolphin/src/card/CARDRaw.c similarity index 100% rename from src/dolphin/card/CARDRaw.c rename to libs/dolphin/src/card/CARDRaw.c diff --git a/src/dolphin/card/CARDRdwr.c b/libs/dolphin/src/card/CARDRdwr.c similarity index 100% rename from src/dolphin/card/CARDRdwr.c rename to libs/dolphin/src/card/CARDRdwr.c diff --git a/src/dolphin/card/CARDRead.c b/libs/dolphin/src/card/CARDRead.c similarity index 100% rename from src/dolphin/card/CARDRead.c rename to libs/dolphin/src/card/CARDRead.c diff --git a/src/dolphin/card/CARDRename.c b/libs/dolphin/src/card/CARDRename.c similarity index 100% rename from src/dolphin/card/CARDRename.c rename to libs/dolphin/src/card/CARDRename.c diff --git a/src/dolphin/card/CARDStat.c b/libs/dolphin/src/card/CARDStat.c similarity index 100% rename from src/dolphin/card/CARDStat.c rename to libs/dolphin/src/card/CARDStat.c diff --git a/src/dolphin/card/CARDStatEx.c b/libs/dolphin/src/card/CARDStatEx.c similarity index 100% rename from src/dolphin/card/CARDStatEx.c rename to libs/dolphin/src/card/CARDStatEx.c diff --git a/src/dolphin/card/CARDUnlock.c b/libs/dolphin/src/card/CARDUnlock.c similarity index 100% rename from src/dolphin/card/CARDUnlock.c rename to libs/dolphin/src/card/CARDUnlock.c diff --git a/src/dolphin/card/CARDWrite.c b/libs/dolphin/src/card/CARDWrite.c similarity index 100% rename from src/dolphin/card/CARDWrite.c rename to libs/dolphin/src/card/CARDWrite.c diff --git a/src/dolphin/card/__card.h b/libs/dolphin/src/card/__card.h similarity index 100% rename from src/dolphin/card/__card.h rename to libs/dolphin/src/card/__card.h diff --git a/src/dolphin/db/db.c b/libs/dolphin/src/db/db.c similarity index 100% rename from src/dolphin/db/db.c rename to libs/dolphin/src/db/db.c diff --git a/src/dolphin/demo/DEMOAVX.c b/libs/dolphin/src/demo/DEMOAVX.c similarity index 100% rename from src/dolphin/demo/DEMOAVX.c rename to libs/dolphin/src/demo/DEMOAVX.c diff --git a/src/dolphin/demo/DEMOFont.c b/libs/dolphin/src/demo/DEMOFont.c similarity index 100% rename from src/dolphin/demo/DEMOFont.c rename to libs/dolphin/src/demo/DEMOFont.c diff --git a/src/dolphin/demo/DEMOInit.c b/libs/dolphin/src/demo/DEMOInit.c similarity index 100% rename from src/dolphin/demo/DEMOInit.c rename to libs/dolphin/src/demo/DEMOInit.c diff --git a/src/dolphin/demo/DEMOPad.c b/libs/dolphin/src/demo/DEMOPad.c similarity index 100% rename from src/dolphin/demo/DEMOPad.c rename to libs/dolphin/src/demo/DEMOPad.c diff --git a/src/dolphin/demo/DEMOPuts.c b/libs/dolphin/src/demo/DEMOPuts.c similarity index 100% rename from src/dolphin/demo/DEMOPuts.c rename to libs/dolphin/src/demo/DEMOPuts.c diff --git a/src/dolphin/demo/DEMOStats.c b/libs/dolphin/src/demo/DEMOStats.c similarity index 100% rename from src/dolphin/demo/DEMOStats.c rename to libs/dolphin/src/demo/DEMOStats.c diff --git a/src/dolphin/demo/DEMOWin.c b/libs/dolphin/src/demo/DEMOWin.c similarity index 100% rename from src/dolphin/demo/DEMOWin.c rename to libs/dolphin/src/demo/DEMOWin.c diff --git a/src/dolphin/demo/__demo.h b/libs/dolphin/src/demo/__demo.h similarity index 100% rename from src/dolphin/demo/__demo.h rename to libs/dolphin/src/demo/__demo.h diff --git a/src/dolphin/dsp/__dsp.h b/libs/dolphin/src/dsp/__dsp.h similarity index 100% rename from src/dolphin/dsp/__dsp.h rename to libs/dolphin/src/dsp/__dsp.h diff --git a/src/dolphin/dsp/dsp.c b/libs/dolphin/src/dsp/dsp.c similarity index 100% rename from src/dolphin/dsp/dsp.c rename to libs/dolphin/src/dsp/dsp.c diff --git a/src/dolphin/dsp/dsp_debug.c b/libs/dolphin/src/dsp/dsp_debug.c similarity index 100% rename from src/dolphin/dsp/dsp_debug.c rename to libs/dolphin/src/dsp/dsp_debug.c diff --git a/src/dolphin/dsp/dsp_perf.c b/libs/dolphin/src/dsp/dsp_perf.c similarity index 100% rename from src/dolphin/dsp/dsp_perf.c rename to libs/dolphin/src/dsp/dsp_perf.c diff --git a/src/dolphin/dsp/dsp_task.c b/libs/dolphin/src/dsp/dsp_task.c similarity index 100% rename from src/dolphin/dsp/dsp_task.c rename to libs/dolphin/src/dsp/dsp_task.c diff --git a/src/dolphin/dtk/dtk.c b/libs/dolphin/src/dtk/dtk.c similarity index 100% rename from src/dolphin/dtk/dtk.c rename to libs/dolphin/src/dtk/dtk.c diff --git a/src/dolphin/dvd/__dvd.h b/libs/dolphin/src/dvd/__dvd.h similarity index 100% rename from src/dolphin/dvd/__dvd.h rename to libs/dolphin/src/dvd/__dvd.h diff --git a/src/dolphin/dvd/dvd.c b/libs/dolphin/src/dvd/dvd.c similarity index 100% rename from src/dolphin/dvd/dvd.c rename to libs/dolphin/src/dvd/dvd.c diff --git a/src/dolphin/dvd/dvdFatal.c b/libs/dolphin/src/dvd/dvdFatal.c similarity index 100% rename from src/dolphin/dvd/dvdFatal.c rename to libs/dolphin/src/dvd/dvdFatal.c diff --git a/src/dolphin/dvd/dvderror.c b/libs/dolphin/src/dvd/dvderror.c similarity index 100% rename from src/dolphin/dvd/dvderror.c rename to libs/dolphin/src/dvd/dvderror.c diff --git a/src/dolphin/dvd/dvdfs.c b/libs/dolphin/src/dvd/dvdfs.c similarity index 100% rename from src/dolphin/dvd/dvdfs.c rename to libs/dolphin/src/dvd/dvdfs.c diff --git a/src/dolphin/dvd/dvdidutils.c b/libs/dolphin/src/dvd/dvdidutils.c similarity index 100% rename from src/dolphin/dvd/dvdidutils.c rename to libs/dolphin/src/dvd/dvdidutils.c diff --git a/src/dolphin/dvd/dvdlow.c b/libs/dolphin/src/dvd/dvdlow.c similarity index 100% rename from src/dolphin/dvd/dvdlow.c rename to libs/dolphin/src/dvd/dvdlow.c diff --git a/src/dolphin/dvd/dvdqueue.c b/libs/dolphin/src/dvd/dvdqueue.c similarity index 100% rename from src/dolphin/dvd/dvdqueue.c rename to libs/dolphin/src/dvd/dvdqueue.c diff --git a/src/dolphin/dvd/fstload.c b/libs/dolphin/src/dvd/fstload.c similarity index 100% rename from src/dolphin/dvd/fstload.c rename to libs/dolphin/src/dvd/fstload.c diff --git a/src/dolphin/exi/EXIAd16.c b/libs/dolphin/src/exi/EXIAd16.c similarity index 100% rename from src/dolphin/exi/EXIAd16.c rename to libs/dolphin/src/exi/EXIAd16.c diff --git a/src/dolphin/exi/EXIBios.c b/libs/dolphin/src/exi/EXIBios.c similarity index 100% rename from src/dolphin/exi/EXIBios.c rename to libs/dolphin/src/exi/EXIBios.c diff --git a/src/dolphin/exi/EXIUart.c b/libs/dolphin/src/exi/EXIUart.c similarity index 100% rename from src/dolphin/exi/EXIUart.c rename to libs/dolphin/src/exi/EXIUart.c diff --git a/src/dolphin/fileCache/fileCache.c b/libs/dolphin/src/fileCache/fileCache.c similarity index 100% rename from src/dolphin/fileCache/fileCache.c rename to libs/dolphin/src/fileCache/fileCache.c diff --git a/src/dolphin/gd/GDBase.c b/libs/dolphin/src/gd/GDBase.c similarity index 100% rename from src/dolphin/gd/GDBase.c rename to libs/dolphin/src/gd/GDBase.c diff --git a/src/dolphin/gd/GDFile.c b/libs/dolphin/src/gd/GDFile.c similarity index 100% rename from src/dolphin/gd/GDFile.c rename to libs/dolphin/src/gd/GDFile.c diff --git a/src/dolphin/gd/GDGeometry.c b/libs/dolphin/src/gd/GDGeometry.c similarity index 100% rename from src/dolphin/gd/GDGeometry.c rename to libs/dolphin/src/gd/GDGeometry.c diff --git a/src/dolphin/gd/GDIndirect.c b/libs/dolphin/src/gd/GDIndirect.c similarity index 100% rename from src/dolphin/gd/GDIndirect.c rename to libs/dolphin/src/gd/GDIndirect.c diff --git a/src/dolphin/gd/GDLight.c b/libs/dolphin/src/gd/GDLight.c similarity index 100% rename from src/dolphin/gd/GDLight.c rename to libs/dolphin/src/gd/GDLight.c diff --git a/src/dolphin/gd/GDPixel.c b/libs/dolphin/src/gd/GDPixel.c similarity index 100% rename from src/dolphin/gd/GDPixel.c rename to libs/dolphin/src/gd/GDPixel.c diff --git a/src/dolphin/gd/GDTev.c b/libs/dolphin/src/gd/GDTev.c similarity index 100% rename from src/dolphin/gd/GDTev.c rename to libs/dolphin/src/gd/GDTev.c diff --git a/src/dolphin/gd/GDTexture.c b/libs/dolphin/src/gd/GDTexture.c similarity index 100% rename from src/dolphin/gd/GDTexture.c rename to libs/dolphin/src/gd/GDTexture.c diff --git a/src/dolphin/gd/GDTransform.c b/libs/dolphin/src/gd/GDTransform.c similarity index 100% rename from src/dolphin/gd/GDTransform.c rename to libs/dolphin/src/gd/GDTransform.c diff --git a/src/dolphin/gf/GFGeometry.cpp b/libs/dolphin/src/gf/GFGeometry.cpp similarity index 100% rename from src/dolphin/gf/GFGeometry.cpp rename to libs/dolphin/src/gf/GFGeometry.cpp diff --git a/src/dolphin/gf/GFLight.cpp b/libs/dolphin/src/gf/GFLight.cpp similarity index 100% rename from src/dolphin/gf/GFLight.cpp rename to libs/dolphin/src/gf/GFLight.cpp diff --git a/src/dolphin/gf/GFPixel.cpp b/libs/dolphin/src/gf/GFPixel.cpp similarity index 100% rename from src/dolphin/gf/GFPixel.cpp rename to libs/dolphin/src/gf/GFPixel.cpp diff --git a/src/dolphin/gf/GFTev.cpp b/libs/dolphin/src/gf/GFTev.cpp similarity index 100% rename from src/dolphin/gf/GFTev.cpp rename to libs/dolphin/src/gf/GFTev.cpp diff --git a/src/dolphin/gx/GXAttr.c b/libs/dolphin/src/gx/GXAttr.c similarity index 100% rename from src/dolphin/gx/GXAttr.c rename to libs/dolphin/src/gx/GXAttr.c diff --git a/src/dolphin/gx/GXBump.c b/libs/dolphin/src/gx/GXBump.c similarity index 100% rename from src/dolphin/gx/GXBump.c rename to libs/dolphin/src/gx/GXBump.c diff --git a/src/dolphin/gx/GXDisplayList.c b/libs/dolphin/src/gx/GXDisplayList.c similarity index 100% rename from src/dolphin/gx/GXDisplayList.c rename to libs/dolphin/src/gx/GXDisplayList.c diff --git a/src/dolphin/gx/GXDraw.c b/libs/dolphin/src/gx/GXDraw.c similarity index 100% rename from src/dolphin/gx/GXDraw.c rename to libs/dolphin/src/gx/GXDraw.c diff --git a/src/dolphin/gx/GXFifo.c b/libs/dolphin/src/gx/GXFifo.c similarity index 100% rename from src/dolphin/gx/GXFifo.c rename to libs/dolphin/src/gx/GXFifo.c diff --git a/src/dolphin/gx/GXFrameBuf.c b/libs/dolphin/src/gx/GXFrameBuf.c similarity index 100% rename from src/dolphin/gx/GXFrameBuf.c rename to libs/dolphin/src/gx/GXFrameBuf.c diff --git a/src/dolphin/gx/GXGeometry.c b/libs/dolphin/src/gx/GXGeometry.c similarity index 100% rename from src/dolphin/gx/GXGeometry.c rename to libs/dolphin/src/gx/GXGeometry.c diff --git a/src/dolphin/gx/GXInit.c b/libs/dolphin/src/gx/GXInit.c similarity index 100% rename from src/dolphin/gx/GXInit.c rename to libs/dolphin/src/gx/GXInit.c diff --git a/src/dolphin/gx/GXLight.c b/libs/dolphin/src/gx/GXLight.c similarity index 100% rename from src/dolphin/gx/GXLight.c rename to libs/dolphin/src/gx/GXLight.c diff --git a/src/dolphin/gx/GXMisc.c b/libs/dolphin/src/gx/GXMisc.c similarity index 100% rename from src/dolphin/gx/GXMisc.c rename to libs/dolphin/src/gx/GXMisc.c diff --git a/src/dolphin/gx/GXPerf.c b/libs/dolphin/src/gx/GXPerf.c similarity index 100% rename from src/dolphin/gx/GXPerf.c rename to libs/dolphin/src/gx/GXPerf.c diff --git a/src/dolphin/gx/GXPixel.c b/libs/dolphin/src/gx/GXPixel.c similarity index 100% rename from src/dolphin/gx/GXPixel.c rename to libs/dolphin/src/gx/GXPixel.c diff --git a/src/dolphin/gx/GXSave.c b/libs/dolphin/src/gx/GXSave.c similarity index 100% rename from src/dolphin/gx/GXSave.c rename to libs/dolphin/src/gx/GXSave.c diff --git a/src/dolphin/gx/GXStubs.c b/libs/dolphin/src/gx/GXStubs.c similarity index 100% rename from src/dolphin/gx/GXStubs.c rename to libs/dolphin/src/gx/GXStubs.c diff --git a/src/dolphin/gx/GXTev.c b/libs/dolphin/src/gx/GXTev.c similarity index 100% rename from src/dolphin/gx/GXTev.c rename to libs/dolphin/src/gx/GXTev.c diff --git a/src/dolphin/gx/GXTexture.c b/libs/dolphin/src/gx/GXTexture.c similarity index 100% rename from src/dolphin/gx/GXTexture.c rename to libs/dolphin/src/gx/GXTexture.c diff --git a/src/dolphin/gx/GXTransform.c b/libs/dolphin/src/gx/GXTransform.c similarity index 100% rename from src/dolphin/gx/GXTransform.c rename to libs/dolphin/src/gx/GXTransform.c diff --git a/src/dolphin/gx/GXVerifRAS.c b/libs/dolphin/src/gx/GXVerifRAS.c similarity index 100% rename from src/dolphin/gx/GXVerifRAS.c rename to libs/dolphin/src/gx/GXVerifRAS.c diff --git a/src/dolphin/gx/GXVerifXF.c b/libs/dolphin/src/gx/GXVerifXF.c similarity index 100% rename from src/dolphin/gx/GXVerifXF.c rename to libs/dolphin/src/gx/GXVerifXF.c diff --git a/src/dolphin/gx/GXVerify.c b/libs/dolphin/src/gx/GXVerify.c similarity index 100% rename from src/dolphin/gx/GXVerify.c rename to libs/dolphin/src/gx/GXVerify.c diff --git a/src/dolphin/gx/GXVert.c b/libs/dolphin/src/gx/GXVert.c similarity index 100% rename from src/dolphin/gx/GXVert.c rename to libs/dolphin/src/gx/GXVert.c diff --git a/src/dolphin/gx/__gx.h b/libs/dolphin/src/gx/__gx.h similarity index 100% rename from src/dolphin/gx/__gx.h rename to libs/dolphin/src/gx/__gx.h diff --git a/src/dolphin/hio/hio.c b/libs/dolphin/src/hio/hio.c similarity index 100% rename from src/dolphin/hio/hio.c rename to libs/dolphin/src/hio/hio.c diff --git a/src/dolphin/mcc/fio.c b/libs/dolphin/src/mcc/fio.c similarity index 100% rename from src/dolphin/mcc/fio.c rename to libs/dolphin/src/mcc/fio.c diff --git a/src/dolphin/mcc/mcc.c b/libs/dolphin/src/mcc/mcc.c similarity index 100% rename from src/dolphin/mcc/mcc.c rename to libs/dolphin/src/mcc/mcc.c diff --git a/src/dolphin/mcc/tty.c b/libs/dolphin/src/mcc/tty.c similarity index 100% rename from src/dolphin/mcc/tty.c rename to libs/dolphin/src/mcc/tty.c diff --git a/src/dolphin/mix/mix.c b/libs/dolphin/src/mix/mix.c similarity index 100% rename from src/dolphin/mix/mix.c rename to libs/dolphin/src/mix/mix.c diff --git a/src/dolphin/mtx/mtx.c b/libs/dolphin/src/mtx/mtx.c similarity index 100% rename from src/dolphin/mtx/mtx.c rename to libs/dolphin/src/mtx/mtx.c diff --git a/src/dolphin/mtx/mtx44.c b/libs/dolphin/src/mtx/mtx44.c similarity index 100% rename from src/dolphin/mtx/mtx44.c rename to libs/dolphin/src/mtx/mtx44.c diff --git a/src/dolphin/mtx/mtx44vec.c b/libs/dolphin/src/mtx/mtx44vec.c similarity index 100% rename from src/dolphin/mtx/mtx44vec.c rename to libs/dolphin/src/mtx/mtx44vec.c diff --git a/src/dolphin/mtx/mtxstack.c b/libs/dolphin/src/mtx/mtxstack.c similarity index 100% rename from src/dolphin/mtx/mtxstack.c rename to libs/dolphin/src/mtx/mtxstack.c diff --git a/src/dolphin/mtx/mtxvec.c b/libs/dolphin/src/mtx/mtxvec.c similarity index 100% rename from src/dolphin/mtx/mtxvec.c rename to libs/dolphin/src/mtx/mtxvec.c diff --git a/src/dolphin/mtx/psmtx.c b/libs/dolphin/src/mtx/psmtx.c similarity index 100% rename from src/dolphin/mtx/psmtx.c rename to libs/dolphin/src/mtx/psmtx.c diff --git a/src/dolphin/mtx/quat.c b/libs/dolphin/src/mtx/quat.c similarity index 100% rename from src/dolphin/mtx/quat.c rename to libs/dolphin/src/mtx/quat.c diff --git a/src/dolphin/mtx/vec.c b/libs/dolphin/src/mtx/vec.c similarity index 100% rename from src/dolphin/mtx/vec.c rename to libs/dolphin/src/mtx/vec.c diff --git a/src/dolphin/odemustubs/odemustubs.c b/libs/dolphin/src/odemustubs/odemustubs.c similarity index 100% rename from src/dolphin/odemustubs/odemustubs.c rename to libs/dolphin/src/odemustubs/odemustubs.c diff --git a/src/dolphin/odenotstub/odenotstub.c b/libs/dolphin/src/odenotstub/odenotstub.c similarity index 100% rename from src/dolphin/odenotstub/odenotstub.c rename to libs/dolphin/src/odenotstub/odenotstub.c diff --git a/src/dolphin/os/OS.c b/libs/dolphin/src/os/OS.c similarity index 100% rename from src/dolphin/os/OS.c rename to libs/dolphin/src/os/OS.c diff --git a/src/dolphin/os/OSAddress.c b/libs/dolphin/src/os/OSAddress.c similarity index 100% rename from src/dolphin/os/OSAddress.c rename to libs/dolphin/src/os/OSAddress.c diff --git a/src/dolphin/os/OSAlarm.c b/libs/dolphin/src/os/OSAlarm.c similarity index 100% rename from src/dolphin/os/OSAlarm.c rename to libs/dolphin/src/os/OSAlarm.c diff --git a/src/dolphin/os/OSAlloc.c b/libs/dolphin/src/os/OSAlloc.c similarity index 100% rename from src/dolphin/os/OSAlloc.c rename to libs/dolphin/src/os/OSAlloc.c diff --git a/src/dolphin/os/OSArena.c b/libs/dolphin/src/os/OSArena.c similarity index 100% rename from src/dolphin/os/OSArena.c rename to libs/dolphin/src/os/OSArena.c diff --git a/src/dolphin/os/OSAudioSystem.c b/libs/dolphin/src/os/OSAudioSystem.c similarity index 100% rename from src/dolphin/os/OSAudioSystem.c rename to libs/dolphin/src/os/OSAudioSystem.c diff --git a/src/dolphin/os/OSCache.c b/libs/dolphin/src/os/OSCache.c similarity index 100% rename from src/dolphin/os/OSCache.c rename to libs/dolphin/src/os/OSCache.c diff --git a/src/dolphin/os/OSContext.c b/libs/dolphin/src/os/OSContext.c similarity index 100% rename from src/dolphin/os/OSContext.c rename to libs/dolphin/src/os/OSContext.c diff --git a/src/dolphin/os/OSError.c b/libs/dolphin/src/os/OSError.c similarity index 100% rename from src/dolphin/os/OSError.c rename to libs/dolphin/src/os/OSError.c diff --git a/src/dolphin/os/OSExec.c b/libs/dolphin/src/os/OSExec.c similarity index 100% rename from src/dolphin/os/OSExec.c rename to libs/dolphin/src/os/OSExec.c diff --git a/src/dolphin/os/OSFatal.c b/libs/dolphin/src/os/OSFatal.c similarity index 100% rename from src/dolphin/os/OSFatal.c rename to libs/dolphin/src/os/OSFatal.c diff --git a/src/dolphin/os/OSFont.c b/libs/dolphin/src/os/OSFont.c similarity index 100% rename from src/dolphin/os/OSFont.c rename to libs/dolphin/src/os/OSFont.c diff --git a/src/dolphin/os/OSInterrupt.c b/libs/dolphin/src/os/OSInterrupt.c similarity index 100% rename from src/dolphin/os/OSInterrupt.c rename to libs/dolphin/src/os/OSInterrupt.c diff --git a/src/dolphin/os/OSLink.c b/libs/dolphin/src/os/OSLink.c similarity index 100% rename from src/dolphin/os/OSLink.c rename to libs/dolphin/src/os/OSLink.c diff --git a/src/dolphin/os/OSMemory.c b/libs/dolphin/src/os/OSMemory.c similarity index 100% rename from src/dolphin/os/OSMemory.c rename to libs/dolphin/src/os/OSMemory.c diff --git a/src/dolphin/os/OSMessage.c b/libs/dolphin/src/os/OSMessage.c similarity index 100% rename from src/dolphin/os/OSMessage.c rename to libs/dolphin/src/os/OSMessage.c diff --git a/src/dolphin/os/OSMutex.c b/libs/dolphin/src/os/OSMutex.c similarity index 100% rename from src/dolphin/os/OSMutex.c rename to libs/dolphin/src/os/OSMutex.c diff --git a/src/dolphin/os/OSReboot.c b/libs/dolphin/src/os/OSReboot.c similarity index 100% rename from src/dolphin/os/OSReboot.c rename to libs/dolphin/src/os/OSReboot.c diff --git a/src/dolphin/os/OSReset.c b/libs/dolphin/src/os/OSReset.c similarity index 100% rename from src/dolphin/os/OSReset.c rename to libs/dolphin/src/os/OSReset.c diff --git a/src/dolphin/os/OSResetSW.c b/libs/dolphin/src/os/OSResetSW.c similarity index 100% rename from src/dolphin/os/OSResetSW.c rename to libs/dolphin/src/os/OSResetSW.c diff --git a/src/dolphin/os/OSRtc.c b/libs/dolphin/src/os/OSRtc.c similarity index 100% rename from src/dolphin/os/OSRtc.c rename to libs/dolphin/src/os/OSRtc.c diff --git a/src/dolphin/os/OSSemaphore.c b/libs/dolphin/src/os/OSSemaphore.c similarity index 100% rename from src/dolphin/os/OSSemaphore.c rename to libs/dolphin/src/os/OSSemaphore.c diff --git a/src/dolphin/os/OSStopwatch.c b/libs/dolphin/src/os/OSStopwatch.c similarity index 100% rename from src/dolphin/os/OSStopwatch.c rename to libs/dolphin/src/os/OSStopwatch.c diff --git a/src/dolphin/os/OSSync.c b/libs/dolphin/src/os/OSSync.c similarity index 100% rename from src/dolphin/os/OSSync.c rename to libs/dolphin/src/os/OSSync.c diff --git a/src/dolphin/os/OSThread.c b/libs/dolphin/src/os/OSThread.c similarity index 100% rename from src/dolphin/os/OSThread.c rename to libs/dolphin/src/os/OSThread.c diff --git a/src/dolphin/os/OSTime.c b/libs/dolphin/src/os/OSTime.c similarity index 100% rename from src/dolphin/os/OSTime.c rename to libs/dolphin/src/os/OSTime.c diff --git a/src/dolphin/os/OSTimer.c b/libs/dolphin/src/os/OSTimer.c similarity index 100% rename from src/dolphin/os/OSTimer.c rename to libs/dolphin/src/os/OSTimer.c diff --git a/src/dolphin/os/OSUtf.c b/libs/dolphin/src/os/OSUtf.c similarity index 100% rename from src/dolphin/os/OSUtf.c rename to libs/dolphin/src/os/OSUtf.c diff --git a/src/dolphin/os/__os.h b/libs/dolphin/src/os/__os.h similarity index 100% rename from src/dolphin/os/__os.h rename to libs/dolphin/src/os/__os.h diff --git a/src/dolphin/os/__ppc_eabi_init.c b/libs/dolphin/src/os/__ppc_eabi_init.c similarity index 100% rename from src/dolphin/os/__ppc_eabi_init.c rename to libs/dolphin/src/os/__ppc_eabi_init.c diff --git a/src/dolphin/os/__ppc_eabi_init.cpp b/libs/dolphin/src/os/__ppc_eabi_init.cpp similarity index 100% rename from src/dolphin/os/__ppc_eabi_init.cpp rename to libs/dolphin/src/os/__ppc_eabi_init.cpp diff --git a/src/dolphin/os/__start.c b/libs/dolphin/src/os/__start.c similarity index 100% rename from src/dolphin/os/__start.c rename to libs/dolphin/src/os/__start.c diff --git a/src/dolphin/os/time.dolphin.c b/libs/dolphin/src/os/time.dolphin.c similarity index 100% rename from src/dolphin/os/time.dolphin.c rename to libs/dolphin/src/os/time.dolphin.c diff --git a/src/dolphin/pad/Pad.c b/libs/dolphin/src/pad/Pad.c similarity index 100% rename from src/dolphin/pad/Pad.c rename to libs/dolphin/src/pad/Pad.c diff --git a/src/dolphin/pad/Padclamp.c b/libs/dolphin/src/pad/Padclamp.c similarity index 100% rename from src/dolphin/pad/Padclamp.c rename to libs/dolphin/src/pad/Padclamp.c diff --git a/src/dolphin/perf/__perf.h b/libs/dolphin/src/perf/__perf.h similarity index 100% rename from src/dolphin/perf/__perf.h rename to libs/dolphin/src/perf/__perf.h diff --git a/src/dolphin/perf/perf.c b/libs/dolphin/src/perf/perf.c similarity index 100% rename from src/dolphin/perf/perf.c rename to libs/dolphin/src/perf/perf.c diff --git a/src/dolphin/perf/perfdraw.c b/libs/dolphin/src/perf/perfdraw.c similarity index 100% rename from src/dolphin/perf/perfdraw.c rename to libs/dolphin/src/perf/perfdraw.c diff --git a/src/dolphin/seq/seq.c b/libs/dolphin/src/seq/seq.c similarity index 100% rename from src/dolphin/seq/seq.c rename to libs/dolphin/src/seq/seq.c diff --git a/src/dolphin/si/SIBios.c b/libs/dolphin/src/si/SIBios.c similarity index 100% rename from src/dolphin/si/SIBios.c rename to libs/dolphin/src/si/SIBios.c diff --git a/src/dolphin/si/SISamplingRate.c b/libs/dolphin/src/si/SISamplingRate.c similarity index 100% rename from src/dolphin/si/SISamplingRate.c rename to libs/dolphin/src/si/SISamplingRate.c diff --git a/src/dolphin/si/SISteering.c b/libs/dolphin/src/si/SISteering.c similarity index 100% rename from src/dolphin/si/SISteering.c rename to libs/dolphin/src/si/SISteering.c diff --git a/src/dolphin/si/SISteeringAuto.c b/libs/dolphin/src/si/SISteeringAuto.c similarity index 100% rename from src/dolphin/si/SISteeringAuto.c rename to libs/dolphin/src/si/SISteeringAuto.c diff --git a/src/dolphin/si/SISteeringXfer.c b/libs/dolphin/src/si/SISteeringXfer.c similarity index 100% rename from src/dolphin/si/SISteeringXfer.c rename to libs/dolphin/src/si/SISteeringXfer.c diff --git a/src/dolphin/si/__si.h b/libs/dolphin/src/si/__si.h similarity index 100% rename from src/dolphin/si/__si.h rename to libs/dolphin/src/si/__si.h diff --git a/src/dolphin/sp/sp.c b/libs/dolphin/src/sp/sp.c similarity index 100% rename from src/dolphin/sp/sp.c rename to libs/dolphin/src/sp/sp.c diff --git a/src/dolphin/support/HTable.c b/libs/dolphin/src/support/HTable.c similarity index 100% rename from src/dolphin/support/HTable.c rename to libs/dolphin/src/support/HTable.c diff --git a/src/dolphin/support/List.c b/libs/dolphin/src/support/List.c similarity index 100% rename from src/dolphin/support/List.c rename to libs/dolphin/src/support/List.c diff --git a/src/dolphin/support/Tree.c b/libs/dolphin/src/support/Tree.c similarity index 100% rename from src/dolphin/support/Tree.c rename to libs/dolphin/src/support/Tree.c diff --git a/src/dolphin/support/string.c b/libs/dolphin/src/support/string.c similarity index 100% rename from src/dolphin/support/string.c rename to libs/dolphin/src/support/string.c diff --git a/src/dolphin/syn/__syn.h b/libs/dolphin/src/syn/__syn.h similarity index 100% rename from src/dolphin/syn/__syn.h rename to libs/dolphin/src/syn/__syn.h diff --git a/src/dolphin/syn/syn.c b/libs/dolphin/src/syn/syn.c similarity index 100% rename from src/dolphin/syn/syn.c rename to libs/dolphin/src/syn/syn.c diff --git a/src/dolphin/syn/synctrl.c b/libs/dolphin/src/syn/synctrl.c similarity index 100% rename from src/dolphin/syn/synctrl.c rename to libs/dolphin/src/syn/synctrl.c diff --git a/src/dolphin/syn/synenv.c b/libs/dolphin/src/syn/synenv.c similarity index 100% rename from src/dolphin/syn/synenv.c rename to libs/dolphin/src/syn/synenv.c diff --git a/src/dolphin/syn/synlfo.c b/libs/dolphin/src/syn/synlfo.c similarity index 100% rename from src/dolphin/syn/synlfo.c rename to libs/dolphin/src/syn/synlfo.c diff --git a/src/dolphin/syn/synmix.c b/libs/dolphin/src/syn/synmix.c similarity index 100% rename from src/dolphin/syn/synmix.c rename to libs/dolphin/src/syn/synmix.c diff --git a/src/dolphin/syn/synpitch.c b/libs/dolphin/src/syn/synpitch.c similarity index 100% rename from src/dolphin/syn/synpitch.c rename to libs/dolphin/src/syn/synpitch.c diff --git a/src/dolphin/syn/synsample.c b/libs/dolphin/src/syn/synsample.c similarity index 100% rename from src/dolphin/syn/synsample.c rename to libs/dolphin/src/syn/synsample.c diff --git a/src/dolphin/syn/synvoice.c b/libs/dolphin/src/syn/synvoice.c similarity index 100% rename from src/dolphin/syn/synvoice.c rename to libs/dolphin/src/syn/synvoice.c diff --git a/src/dolphin/syn/synwt.c b/libs/dolphin/src/syn/synwt.c similarity index 100% rename from src/dolphin/syn/synwt.c rename to libs/dolphin/src/syn/synwt.c diff --git a/src/dolphin/texPalette/texPalette.c b/libs/dolphin/src/texPalette/texPalette.c similarity index 100% rename from src/dolphin/texPalette/texPalette.c rename to libs/dolphin/src/texPalette/texPalette.c diff --git a/src/dolphin/vi/__vi.h b/libs/dolphin/src/vi/__vi.h similarity index 100% rename from src/dolphin/vi/__vi.h rename to libs/dolphin/src/vi/__vi.h diff --git a/src/dolphin/vi/gpioexi.c b/libs/dolphin/src/vi/gpioexi.c similarity index 100% rename from src/dolphin/vi/gpioexi.c rename to libs/dolphin/src/vi/gpioexi.c diff --git a/src/dolphin/vi/i2c.c b/libs/dolphin/src/vi/i2c.c similarity index 100% rename from src/dolphin/vi/i2c.c rename to libs/dolphin/src/vi/i2c.c diff --git a/src/dolphin/vi/initphilips.c b/libs/dolphin/src/vi/initphilips.c similarity index 100% rename from src/dolphin/vi/initphilips.c rename to libs/dolphin/src/vi/initphilips.c diff --git a/src/dolphin/vi/vi.c b/libs/dolphin/src/vi/vi.c similarity index 100% rename from src/dolphin/vi/vi.c rename to libs/dolphin/src/vi/vi.c diff --git a/include/revolution/ai.h b/libs/revolution/include/revolution/ai.h similarity index 100% rename from include/revolution/ai.h rename to libs/revolution/include/revolution/ai.h diff --git a/include/revolution/amc/AmcExi2Comm.h b/libs/revolution/include/revolution/amc/AmcExi2Comm.h similarity index 100% rename from include/revolution/amc/AmcExi2Comm.h rename to libs/revolution/include/revolution/amc/AmcExi2Comm.h diff --git a/include/revolution/amc/AmcTypes.h b/libs/revolution/include/revolution/amc/AmcTypes.h similarity index 100% rename from include/revolution/amc/AmcTypes.h rename to libs/revolution/include/revolution/amc/AmcTypes.h diff --git a/include/revolution/aralt.h b/libs/revolution/include/revolution/aralt.h similarity index 100% rename from include/revolution/aralt.h rename to libs/revolution/include/revolution/aralt.h diff --git a/include/revolution/arc.h b/libs/revolution/include/revolution/arc.h similarity index 100% rename from include/revolution/arc.h rename to libs/revolution/include/revolution/arc.h diff --git a/include/revolution/ax.h b/libs/revolution/include/revolution/ax.h similarity index 100% rename from include/revolution/ax.h rename to libs/revolution/include/revolution/ax.h diff --git a/include/revolution/axart.h b/libs/revolution/include/revolution/axart.h similarity index 100% rename from include/revolution/axart.h rename to libs/revolution/include/revolution/axart.h diff --git a/include/revolution/axfx.h b/libs/revolution/include/revolution/axfx.h similarity index 100% rename from include/revolution/axfx.h rename to libs/revolution/include/revolution/axfx.h diff --git a/include/revolution/base/PPCArch.h b/libs/revolution/include/revolution/base/PPCArch.h similarity index 100% rename from include/revolution/base/PPCArch.h rename to libs/revolution/include/revolution/base/PPCArch.h diff --git a/include/revolution/card.h b/libs/revolution/include/revolution/card.h similarity index 100% rename from include/revolution/card.h rename to libs/revolution/include/revolution/card.h diff --git a/include/revolution/db.h b/libs/revolution/include/revolution/db.h similarity index 100% rename from include/revolution/db.h rename to libs/revolution/include/revolution/db.h diff --git a/include/revolution/db/DBInterface.h b/libs/revolution/include/revolution/db/DBInterface.h similarity index 100% rename from include/revolution/db/DBInterface.h rename to libs/revolution/include/revolution/db/DBInterface.h diff --git a/include/revolution/dsp.h b/libs/revolution/include/revolution/dsp.h similarity index 100% rename from include/revolution/dsp.h rename to libs/revolution/include/revolution/dsp.h diff --git a/include/revolution/dvd.h b/libs/revolution/include/revolution/dvd.h similarity index 100% rename from include/revolution/dvd.h rename to libs/revolution/include/revolution/dvd.h diff --git a/include/revolution/esp.h b/libs/revolution/include/revolution/esp.h similarity index 100% rename from include/revolution/esp.h rename to libs/revolution/include/revolution/esp.h diff --git a/include/revolution/euart.h b/libs/revolution/include/revolution/euart.h similarity index 100% rename from include/revolution/euart.h rename to libs/revolution/include/revolution/euart.h diff --git a/include/revolution/exi.h b/libs/revolution/include/revolution/exi.h similarity index 100% rename from include/revolution/exi.h rename to libs/revolution/include/revolution/exi.h diff --git a/include/revolution/fs.h b/libs/revolution/include/revolution/fs.h similarity index 100% rename from include/revolution/fs.h rename to libs/revolution/include/revolution/fs.h diff --git a/include/revolution/gd.h b/libs/revolution/include/revolution/gd.h similarity index 100% rename from include/revolution/gd.h rename to libs/revolution/include/revolution/gd.h diff --git a/include/revolution/gd/GDBase.h b/libs/revolution/include/revolution/gd/GDBase.h similarity index 100% rename from include/revolution/gd/GDBase.h rename to libs/revolution/include/revolution/gd/GDBase.h diff --git a/include/revolution/gd/GDFile.h b/libs/revolution/include/revolution/gd/GDFile.h similarity index 100% rename from include/revolution/gd/GDFile.h rename to libs/revolution/include/revolution/gd/GDFile.h diff --git a/include/revolution/gd/GDGeometry.h b/libs/revolution/include/revolution/gd/GDGeometry.h similarity index 100% rename from include/revolution/gd/GDGeometry.h rename to libs/revolution/include/revolution/gd/GDGeometry.h diff --git a/include/revolution/gd/GDIndirect.h b/libs/revolution/include/revolution/gd/GDIndirect.h similarity index 100% rename from include/revolution/gd/GDIndirect.h rename to libs/revolution/include/revolution/gd/GDIndirect.h diff --git a/include/revolution/gd/GDLight.h b/libs/revolution/include/revolution/gd/GDLight.h similarity index 100% rename from include/revolution/gd/GDLight.h rename to libs/revolution/include/revolution/gd/GDLight.h diff --git a/include/revolution/gd/GDPixel.h b/libs/revolution/include/revolution/gd/GDPixel.h similarity index 100% rename from include/revolution/gd/GDPixel.h rename to libs/revolution/include/revolution/gd/GDPixel.h diff --git a/include/revolution/gd/GDTev.h b/libs/revolution/include/revolution/gd/GDTev.h similarity index 100% rename from include/revolution/gd/GDTev.h rename to libs/revolution/include/revolution/gd/GDTev.h diff --git a/include/revolution/gd/GDTexture.h b/libs/revolution/include/revolution/gd/GDTexture.h similarity index 100% rename from include/revolution/gd/GDTexture.h rename to libs/revolution/include/revolution/gd/GDTexture.h diff --git a/include/revolution/gd/GDTransform.h b/libs/revolution/include/revolution/gd/GDTransform.h similarity index 100% rename from include/revolution/gd/GDTransform.h rename to libs/revolution/include/revolution/gd/GDTransform.h diff --git a/include/revolution/gf.h b/libs/revolution/include/revolution/gf.h similarity index 100% rename from include/revolution/gf.h rename to libs/revolution/include/revolution/gf.h diff --git a/include/revolution/gf/GFGeometry.h b/libs/revolution/include/revolution/gf/GFGeometry.h similarity index 100% rename from include/revolution/gf/GFGeometry.h rename to libs/revolution/include/revolution/gf/GFGeometry.h diff --git a/include/revolution/gf/GFLight.h b/libs/revolution/include/revolution/gf/GFLight.h similarity index 100% rename from include/revolution/gf/GFLight.h rename to libs/revolution/include/revolution/gf/GFLight.h diff --git a/include/revolution/gf/GFPixel.h b/libs/revolution/include/revolution/gf/GFPixel.h similarity index 100% rename from include/revolution/gf/GFPixel.h rename to libs/revolution/include/revolution/gf/GFPixel.h diff --git a/include/revolution/gf/GFTev.h b/libs/revolution/include/revolution/gf/GFTev.h similarity index 100% rename from include/revolution/gf/GFTev.h rename to libs/revolution/include/revolution/gf/GFTev.h diff --git a/include/revolution/gx.h b/libs/revolution/include/revolution/gx.h similarity index 100% rename from include/revolution/gx.h rename to libs/revolution/include/revolution/gx.h diff --git a/include/revolution/gx/GXBump.h b/libs/revolution/include/revolution/gx/GXBump.h similarity index 100% rename from include/revolution/gx/GXBump.h rename to libs/revolution/include/revolution/gx/GXBump.h diff --git a/include/revolution/gx/GXCommandList.h b/libs/revolution/include/revolution/gx/GXCommandList.h similarity index 100% rename from include/revolution/gx/GXCommandList.h rename to libs/revolution/include/revolution/gx/GXCommandList.h diff --git a/include/revolution/gx/GXCpu2Efb.h b/libs/revolution/include/revolution/gx/GXCpu2Efb.h similarity index 100% rename from include/revolution/gx/GXCpu2Efb.h rename to libs/revolution/include/revolution/gx/GXCpu2Efb.h diff --git a/include/revolution/gx/GXCull.h b/libs/revolution/include/revolution/gx/GXCull.h similarity index 100% rename from include/revolution/gx/GXCull.h rename to libs/revolution/include/revolution/gx/GXCull.h diff --git a/include/revolution/gx/GXDispList.h b/libs/revolution/include/revolution/gx/GXDispList.h similarity index 100% rename from include/revolution/gx/GXDispList.h rename to libs/revolution/include/revolution/gx/GXDispList.h diff --git a/include/revolution/gx/GXDraw.h b/libs/revolution/include/revolution/gx/GXDraw.h similarity index 100% rename from include/revolution/gx/GXDraw.h rename to libs/revolution/include/revolution/gx/GXDraw.h diff --git a/include/revolution/gx/GXEnum.h b/libs/revolution/include/revolution/gx/GXEnum.h similarity index 100% rename from include/revolution/gx/GXEnum.h rename to libs/revolution/include/revolution/gx/GXEnum.h diff --git a/include/revolution/gx/GXFifo.h b/libs/revolution/include/revolution/gx/GXFifo.h similarity index 100% rename from include/revolution/gx/GXFifo.h rename to libs/revolution/include/revolution/gx/GXFifo.h diff --git a/include/revolution/gx/GXFrameBuffer.h b/libs/revolution/include/revolution/gx/GXFrameBuffer.h similarity index 100% rename from include/revolution/gx/GXFrameBuffer.h rename to libs/revolution/include/revolution/gx/GXFrameBuffer.h diff --git a/include/revolution/gx/GXGeometry.h b/libs/revolution/include/revolution/gx/GXGeometry.h similarity index 100% rename from include/revolution/gx/GXGeometry.h rename to libs/revolution/include/revolution/gx/GXGeometry.h diff --git a/include/revolution/gx/GXGet.h b/libs/revolution/include/revolution/gx/GXGet.h similarity index 100% rename from include/revolution/gx/GXGet.h rename to libs/revolution/include/revolution/gx/GXGet.h diff --git a/include/revolution/gx/GXLighting.h b/libs/revolution/include/revolution/gx/GXLighting.h similarity index 100% rename from include/revolution/gx/GXLighting.h rename to libs/revolution/include/revolution/gx/GXLighting.h diff --git a/include/revolution/gx/GXManage.h b/libs/revolution/include/revolution/gx/GXManage.h similarity index 100% rename from include/revolution/gx/GXManage.h rename to libs/revolution/include/revolution/gx/GXManage.h diff --git a/include/revolution/gx/GXPerf.h b/libs/revolution/include/revolution/gx/GXPerf.h similarity index 100% rename from include/revolution/gx/GXPerf.h rename to libs/revolution/include/revolution/gx/GXPerf.h diff --git a/include/revolution/gx/GXPixel.h b/libs/revolution/include/revolution/gx/GXPixel.h similarity index 100% rename from include/revolution/gx/GXPixel.h rename to libs/revolution/include/revolution/gx/GXPixel.h diff --git a/include/revolution/gx/GXStruct.h b/libs/revolution/include/revolution/gx/GXStruct.h similarity index 100% rename from include/revolution/gx/GXStruct.h rename to libs/revolution/include/revolution/gx/GXStruct.h diff --git a/include/revolution/gx/GXTev.h b/libs/revolution/include/revolution/gx/GXTev.h similarity index 100% rename from include/revolution/gx/GXTev.h rename to libs/revolution/include/revolution/gx/GXTev.h diff --git a/include/revolution/gx/GXTexture.h b/libs/revolution/include/revolution/gx/GXTexture.h similarity index 100% rename from include/revolution/gx/GXTexture.h rename to libs/revolution/include/revolution/gx/GXTexture.h diff --git a/include/revolution/gx/GXTransform.h b/libs/revolution/include/revolution/gx/GXTransform.h similarity index 100% rename from include/revolution/gx/GXTransform.h rename to libs/revolution/include/revolution/gx/GXTransform.h diff --git a/include/revolution/gx/GXVerify.h b/libs/revolution/include/revolution/gx/GXVerify.h similarity index 100% rename from include/revolution/gx/GXVerify.h rename to libs/revolution/include/revolution/gx/GXVerify.h diff --git a/include/revolution/gx/GXVert.h b/libs/revolution/include/revolution/gx/GXVert.h similarity index 100% rename from include/revolution/gx/GXVert.h rename to libs/revolution/include/revolution/gx/GXVert.h diff --git a/include/revolution/hbm.h b/libs/revolution/include/revolution/hbm.h similarity index 100% rename from include/revolution/hbm.h rename to libs/revolution/include/revolution/hbm.h diff --git a/include/revolution/hio2.h b/libs/revolution/include/revolution/hio2.h similarity index 100% rename from include/revolution/hio2.h rename to libs/revolution/include/revolution/hio2.h diff --git a/include/revolution/hw_regs.h b/libs/revolution/include/revolution/hw_regs.h similarity index 100% rename from include/revolution/hw_regs.h rename to libs/revolution/include/revolution/hw_regs.h diff --git a/include/revolution/ipc.h b/libs/revolution/include/revolution/ipc.h similarity index 100% rename from include/revolution/ipc.h rename to libs/revolution/include/revolution/ipc.h diff --git a/include/revolution/ipc/ipcProfile.h b/libs/revolution/include/revolution/ipc/ipcProfile.h similarity index 100% rename from include/revolution/ipc/ipcProfile.h rename to libs/revolution/include/revolution/ipc/ipcProfile.h diff --git a/include/revolution/ipc/ipcclt.h b/libs/revolution/include/revolution/ipc/ipcclt.h similarity index 100% rename from include/revolution/ipc/ipcclt.h rename to libs/revolution/include/revolution/ipc/ipcclt.h diff --git a/include/revolution/ipc/memory.h b/libs/revolution/include/revolution/ipc/memory.h similarity index 100% rename from include/revolution/ipc/memory.h rename to libs/revolution/include/revolution/ipc/memory.h diff --git a/include/revolution/kpad.h b/libs/revolution/include/revolution/kpad.h similarity index 100% rename from include/revolution/kpad.h rename to libs/revolution/include/revolution/kpad.h diff --git a/include/revolution/mem.h b/libs/revolution/include/revolution/mem.h similarity index 100% rename from include/revolution/mem.h rename to libs/revolution/include/revolution/mem.h diff --git a/include/revolution/mem/allocator.h b/libs/revolution/include/revolution/mem/allocator.h similarity index 100% rename from include/revolution/mem/allocator.h rename to libs/revolution/include/revolution/mem/allocator.h diff --git a/include/revolution/mem/expHeap.h b/libs/revolution/include/revolution/mem/expHeap.h similarity index 100% rename from include/revolution/mem/expHeap.h rename to libs/revolution/include/revolution/mem/expHeap.h diff --git a/include/revolution/mem/heapCommon.h b/libs/revolution/include/revolution/mem/heapCommon.h similarity index 100% rename from include/revolution/mem/heapCommon.h rename to libs/revolution/include/revolution/mem/heapCommon.h diff --git a/include/revolution/mem/list.h b/libs/revolution/include/revolution/mem/list.h similarity index 100% rename from include/revolution/mem/list.h rename to libs/revolution/include/revolution/mem/list.h diff --git a/include/revolution/mix.h b/libs/revolution/include/revolution/mix.h similarity index 100% rename from include/revolution/mix.h rename to libs/revolution/include/revolution/mix.h diff --git a/include/revolution/mtx.h b/libs/revolution/include/revolution/mtx.h similarity index 100% rename from include/revolution/mtx.h rename to libs/revolution/include/revolution/mtx.h diff --git a/include/revolution/nand.h b/libs/revolution/include/revolution/nand.h similarity index 100% rename from include/revolution/nand.h rename to libs/revolution/include/revolution/nand.h diff --git a/include/revolution/os.h b/libs/revolution/include/revolution/os.h similarity index 100% rename from include/revolution/os.h rename to libs/revolution/include/revolution/os.h diff --git a/include/revolution/os/OSAlarm.h b/libs/revolution/include/revolution/os/OSAlarm.h similarity index 100% rename from include/revolution/os/OSAlarm.h rename to libs/revolution/include/revolution/os/OSAlarm.h diff --git a/include/revolution/os/OSAlloc.h b/libs/revolution/include/revolution/os/OSAlloc.h similarity index 100% rename from include/revolution/os/OSAlloc.h rename to libs/revolution/include/revolution/os/OSAlloc.h diff --git a/include/revolution/os/OSCache.h b/libs/revolution/include/revolution/os/OSCache.h similarity index 100% rename from include/revolution/os/OSCache.h rename to libs/revolution/include/revolution/os/OSCache.h diff --git a/include/revolution/os/OSContext.h b/libs/revolution/include/revolution/os/OSContext.h similarity index 100% rename from include/revolution/os/OSContext.h rename to libs/revolution/include/revolution/os/OSContext.h diff --git a/include/revolution/os/OSDC.h b/libs/revolution/include/revolution/os/OSDC.h similarity index 100% rename from include/revolution/os/OSDC.h rename to libs/revolution/include/revolution/os/OSDC.h diff --git a/include/revolution/os/OSError.h b/libs/revolution/include/revolution/os/OSError.h similarity index 100% rename from include/revolution/os/OSError.h rename to libs/revolution/include/revolution/os/OSError.h diff --git a/include/revolution/os/OSException.h b/libs/revolution/include/revolution/os/OSException.h similarity index 100% rename from include/revolution/os/OSException.h rename to libs/revolution/include/revolution/os/OSException.h diff --git a/include/revolution/os/OSExec.h b/libs/revolution/include/revolution/os/OSExec.h similarity index 100% rename from include/revolution/os/OSExec.h rename to libs/revolution/include/revolution/os/OSExec.h diff --git a/include/revolution/os/OSFont.h b/libs/revolution/include/revolution/os/OSFont.h similarity index 100% rename from include/revolution/os/OSFont.h rename to libs/revolution/include/revolution/os/OSFont.h diff --git a/include/revolution/os/OSHardware.h b/libs/revolution/include/revolution/os/OSHardware.h similarity index 100% rename from include/revolution/os/OSHardware.h rename to libs/revolution/include/revolution/os/OSHardware.h diff --git a/include/revolution/os/OSIC.h b/libs/revolution/include/revolution/os/OSIC.h similarity index 100% rename from include/revolution/os/OSIC.h rename to libs/revolution/include/revolution/os/OSIC.h diff --git a/include/revolution/os/OSInterrupt.h b/libs/revolution/include/revolution/os/OSInterrupt.h similarity index 100% rename from include/revolution/os/OSInterrupt.h rename to libs/revolution/include/revolution/os/OSInterrupt.h diff --git a/include/revolution/os/OSIpc.h b/libs/revolution/include/revolution/os/OSIpc.h similarity index 100% rename from include/revolution/os/OSIpc.h rename to libs/revolution/include/revolution/os/OSIpc.h diff --git a/include/revolution/os/OSL2.h b/libs/revolution/include/revolution/os/OSL2.h similarity index 100% rename from include/revolution/os/OSL2.h rename to libs/revolution/include/revolution/os/OSL2.h diff --git a/include/revolution/os/OSLC.h b/libs/revolution/include/revolution/os/OSLC.h similarity index 100% rename from include/revolution/os/OSLC.h rename to libs/revolution/include/revolution/os/OSLC.h diff --git a/include/revolution/os/OSMemory.h b/libs/revolution/include/revolution/os/OSMemory.h similarity index 100% rename from include/revolution/os/OSMemory.h rename to libs/revolution/include/revolution/os/OSMemory.h diff --git a/include/revolution/os/OSMessage.h b/libs/revolution/include/revolution/os/OSMessage.h similarity index 100% rename from include/revolution/os/OSMessage.h rename to libs/revolution/include/revolution/os/OSMessage.h diff --git a/include/revolution/os/OSModule.h b/libs/revolution/include/revolution/os/OSModule.h similarity index 100% rename from include/revolution/os/OSModule.h rename to libs/revolution/include/revolution/os/OSModule.h diff --git a/include/revolution/os/OSMutex.h b/libs/revolution/include/revolution/os/OSMutex.h similarity index 100% rename from include/revolution/os/OSMutex.h rename to libs/revolution/include/revolution/os/OSMutex.h diff --git a/include/revolution/os/OSNandbootInfo.h b/libs/revolution/include/revolution/os/OSNandbootInfo.h similarity index 100% rename from include/revolution/os/OSNandbootInfo.h rename to libs/revolution/include/revolution/os/OSNandbootInfo.h diff --git a/include/revolution/os/OSNet.h b/libs/revolution/include/revolution/os/OSNet.h similarity index 100% rename from include/revolution/os/OSNet.h rename to libs/revolution/include/revolution/os/OSNet.h diff --git a/include/revolution/os/OSPlayRecord.h b/libs/revolution/include/revolution/os/OSPlayRecord.h similarity index 100% rename from include/revolution/os/OSPlayRecord.h rename to libs/revolution/include/revolution/os/OSPlayRecord.h diff --git a/include/revolution/os/OSPlayTime.h b/libs/revolution/include/revolution/os/OSPlayTime.h similarity index 100% rename from include/revolution/os/OSPlayTime.h rename to libs/revolution/include/revolution/os/OSPlayTime.h diff --git a/include/revolution/os/OSReboot.h b/libs/revolution/include/revolution/os/OSReboot.h similarity index 100% rename from include/revolution/os/OSReboot.h rename to libs/revolution/include/revolution/os/OSReboot.h diff --git a/include/revolution/os/OSReset.h b/libs/revolution/include/revolution/os/OSReset.h similarity index 100% rename from include/revolution/os/OSReset.h rename to libs/revolution/include/revolution/os/OSReset.h diff --git a/include/revolution/os/OSResetSW.h b/libs/revolution/include/revolution/os/OSResetSW.h similarity index 86% rename from include/revolution/os/OSResetSW.h rename to libs/revolution/include/revolution/os/OSResetSW.h index c6fc2d027f..752efaea89 100644 --- a/include/revolution/os/OSResetSW.h +++ b/libs/revolution/include/revolution/os/OSResetSW.h @@ -11,6 +11,7 @@ typedef void (*OSResetCallback)(void); typedef void (*OSPowerCallback)(void); OSResetCallback OSSetResetCallback(OSResetCallback callback); +OSPowerCallback OSSetPowerCallback(OSPowerCallback callback); BOOL OSGetResetSwitchState(void); BOOL OSGetResetButtonState(void); diff --git a/include/revolution/os/OSRtc.h b/libs/revolution/include/revolution/os/OSRtc.h similarity index 100% rename from include/revolution/os/OSRtc.h rename to libs/revolution/include/revolution/os/OSRtc.h diff --git a/include/revolution/os/OSSemaphore.h b/libs/revolution/include/revolution/os/OSSemaphore.h similarity index 100% rename from include/revolution/os/OSSemaphore.h rename to libs/revolution/include/revolution/os/OSSemaphore.h diff --git a/include/revolution/os/OSSerial.h b/libs/revolution/include/revolution/os/OSSerial.h similarity index 100% rename from include/revolution/os/OSSerial.h rename to libs/revolution/include/revolution/os/OSSerial.h diff --git a/include/revolution/os/OSStateFlags.h b/libs/revolution/include/revolution/os/OSStateFlags.h similarity index 100% rename from include/revolution/os/OSStateFlags.h rename to libs/revolution/include/revolution/os/OSStateFlags.h diff --git a/include/revolution/os/OSThread.h b/libs/revolution/include/revolution/os/OSThread.h similarity index 100% rename from include/revolution/os/OSThread.h rename to libs/revolution/include/revolution/os/OSThread.h diff --git a/include/revolution/os/OSTime.h b/libs/revolution/include/revolution/os/OSTime.h similarity index 100% rename from include/revolution/os/OSTime.h rename to libs/revolution/include/revolution/os/OSTime.h diff --git a/include/revolution/os/OSTimer.h b/libs/revolution/include/revolution/os/OSTimer.h similarity index 100% rename from include/revolution/os/OSTimer.h rename to libs/revolution/include/revolution/os/OSTimer.h diff --git a/include/revolution/os/OSUtf.h b/libs/revolution/include/revolution/os/OSUtf.h similarity index 100% rename from include/revolution/os/OSUtf.h rename to libs/revolution/include/revolution/os/OSUtf.h diff --git a/include/revolution/pad.h b/libs/revolution/include/revolution/pad.h similarity index 100% rename from include/revolution/pad.h rename to libs/revolution/include/revolution/pad.h diff --git a/include/revolution/private/GXFDLShortcut.h b/libs/revolution/include/revolution/private/GXFDLShortcut.h similarity index 100% rename from include/revolution/private/GXFDLShortcut.h rename to libs/revolution/include/revolution/private/GXFDLShortcut.h diff --git a/include/revolution/private/GXRegs.h b/libs/revolution/include/revolution/private/GXRegs.h similarity index 100% rename from include/revolution/private/GXRegs.h rename to libs/revolution/include/revolution/private/GXRegs.h diff --git a/include/revolution/private/bp_reg.h b/libs/revolution/include/revolution/private/bp_reg.h similarity index 100% rename from include/revolution/private/bp_reg.h rename to libs/revolution/include/revolution/private/bp_reg.h diff --git a/include/revolution/private/cp_reg.h b/libs/revolution/include/revolution/private/cp_reg.h similarity index 100% rename from include/revolution/private/cp_reg.h rename to libs/revolution/include/revolution/private/cp_reg.h diff --git a/include/revolution/private/gen_reg.h b/libs/revolution/include/revolution/private/gen_reg.h similarity index 100% rename from include/revolution/private/gen_reg.h rename to libs/revolution/include/revolution/private/gen_reg.h diff --git a/include/revolution/private/iosrestypes.h b/libs/revolution/include/revolution/private/iosrestypes.h similarity index 100% rename from include/revolution/private/iosrestypes.h rename to libs/revolution/include/revolution/private/iosrestypes.h diff --git a/include/revolution/private/iostypes.h b/libs/revolution/include/revolution/private/iostypes.h similarity index 100% rename from include/revolution/private/iostypes.h rename to libs/revolution/include/revolution/private/iostypes.h diff --git a/include/revolution/private/pe_reg.h b/libs/revolution/include/revolution/private/pe_reg.h similarity index 100% rename from include/revolution/private/pe_reg.h rename to libs/revolution/include/revolution/private/pe_reg.h diff --git a/include/revolution/private/pi_reg.h b/libs/revolution/include/revolution/private/pi_reg.h similarity index 100% rename from include/revolution/private/pi_reg.h rename to libs/revolution/include/revolution/private/pi_reg.h diff --git a/include/revolution/private/ras_reg.h b/libs/revolution/include/revolution/private/ras_reg.h similarity index 100% rename from include/revolution/private/ras_reg.h rename to libs/revolution/include/revolution/private/ras_reg.h diff --git a/include/revolution/private/su_reg.h b/libs/revolution/include/revolution/private/su_reg.h similarity index 100% rename from include/revolution/private/su_reg.h rename to libs/revolution/include/revolution/private/su_reg.h diff --git a/include/revolution/private/tev_reg.h b/libs/revolution/include/revolution/private/tev_reg.h similarity index 100% rename from include/revolution/private/tev_reg.h rename to libs/revolution/include/revolution/private/tev_reg.h diff --git a/include/revolution/private/tx_reg.h b/libs/revolution/include/revolution/private/tx_reg.h similarity index 100% rename from include/revolution/private/tx_reg.h rename to libs/revolution/include/revolution/private/tx_reg.h diff --git a/include/revolution/private/xf_mem.h b/libs/revolution/include/revolution/private/xf_mem.h similarity index 100% rename from include/revolution/private/xf_mem.h rename to libs/revolution/include/revolution/private/xf_mem.h diff --git a/include/revolution/revolution.h b/libs/revolution/include/revolution/revolution.h similarity index 100% rename from include/revolution/revolution.h rename to libs/revolution/include/revolution/revolution.h diff --git a/include/revolution/sc.h b/libs/revolution/include/revolution/sc.h similarity index 99% rename from include/revolution/sc.h rename to libs/revolution/include/revolution/sc.h index 88ecad9660..262b165607 100644 --- a/include/revolution/sc.h +++ b/libs/revolution/include/revolution/sc.h @@ -184,6 +184,7 @@ u8 SCGetEuRgb60Mode(void); BOOL SCGetIdleMode(SCIdleModeInfo* data); u8 SCGetLanguage(void); u8 SCGetProgressiveMode(void); +void SCSetProgressiveMode(u8 mode); u8 SCGetScreenSaverMode(void); u8 SCGetSoundMode(void); u32 SCGetCounterBias(void); diff --git a/include/revolution/sdk_math.h b/libs/revolution/include/revolution/sdk_math.h similarity index 100% rename from include/revolution/sdk_math.h rename to libs/revolution/include/revolution/sdk_math.h diff --git a/include/revolution/seq.h b/libs/revolution/include/revolution/seq.h similarity index 100% rename from include/revolution/seq.h rename to libs/revolution/include/revolution/seq.h diff --git a/include/revolution/si.h b/libs/revolution/include/revolution/si.h similarity index 100% rename from include/revolution/si.h rename to libs/revolution/include/revolution/si.h diff --git a/include/revolution/sp.h b/libs/revolution/include/revolution/sp.h similarity index 100% rename from include/revolution/sp.h rename to libs/revolution/include/revolution/sp.h diff --git a/include/revolution/syn.h b/libs/revolution/include/revolution/syn.h similarity index 100% rename from include/revolution/syn.h rename to libs/revolution/include/revolution/syn.h diff --git a/include/revolution/thp.h b/libs/revolution/include/revolution/thp.h similarity index 100% rename from include/revolution/thp.h rename to libs/revolution/include/revolution/thp.h diff --git a/include/revolution/tpl.h b/libs/revolution/include/revolution/tpl.h similarity index 100% rename from include/revolution/tpl.h rename to libs/revolution/include/revolution/tpl.h diff --git a/include/revolution/types.h b/libs/revolution/include/revolution/types.h similarity index 100% rename from include/revolution/types.h rename to libs/revolution/include/revolution/types.h diff --git a/include/revolution/usb.h b/libs/revolution/include/revolution/usb.h similarity index 100% rename from include/revolution/usb.h rename to libs/revolution/include/revolution/usb.h diff --git a/include/revolution/vi.h b/libs/revolution/include/revolution/vi.h similarity index 100% rename from include/revolution/vi.h rename to libs/revolution/include/revolution/vi.h diff --git a/include/revolution/vi/vifuncs.h b/libs/revolution/include/revolution/vi/vifuncs.h similarity index 100% rename from include/revolution/vi/vifuncs.h rename to libs/revolution/include/revolution/vi/vifuncs.h diff --git a/include/revolution/vi/vitypes.h b/libs/revolution/include/revolution/vi/vitypes.h similarity index 100% rename from include/revolution/vi/vitypes.h rename to libs/revolution/include/revolution/vi/vitypes.h diff --git a/include/revolution/wenc.h b/libs/revolution/include/revolution/wenc.h similarity index 100% rename from include/revolution/wenc.h rename to libs/revolution/include/revolution/wenc.h diff --git a/include/revolution/wpad.h b/libs/revolution/include/revolution/wpad.h similarity index 100% rename from include/revolution/wpad.h rename to libs/revolution/include/revolution/wpad.h diff --git a/include/revolution/wpad/bte.h b/libs/revolution/include/revolution/wpad/bte.h similarity index 100% rename from include/revolution/wpad/bte.h rename to libs/revolution/include/revolution/wpad/bte.h diff --git a/include/revolution/wpad/wud.h b/libs/revolution/include/revolution/wpad/wud.h similarity index 100% rename from include/revolution/wpad/wud.h rename to libs/revolution/include/revolution/wpad/wud.h diff --git a/include/revolution/wud.h b/libs/revolution/include/revolution/wud.h similarity index 100% rename from include/revolution/wud.h rename to libs/revolution/include/revolution/wud.h diff --git a/src/revolution/ai/ai.c b/libs/revolution/src/ai/ai.c similarity index 100% rename from src/revolution/ai/ai.c rename to libs/revolution/src/ai/ai.c diff --git a/src/revolution/aralt/__ar.h b/libs/revolution/src/aralt/__ar.h similarity index 100% rename from src/revolution/aralt/__ar.h rename to libs/revolution/src/aralt/__ar.h diff --git a/src/revolution/aralt/aralt.c b/libs/revolution/src/aralt/aralt.c similarity index 100% rename from src/revolution/aralt/aralt.c rename to libs/revolution/src/aralt/aralt.c diff --git a/src/revolution/arc/arc.c b/libs/revolution/src/arc/arc.c similarity index 100% rename from src/revolution/arc/arc.c rename to libs/revolution/src/arc/arc.c diff --git a/src/revolution/ax/AXAux.c b/libs/revolution/src/ax/AXAux.c similarity index 100% rename from src/revolution/ax/AXAux.c rename to libs/revolution/src/ax/AXAux.c diff --git a/src/revolution/ax/AXCL.c b/libs/revolution/src/ax/AXCL.c similarity index 100% rename from src/revolution/ax/AXCL.c rename to libs/revolution/src/ax/AXCL.c diff --git a/src/revolution/axfx/AXFXHooks.c b/libs/revolution/src/axfx/AXFXHooks.c similarity index 100% rename from src/revolution/axfx/AXFXHooks.c rename to libs/revolution/src/axfx/AXFXHooks.c diff --git a/src/revolution/axfx/AXFXReverbHi.c b/libs/revolution/src/axfx/AXFXReverbHi.c similarity index 100% rename from src/revolution/axfx/AXFXReverbHi.c rename to libs/revolution/src/axfx/AXFXReverbHi.c diff --git a/src/revolution/axfx/AXFXReverbHiExp.c b/libs/revolution/src/axfx/AXFXReverbHiExp.c similarity index 100% rename from src/revolution/axfx/AXFXReverbHiExp.c rename to libs/revolution/src/axfx/AXFXReverbHiExp.c diff --git a/src/revolution/base/PPCArch.c b/libs/revolution/src/base/PPCArch.c similarity index 100% rename from src/revolution/base/PPCArch.c rename to libs/revolution/src/base/PPCArch.c diff --git a/src/revolution/base/PPCPm.c b/libs/revolution/src/base/PPCPm.c similarity index 100% rename from src/revolution/base/PPCPm.c rename to libs/revolution/src/base/PPCPm.c diff --git a/src/revolution/card/CARDBios.c b/libs/revolution/src/card/CARDBios.c similarity index 100% rename from src/revolution/card/CARDBios.c rename to libs/revolution/src/card/CARDBios.c diff --git a/src/revolution/card/CARDBlock.c b/libs/revolution/src/card/CARDBlock.c similarity index 99% rename from src/revolution/card/CARDBlock.c rename to libs/revolution/src/card/CARDBlock.c index b7af255ddf..9a1f02145f 100644 --- a/src/revolution/card/CARDBlock.c +++ b/libs/revolution/src/card/CARDBlock.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDCheck.c b/libs/revolution/src/card/CARDCheck.c similarity index 99% rename from src/revolution/card/CARDCheck.c rename to libs/revolution/src/card/CARDCheck.c index 4a9b78c736..1d1b715b18 100644 --- a/src/revolution/card/CARDCheck.c +++ b/libs/revolution/src/card/CARDCheck.c @@ -1,4 +1,4 @@ -#include +#include #include "os/__os.h" #include "__card.h" diff --git a/src/revolution/card/CARDCreate.c b/libs/revolution/src/card/CARDCreate.c similarity index 99% rename from src/revolution/card/CARDCreate.c rename to libs/revolution/src/card/CARDCreate.c index 7da5ab0911..a94036d832 100644 --- a/src/revolution/card/CARDCreate.c +++ b/libs/revolution/src/card/CARDCreate.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDDelete.c b/libs/revolution/src/card/CARDDelete.c similarity index 98% rename from src/revolution/card/CARDDelete.c rename to libs/revolution/src/card/CARDDelete.c index 0acf24be1c..a72d01bdeb 100644 --- a/src/revolution/card/CARDDelete.c +++ b/libs/revolution/src/card/CARDDelete.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDDir.c b/libs/revolution/src/card/CARDDir.c similarity index 98% rename from src/revolution/card/CARDDir.c rename to libs/revolution/src/card/CARDDir.c index e154a9c428..87e289e1ae 100644 --- a/src/revolution/card/CARDDir.c +++ b/libs/revolution/src/card/CARDDir.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDErase.c b/libs/revolution/src/card/CARDErase.c similarity index 98% rename from src/revolution/card/CARDErase.c rename to libs/revolution/src/card/CARDErase.c index 73bb8ef04b..0b55994fb9 100644 --- a/src/revolution/card/CARDErase.c +++ b/libs/revolution/src/card/CARDErase.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDFormat.c b/libs/revolution/src/card/CARDFormat.c similarity index 99% rename from src/revolution/card/CARDFormat.c rename to libs/revolution/src/card/CARDFormat.c index 7bcc76daa1..7719fbb03c 100644 --- a/src/revolution/card/CARDFormat.c +++ b/libs/revolution/src/card/CARDFormat.c @@ -1,4 +1,4 @@ -#include +#include #include "os/__os.h" #include "__card.h" diff --git a/src/revolution/card/CARDMount.c b/libs/revolution/src/card/CARDMount.c similarity index 99% rename from src/revolution/card/CARDMount.c rename to libs/revolution/src/card/CARDMount.c index 4ca607dc3b..472606427a 100644 --- a/src/revolution/card/CARDMount.c +++ b/libs/revolution/src/card/CARDMount.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "os/__os.h" #include "__card.h" diff --git a/src/revolution/card/CARDNet.c b/libs/revolution/src/card/CARDNet.c similarity index 99% rename from src/revolution/card/CARDNet.c rename to libs/revolution/src/card/CARDNet.c index 5f43d3becf..513997c685 100644 --- a/src/revolution/card/CARDNet.c +++ b/libs/revolution/src/card/CARDNet.c @@ -1,4 +1,4 @@ -#include +#include #include "os/__os.h" #include "__card.h" diff --git a/src/revolution/card/CARDOpen.c b/libs/revolution/src/card/CARDOpen.c similarity index 99% rename from src/revolution/card/CARDOpen.c rename to libs/revolution/src/card/CARDOpen.c index bd86568291..0a48c0e527 100644 --- a/src/revolution/card/CARDOpen.c +++ b/libs/revolution/src/card/CARDOpen.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDProgram.c b/libs/revolution/src/card/CARDProgram.c similarity index 99% rename from src/revolution/card/CARDProgram.c rename to libs/revolution/src/card/CARDProgram.c index 2e603777fa..30bdc42d38 100644 --- a/src/revolution/card/CARDProgram.c +++ b/libs/revolution/src/card/CARDProgram.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDRaw.c b/libs/revolution/src/card/CARDRaw.c similarity index 98% rename from src/revolution/card/CARDRaw.c rename to libs/revolution/src/card/CARDRaw.c index 584a9be9c2..91c0ab92fa 100644 --- a/src/revolution/card/CARDRaw.c +++ b/libs/revolution/src/card/CARDRaw.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDRdwr.c b/libs/revolution/src/card/CARDRdwr.c similarity index 98% rename from src/revolution/card/CARDRdwr.c rename to libs/revolution/src/card/CARDRdwr.c index 8350f57ac4..b94ac032cd 100644 --- a/src/revolution/card/CARDRdwr.c +++ b/libs/revolution/src/card/CARDRdwr.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDRead.c b/libs/revolution/src/card/CARDRead.c similarity index 99% rename from src/revolution/card/CARDRead.c rename to libs/revolution/src/card/CARDRead.c index 74bd544a6f..4a468e1faa 100644 --- a/src/revolution/card/CARDRead.c +++ b/libs/revolution/src/card/CARDRead.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDRename.c b/libs/revolution/src/card/CARDRename.c similarity index 98% rename from src/revolution/card/CARDRename.c rename to libs/revolution/src/card/CARDRename.c index 0a76aca32b..590208480a 100644 --- a/src/revolution/card/CARDRename.c +++ b/libs/revolution/src/card/CARDRename.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDStat.c b/libs/revolution/src/card/CARDStat.c similarity index 99% rename from src/revolution/card/CARDStat.c rename to libs/revolution/src/card/CARDStat.c index f99455b42b..6181086795 100644 --- a/src/revolution/card/CARDStat.c +++ b/libs/revolution/src/card/CARDStat.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDStatEx.c b/libs/revolution/src/card/CARDStatEx.c similarity index 98% rename from src/revolution/card/CARDStatEx.c rename to libs/revolution/src/card/CARDStatEx.c index 0ec84c1cea..4a5fa87e81 100644 --- a/src/revolution/card/CARDStatEx.c +++ b/libs/revolution/src/card/CARDStatEx.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDUnlock.c b/libs/revolution/src/card/CARDUnlock.c similarity index 99% rename from src/revolution/card/CARDUnlock.c rename to libs/revolution/src/card/CARDUnlock.c index 48f64e500a..93298297c8 100644 --- a/src/revolution/card/CARDUnlock.c +++ b/libs/revolution/src/card/CARDUnlock.c @@ -1,6 +1,5 @@ #include -#include -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDWrite.c b/libs/revolution/src/card/CARDWrite.c similarity index 99% rename from src/revolution/card/CARDWrite.c rename to libs/revolution/src/card/CARDWrite.c index ad9fa4a273..b76255ea72 100644 --- a/src/revolution/card/CARDWrite.c +++ b/libs/revolution/src/card/CARDWrite.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/__card.h b/libs/revolution/src/card/__card.h similarity index 100% rename from src/revolution/card/__card.h rename to libs/revolution/src/card/__card.h diff --git a/src/revolution/dsp/__dsp.h b/libs/revolution/src/dsp/__dsp.h similarity index 100% rename from src/revolution/dsp/__dsp.h rename to libs/revolution/src/dsp/__dsp.h diff --git a/src/revolution/dsp/dsp.c b/libs/revolution/src/dsp/dsp.c similarity index 100% rename from src/revolution/dsp/dsp.c rename to libs/revolution/src/dsp/dsp.c diff --git a/src/revolution/dsp/dsp_debug.c b/libs/revolution/src/dsp/dsp_debug.c similarity index 100% rename from src/revolution/dsp/dsp_debug.c rename to libs/revolution/src/dsp/dsp_debug.c diff --git a/src/revolution/dsp/dsp_task.c b/libs/revolution/src/dsp/dsp_task.c similarity index 100% rename from src/revolution/dsp/dsp_task.c rename to libs/revolution/src/dsp/dsp_task.c diff --git a/src/revolution/dvd/__dvd.h b/libs/revolution/src/dvd/__dvd.h similarity index 100% rename from src/revolution/dvd/__dvd.h rename to libs/revolution/src/dvd/__dvd.h diff --git a/src/revolution/dvd/dvd.c b/libs/revolution/src/dvd/dvd.c similarity index 100% rename from src/revolution/dvd/dvd.c rename to libs/revolution/src/dvd/dvd.c diff --git a/src/revolution/dvd/dvdDeviceError.c b/libs/revolution/src/dvd/dvdDeviceError.c similarity index 100% rename from src/revolution/dvd/dvdDeviceError.c rename to libs/revolution/src/dvd/dvdDeviceError.c diff --git a/src/revolution/dvd/dvdFatal.c b/libs/revolution/src/dvd/dvdFatal.c similarity index 100% rename from src/revolution/dvd/dvdFatal.c rename to libs/revolution/src/dvd/dvdFatal.c diff --git a/src/revolution/dvd/dvd_broadway.c b/libs/revolution/src/dvd/dvd_broadway.c similarity index 100% rename from src/revolution/dvd/dvd_broadway.c rename to libs/revolution/src/dvd/dvd_broadway.c diff --git a/src/revolution/dvd/dvderror.c b/libs/revolution/src/dvd/dvderror.c similarity index 100% rename from src/revolution/dvd/dvderror.c rename to libs/revolution/src/dvd/dvderror.c diff --git a/src/revolution/dvd/dvdfs.c b/libs/revolution/src/dvd/dvdfs.c similarity index 100% rename from src/revolution/dvd/dvdfs.c rename to libs/revolution/src/dvd/dvdfs.c diff --git a/src/revolution/dvd/dvdidutils.c b/libs/revolution/src/dvd/dvdidutils.c similarity index 100% rename from src/revolution/dvd/dvdidutils.c rename to libs/revolution/src/dvd/dvdidutils.c diff --git a/src/revolution/dvd/dvdqueue.c b/libs/revolution/src/dvd/dvdqueue.c similarity index 100% rename from src/revolution/dvd/dvdqueue.c rename to libs/revolution/src/dvd/dvdqueue.c diff --git a/src/revolution/esp/esp.c b/libs/revolution/src/esp/esp.c similarity index 100% rename from src/revolution/esp/esp.c rename to libs/revolution/src/esp/esp.c diff --git a/src/revolution/euart/euart.c b/libs/revolution/src/euart/euart.c similarity index 100% rename from src/revolution/euart/euart.c rename to libs/revolution/src/euart/euart.c diff --git a/src/revolution/exi/EXIBios.c b/libs/revolution/src/exi/EXIBios.c similarity index 100% rename from src/revolution/exi/EXIBios.c rename to libs/revolution/src/exi/EXIBios.c diff --git a/src/revolution/exi/EXICommon.c b/libs/revolution/src/exi/EXICommon.c similarity index 100% rename from src/revolution/exi/EXICommon.c rename to libs/revolution/src/exi/EXICommon.c diff --git a/src/revolution/exi/EXIUart.c b/libs/revolution/src/exi/EXIUart.c similarity index 100% rename from src/revolution/exi/EXIUart.c rename to libs/revolution/src/exi/EXIUart.c diff --git a/src/revolution/fs/fs.c b/libs/revolution/src/fs/fs.c similarity index 100% rename from src/revolution/fs/fs.c rename to libs/revolution/src/fs/fs.c diff --git a/src/revolution/gd/GDBase.c b/libs/revolution/src/gd/GDBase.c similarity index 100% rename from src/revolution/gd/GDBase.c rename to libs/revolution/src/gd/GDBase.c diff --git a/src/revolution/gd/GDFile.c b/libs/revolution/src/gd/GDFile.c similarity index 100% rename from src/revolution/gd/GDFile.c rename to libs/revolution/src/gd/GDFile.c diff --git a/src/revolution/gd/GDGeometry.c b/libs/revolution/src/gd/GDGeometry.c similarity index 100% rename from src/revolution/gd/GDGeometry.c rename to libs/revolution/src/gd/GDGeometry.c diff --git a/src/revolution/gd/GDIndirect.c b/libs/revolution/src/gd/GDIndirect.c similarity index 100% rename from src/revolution/gd/GDIndirect.c rename to libs/revolution/src/gd/GDIndirect.c diff --git a/src/revolution/gd/GDLight.c b/libs/revolution/src/gd/GDLight.c similarity index 100% rename from src/revolution/gd/GDLight.c rename to libs/revolution/src/gd/GDLight.c diff --git a/src/revolution/gd/GDPixel.c b/libs/revolution/src/gd/GDPixel.c similarity index 100% rename from src/revolution/gd/GDPixel.c rename to libs/revolution/src/gd/GDPixel.c diff --git a/src/revolution/gd/GDTev.c b/libs/revolution/src/gd/GDTev.c similarity index 100% rename from src/revolution/gd/GDTev.c rename to libs/revolution/src/gd/GDTev.c diff --git a/src/revolution/gd/GDTexture.c b/libs/revolution/src/gd/GDTexture.c similarity index 100% rename from src/revolution/gd/GDTexture.c rename to libs/revolution/src/gd/GDTexture.c diff --git a/src/revolution/gd/GDTransform.c b/libs/revolution/src/gd/GDTransform.c similarity index 100% rename from src/revolution/gd/GDTransform.c rename to libs/revolution/src/gd/GDTransform.c diff --git a/src/revolution/gf/GFGeometry.cpp b/libs/revolution/src/gf/GFGeometry.cpp similarity index 100% rename from src/revolution/gf/GFGeometry.cpp rename to libs/revolution/src/gf/GFGeometry.cpp diff --git a/src/revolution/gf/GFLight.cpp b/libs/revolution/src/gf/GFLight.cpp similarity index 100% rename from src/revolution/gf/GFLight.cpp rename to libs/revolution/src/gf/GFLight.cpp diff --git a/src/revolution/gf/GFPixel.cpp b/libs/revolution/src/gf/GFPixel.cpp similarity index 100% rename from src/revolution/gf/GFPixel.cpp rename to libs/revolution/src/gf/GFPixel.cpp diff --git a/src/revolution/gf/GFTev.cpp b/libs/revolution/src/gf/GFTev.cpp similarity index 100% rename from src/revolution/gf/GFTev.cpp rename to libs/revolution/src/gf/GFTev.cpp diff --git a/src/revolution/gx/GXAttr.c b/libs/revolution/src/gx/GXAttr.c similarity index 100% rename from src/revolution/gx/GXAttr.c rename to libs/revolution/src/gx/GXAttr.c diff --git a/src/revolution/gx/GXBump.c b/libs/revolution/src/gx/GXBump.c similarity index 100% rename from src/revolution/gx/GXBump.c rename to libs/revolution/src/gx/GXBump.c diff --git a/src/revolution/gx/GXDisplayList.c b/libs/revolution/src/gx/GXDisplayList.c similarity index 100% rename from src/revolution/gx/GXDisplayList.c rename to libs/revolution/src/gx/GXDisplayList.c diff --git a/src/revolution/gx/GXDraw.c b/libs/revolution/src/gx/GXDraw.c similarity index 100% rename from src/revolution/gx/GXDraw.c rename to libs/revolution/src/gx/GXDraw.c diff --git a/src/revolution/gx/GXFifo.c b/libs/revolution/src/gx/GXFifo.c similarity index 100% rename from src/revolution/gx/GXFifo.c rename to libs/revolution/src/gx/GXFifo.c diff --git a/src/revolution/gx/GXFrameBuf.c b/libs/revolution/src/gx/GXFrameBuf.c similarity index 100% rename from src/revolution/gx/GXFrameBuf.c rename to libs/revolution/src/gx/GXFrameBuf.c diff --git a/src/revolution/gx/GXGeometry.c b/libs/revolution/src/gx/GXGeometry.c similarity index 100% rename from src/revolution/gx/GXGeometry.c rename to libs/revolution/src/gx/GXGeometry.c diff --git a/src/revolution/gx/GXInit.c b/libs/revolution/src/gx/GXInit.c similarity index 100% rename from src/revolution/gx/GXInit.c rename to libs/revolution/src/gx/GXInit.c diff --git a/src/revolution/gx/GXLight.c b/libs/revolution/src/gx/GXLight.c similarity index 100% rename from src/revolution/gx/GXLight.c rename to libs/revolution/src/gx/GXLight.c diff --git a/src/revolution/gx/GXMisc.c b/libs/revolution/src/gx/GXMisc.c similarity index 100% rename from src/revolution/gx/GXMisc.c rename to libs/revolution/src/gx/GXMisc.c diff --git a/src/revolution/gx/GXPerf.c b/libs/revolution/src/gx/GXPerf.c similarity index 100% rename from src/revolution/gx/GXPerf.c rename to libs/revolution/src/gx/GXPerf.c diff --git a/src/revolution/gx/GXPixel.c b/libs/revolution/src/gx/GXPixel.c similarity index 100% rename from src/revolution/gx/GXPixel.c rename to libs/revolution/src/gx/GXPixel.c diff --git a/src/revolution/gx/GXSave.c b/libs/revolution/src/gx/GXSave.c similarity index 100% rename from src/revolution/gx/GXSave.c rename to libs/revolution/src/gx/GXSave.c diff --git a/src/revolution/gx/GXStubs.c b/libs/revolution/src/gx/GXStubs.c similarity index 100% rename from src/revolution/gx/GXStubs.c rename to libs/revolution/src/gx/GXStubs.c diff --git a/src/revolution/gx/GXTev.c b/libs/revolution/src/gx/GXTev.c similarity index 100% rename from src/revolution/gx/GXTev.c rename to libs/revolution/src/gx/GXTev.c diff --git a/src/revolution/gx/GXTexture.c b/libs/revolution/src/gx/GXTexture.c similarity index 100% rename from src/revolution/gx/GXTexture.c rename to libs/revolution/src/gx/GXTexture.c diff --git a/src/revolution/gx/GXTransform.c b/libs/revolution/src/gx/GXTransform.c similarity index 100% rename from src/revolution/gx/GXTransform.c rename to libs/revolution/src/gx/GXTransform.c diff --git a/src/revolution/gx/GXVerifRAS.c b/libs/revolution/src/gx/GXVerifRAS.c similarity index 100% rename from src/revolution/gx/GXVerifRAS.c rename to libs/revolution/src/gx/GXVerifRAS.c diff --git a/src/revolution/gx/GXVerifXF.c b/libs/revolution/src/gx/GXVerifXF.c similarity index 100% rename from src/revolution/gx/GXVerifXF.c rename to libs/revolution/src/gx/GXVerifXF.c diff --git a/src/revolution/gx/GXVerify.c b/libs/revolution/src/gx/GXVerify.c similarity index 100% rename from src/revolution/gx/GXVerify.c rename to libs/revolution/src/gx/GXVerify.c diff --git a/src/revolution/gx/GXVert.c b/libs/revolution/src/gx/GXVert.c similarity index 100% rename from src/revolution/gx/GXVert.c rename to libs/revolution/src/gx/GXVert.c diff --git a/src/revolution/gx/__gx.h b/libs/revolution/src/gx/__gx.h similarity index 100% rename from src/revolution/gx/__gx.h rename to libs/revolution/src/gx/__gx.h diff --git a/src/revolution/hio2/hio2.c b/libs/revolution/src/hio2/hio2.c similarity index 100% rename from src/revolution/hio2/hio2.c rename to libs/revolution/src/hio2/hio2.c diff --git a/src/revolution/homebuttonLib/HBMAnmController.cpp b/libs/revolution/src/homebuttonLib/HBMAnmController.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMAnmController.cpp rename to libs/revolution/src/homebuttonLib/HBMAnmController.cpp diff --git a/src/revolution/homebuttonLib/HBMAnmController.h b/libs/revolution/src/homebuttonLib/HBMAnmController.h similarity index 100% rename from src/revolution/homebuttonLib/HBMAnmController.h rename to libs/revolution/src/homebuttonLib/HBMAnmController.h diff --git a/src/revolution/homebuttonLib/HBMBase.cpp b/libs/revolution/src/homebuttonLib/HBMBase.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMBase.cpp rename to libs/revolution/src/homebuttonLib/HBMBase.cpp diff --git a/src/revolution/homebuttonLib/HBMBase.h b/libs/revolution/src/homebuttonLib/HBMBase.h similarity index 100% rename from src/revolution/homebuttonLib/HBMBase.h rename to libs/revolution/src/homebuttonLib/HBMBase.h diff --git a/src/revolution/homebuttonLib/HBMCommon.h b/libs/revolution/src/homebuttonLib/HBMCommon.h similarity index 100% rename from src/revolution/homebuttonLib/HBMCommon.h rename to libs/revolution/src/homebuttonLib/HBMCommon.h diff --git a/src/revolution/homebuttonLib/HBMController.cpp b/libs/revolution/src/homebuttonLib/HBMController.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMController.cpp rename to libs/revolution/src/homebuttonLib/HBMController.cpp diff --git a/src/revolution/homebuttonLib/HBMController.h b/libs/revolution/src/homebuttonLib/HBMController.h similarity index 100% rename from src/revolution/homebuttonLib/HBMController.h rename to libs/revolution/src/homebuttonLib/HBMController.h diff --git a/src/revolution/homebuttonLib/HBMFrameController.cpp b/libs/revolution/src/homebuttonLib/HBMFrameController.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMFrameController.cpp rename to libs/revolution/src/homebuttonLib/HBMFrameController.cpp diff --git a/src/revolution/homebuttonLib/HBMFrameController.h b/libs/revolution/src/homebuttonLib/HBMFrameController.h similarity index 100% rename from src/revolution/homebuttonLib/HBMFrameController.h rename to libs/revolution/src/homebuttonLib/HBMFrameController.h diff --git a/src/revolution/homebuttonLib/HBMGUIManager.cpp b/libs/revolution/src/homebuttonLib/HBMGUIManager.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMGUIManager.cpp rename to libs/revolution/src/homebuttonLib/HBMGUIManager.cpp diff --git a/src/revolution/homebuttonLib/HBMGUIManager.h b/libs/revolution/src/homebuttonLib/HBMGUIManager.h similarity index 100% rename from src/revolution/homebuttonLib/HBMGUIManager.h rename to libs/revolution/src/homebuttonLib/HBMGUIManager.h diff --git a/src/revolution/homebuttonLib/HBMRemoteSpk.cpp b/libs/revolution/src/homebuttonLib/HBMRemoteSpk.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMRemoteSpk.cpp rename to libs/revolution/src/homebuttonLib/HBMRemoteSpk.cpp diff --git a/src/revolution/homebuttonLib/HBMRemoteSpk.h b/libs/revolution/src/homebuttonLib/HBMRemoteSpk.h similarity index 100% rename from src/revolution/homebuttonLib/HBMRemoteSpk.h rename to libs/revolution/src/homebuttonLib/HBMRemoteSpk.h diff --git a/src/revolution/homebuttonLib/nw4hbm/db/DbgPrintBase.h b/libs/revolution/src/homebuttonLib/nw4hbm/db/DbgPrintBase.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/DbgPrintBase.h rename to libs/revolution/src/homebuttonLib/nw4hbm/db/DbgPrintBase.h diff --git a/src/revolution/homebuttonLib/nw4hbm/db/assert.h b/libs/revolution/src/homebuttonLib/nw4hbm/db/assert.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/assert.h rename to libs/revolution/src/homebuttonLib/nw4hbm/db/assert.h diff --git a/src/revolution/homebuttonLib/nw4hbm/db/console.h b/libs/revolution/src/homebuttonLib/nw4hbm/db/console.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/console.h rename to libs/revolution/src/homebuttonLib/nw4hbm/db/console.h diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_DbgPrintBase.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/db/db_DbgPrintBase.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/db_DbgPrintBase.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/db/db_DbgPrintBase.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_assert.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/db/db_assert.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/db_assert.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/db/db_assert.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_console.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/db/db_console.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/db_console.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/db/db_console.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/db/db_directPrint.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/db/db_directPrint.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_mapFile.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/db/db_mapFile.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/db_mapFile.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/db/db_mapFile.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/db/directPrint.h b/libs/revolution/src/homebuttonLib/nw4hbm/db/directPrint.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/directPrint.h rename to libs/revolution/src/homebuttonLib/nw4hbm/db/directPrint.h diff --git a/src/revolution/homebuttonLib/nw4hbm/db/mapFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/db/mapFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/mapFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/db/mapFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/animation.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/animation.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/animation.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/animation.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/arcResourceAccessor.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/arcResourceAccessor.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/arcResourceAccessor.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/arcResourceAccessor.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/bounding.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/bounding.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/bounding.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/bounding.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/common.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/common.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/common.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/common.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/drawInfo.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/drawInfo.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/drawInfo.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/drawInfo.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/group.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/group.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/group.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/group.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/layout.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/layout.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/layout.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/layout.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_bounding.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_bounding.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_bounding.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_bounding.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_common.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_common.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_group.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_group.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_material.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_material.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_resourceAccessor.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_resourceAccessor.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_resourceAccessor.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_resourceAccessor.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_types.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_types.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_types.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_types.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_window.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_window.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/material.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/material.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/material.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/material.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/pane.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/pane.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/pane.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/pane.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/picture.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/picture.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/picture.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/picture.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/resourceAccessor.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/resourceAccessor.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/resourceAccessor.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/resourceAccessor.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/resources.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/resources.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/resources.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/resources.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/textBox.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/textBox.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/textBox.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/textBox.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/window.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/window.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/window.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/window.h diff --git a/src/revolution/homebuttonLib/nw4hbm/macros.h b/libs/revolution/src/homebuttonLib/nw4hbm/macros.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/macros.h rename to libs/revolution/src/homebuttonLib/nw4hbm/macros.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/arithmetic.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/arithmetic.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/constants.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/constants.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/constants.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/constants.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/equation.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/equation.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/equation.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/equation.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/geometry.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/geometry.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/geometry.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/geometry.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/math_triangular.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/math/math_triangular.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/math_triangular.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/math/math_triangular.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/triangular.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/triangular.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/triangular.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/types.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/types.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/types.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/types.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/AxManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/AxManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/AxManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/AxManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/AxVoice.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/AxVoice.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Bank.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/Bank.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/Bank.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/Bank.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/BankFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/BankFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/BankFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/BankFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/BasicPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/BasicPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/BasicPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/BasicPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/BasicSound.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/BasicSound.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/BasicSound.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/BasicSound.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/Channel.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/Channel.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/Channel.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/ChannelManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/ChannelManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/ChannelManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/ChannelManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/DisposeCallback.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/DisposeCallback.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/DisposeCallback.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/DisposeCallback.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/DisposeCallbackManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/DisposeCallbackManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/DisposeCallbackManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/DisposeCallbackManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/DvdSoundArchive.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/DvdSoundArchive.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/DvdSoundArchive.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/DvdSoundArchive.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/EnvGenerator.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/EnvGenerator.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/EnvGenerator.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/EnvGenerator.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/ExternalSoundPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/ExternalSoundPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/ExternalSoundPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/ExternalSoundPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/FrameHeap.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/FrameHeap.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/FrameHeap.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/FrameHeap.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/FxBase.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/FxBase.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/FxBase.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/FxBase.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/InstanceManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/InstanceManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/InstanceManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/InstanceManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/InstancePool.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/InstancePool.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Lfo.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/Lfo.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/Lfo.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/Lfo.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MemorySoundArchive.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MemorySoundArchive.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MemorySoundArchive.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MemorySoundArchive.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MidiSeqPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MidiSeqPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MidiSeqPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MidiSeqPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MidiSeqTrack.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MidiSeqTrack.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MidiSeqTrack.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MidiSeqTrack.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MmlParser.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlParser.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MmlParser.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlParser.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MmlSeqTrack.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlSeqTrack.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MmlSeqTrack.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlSeqTrack.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MmlSeqTrackAllocator.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlSeqTrackAllocator.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MmlSeqTrackAllocator.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlSeqTrackAllocator.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MoveValue.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MoveValue.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MoveValue.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MoveValue.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/NandSoundArchive.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/NandSoundArchive.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/NandSoundArchive.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/NandSoundArchive.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/NoteOnCallback.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/NoteOnCallback.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/NoteOnCallback.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/NoteOnCallback.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/PlayerHeap.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/PlayerHeap.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/PlayerHeap.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/PlayerHeap.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/RemoteSpeaker.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/RemoteSpeaker.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/RemoteSpeaker.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/RemoteSpeaker.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/RemoteSpeakerManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/RemoteSpeakerManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/RemoteSpeakerManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/RemoteSpeakerManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqSound.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqSound.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqSound.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqSound.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqSoundHandle.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqSoundHandle.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqSoundHandle.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqSoundHandle.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqTrack.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqTrack.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqTrack.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqTrack.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqTrackAllocator.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqTrackAllocator.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqTrackAllocator.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqTrackAllocator.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundArchive.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchive.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundArchive.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchive.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundArchiveFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchiveFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundArchiveFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchiveFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundArchiveLoader.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchiveLoader.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundArchiveLoader.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchiveLoader.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundArchivePlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchivePlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundArchivePlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchivePlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundHandle.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundHandle.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundHandle.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundHandle.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundHeap.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundHeap.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundHeap.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundHeap.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundMemoryAllocatable.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundMemoryAllocatable.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundMemoryAllocatable.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundMemoryAllocatable.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundStartable.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundStartable.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundStartable.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundStartable.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundSystem.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundSystem.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundSystem.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundSystem.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundThread.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundThread.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundThread.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundThread.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/StrmChannel.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmChannel.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/StrmChannel.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmChannel.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/StrmFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/StrmFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/StrmPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/StrmPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/StrmSound.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmSound.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/StrmSound.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmSound.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/StrmSoundHandle.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmSoundHandle.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/StrmSoundHandle.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmSoundHandle.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Task.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/Task.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/Task.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/Task.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/TaskManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/TaskManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/TaskManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/TaskManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/TaskThread.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/TaskThread.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/TaskThread.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/TaskThread.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Util.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/Util.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/Util.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/Util.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WaveFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WaveFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WavePlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WavePlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WavePlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WavePlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WaveSound.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveSound.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WaveSound.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveSound.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WaveSoundHandle.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveSoundHandle.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WaveSoundHandle.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveSoundHandle.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WsdFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WsdFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WsdPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WsdPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WsdTrack.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdTrack.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WsdTrack.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdTrack.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/debug.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/debug.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/debug.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/debug.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundArchivePlayer.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundArchivePlayer.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundArchivePlayer.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundArchivePlayer.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundHandle.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundHandle.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundHandle.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundHandle.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundPlayer.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundPlayer.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundPlayer.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundPlayer.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundStartable.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundStartable.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundStartable.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundStartable.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_global.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_global.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_global.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_global.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_types.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_types.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_types.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_types.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/CharStrmReader.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/CharStrmReader.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/CharStrmReader.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/CharStrmReader.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/CharWriter.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/CharWriter.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/CharWriter.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/CharWriter.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/Color.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/Color.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/Color.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/Color.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/DvdFileStream.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/DvdFileStream.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/DvdFileStream.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/DvdFileStream.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/DvdLockedFileStream.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/DvdLockedFileStream.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/DvdLockedFileStream.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/DvdLockedFileStream.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/FileStream.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/FileStream.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/FileStream.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/FileStream.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/Font.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/Font.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/Font.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/Font.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/IOStream.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/IOStream.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/IOStream.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/IOStream.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/LinkList.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/LinkList.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/Lock.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/Lock.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/Lock.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/Lock.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/NandFileStream.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/NandFileStream.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/NandFileStream.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/NandFileStream.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/Rect.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/Rect.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/Rect.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/Rect.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ResFont.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ResFont.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ResFont.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ResFont.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/RuntimeTypeInfo.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/RuntimeTypeInfo.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/RuntimeTypeInfo.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/RuntimeTypeInfo.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TagProcessor.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/TagProcessor.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/TagProcessor.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/TagProcessor.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TagProcessorBase.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/TagProcessorBase.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/TagProcessorBase.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/TagProcessorBase.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriter.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/TextWriter.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/TextWriter.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/TextWriter.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/TextWriterBase.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/TextWriterBase.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/WideTagProcessor.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/WideTagProcessor.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/WideTagProcessor.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/WideTagProcessor.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/WideTextWriter.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/WideTextWriter.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/WideTextWriter.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/WideTextWriter.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/binaryFileFormat.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/binaryFileFormat.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/binaryFileFormat.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/binaryFileFormat.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/fontResources.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/fontResources.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/fontResources.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/fontResources.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/inlines.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/inlines.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/inlines.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/inlines.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/list.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/list.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/list.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/list.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_CharStrmReader.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_CharStrmReader.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_CharStrmReader.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_CharStrmReader.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_CharWriter.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_CharWriter.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_CharWriter.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_CharWriter.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_DvdFileStream.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_DvdFileStream.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_DvdFileStream.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_DvdFileStream.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_FileStream.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_FileStream.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_FileStream.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_FileStream.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_Font.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_Font.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_Font.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_Font.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_IOStream.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_IOStream.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_IOStream.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_IOStream.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_LinkList.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_LinkList.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_LinkList.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_LinkList.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_NandFileStream.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_NandFileStream.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_NandFileStream.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_NandFileStream.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_ResFont.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_ResFont.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_ResFont.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_ResFont.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_binaryFileFormat.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_binaryFileFormat.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_binaryFileFormat.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_binaryFileFormat.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_list.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_list.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_list.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_list.cpp diff --git a/src/revolution/homebuttonLib/sound/mix.cpp b/libs/revolution/src/homebuttonLib/sound/mix.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/mix.cpp rename to libs/revolution/src/homebuttonLib/sound/mix.cpp diff --git a/src/revolution/homebuttonLib/sound/mix.h b/libs/revolution/src/homebuttonLib/sound/mix.h similarity index 100% rename from src/revolution/homebuttonLib/sound/mix.h rename to libs/revolution/src/homebuttonLib/sound/mix.h diff --git a/src/revolution/homebuttonLib/sound/seq.cpp b/libs/revolution/src/homebuttonLib/sound/seq.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/seq.cpp rename to libs/revolution/src/homebuttonLib/sound/seq.cpp diff --git a/src/revolution/homebuttonLib/sound/seq.h b/libs/revolution/src/homebuttonLib/sound/seq.h similarity index 100% rename from src/revolution/homebuttonLib/sound/seq.h rename to libs/revolution/src/homebuttonLib/sound/seq.h diff --git a/src/revolution/homebuttonLib/sound/syn.cpp b/libs/revolution/src/homebuttonLib/sound/syn.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/syn.cpp rename to libs/revolution/src/homebuttonLib/sound/syn.cpp diff --git a/src/revolution/homebuttonLib/sound/syn.h b/libs/revolution/src/homebuttonLib/sound/syn.h similarity index 100% rename from src/revolution/homebuttonLib/sound/syn.h rename to libs/revolution/src/homebuttonLib/sound/syn.h diff --git a/src/revolution/homebuttonLib/sound/synctrl.cpp b/libs/revolution/src/homebuttonLib/sound/synctrl.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synctrl.cpp rename to libs/revolution/src/homebuttonLib/sound/synctrl.cpp diff --git a/src/revolution/homebuttonLib/sound/synenv.cpp b/libs/revolution/src/homebuttonLib/sound/synenv.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synenv.cpp rename to libs/revolution/src/homebuttonLib/sound/synenv.cpp diff --git a/src/revolution/homebuttonLib/sound/synmix.cpp b/libs/revolution/src/homebuttonLib/sound/synmix.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synmix.cpp rename to libs/revolution/src/homebuttonLib/sound/synmix.cpp diff --git a/src/revolution/homebuttonLib/sound/synpitch.cpp b/libs/revolution/src/homebuttonLib/sound/synpitch.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synpitch.cpp rename to libs/revolution/src/homebuttonLib/sound/synpitch.cpp diff --git a/src/revolution/homebuttonLib/sound/synprivate.h b/libs/revolution/src/homebuttonLib/sound/synprivate.h similarity index 100% rename from src/revolution/homebuttonLib/sound/synprivate.h rename to libs/revolution/src/homebuttonLib/sound/synprivate.h diff --git a/src/revolution/homebuttonLib/sound/synsample.cpp b/libs/revolution/src/homebuttonLib/sound/synsample.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synsample.cpp rename to libs/revolution/src/homebuttonLib/sound/synsample.cpp diff --git a/src/revolution/homebuttonLib/sound/synvoice.cpp b/libs/revolution/src/homebuttonLib/sound/synvoice.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synvoice.cpp rename to libs/revolution/src/homebuttonLib/sound/synvoice.cpp diff --git a/src/revolution/ipc/ipcMain.c b/libs/revolution/src/ipc/ipcMain.c similarity index 100% rename from src/revolution/ipc/ipcMain.c rename to libs/revolution/src/ipc/ipcMain.c diff --git a/src/revolution/ipc/ipcProfile.c b/libs/revolution/src/ipc/ipcProfile.c similarity index 100% rename from src/revolution/ipc/ipcProfile.c rename to libs/revolution/src/ipc/ipcProfile.c diff --git a/src/revolution/ipc/ipcclt.c b/libs/revolution/src/ipc/ipcclt.c similarity index 100% rename from src/revolution/ipc/ipcclt.c rename to libs/revolution/src/ipc/ipcclt.c diff --git a/src/revolution/ipc/memory.c b/libs/revolution/src/ipc/memory.c similarity index 100% rename from src/revolution/ipc/memory.c rename to libs/revolution/src/ipc/memory.c diff --git a/src/revolution/kpad/KPAD.c b/libs/revolution/src/kpad/KPAD.c similarity index 99% rename from src/revolution/kpad/KPAD.c rename to libs/revolution/src/kpad/KPAD.c index 672a62cfa0..01cf8854d1 100644 --- a/src/revolution/kpad/KPAD.c +++ b/libs/revolution/src/kpad/KPAD.c @@ -1,5 +1,4 @@ #include -#include #include #include "types.h" @@ -7,6 +6,8 @@ #include #include +#include "__kpad.h" + static const char* __KPADVersion = "<< RVL_SDK - KPAD \trelease build: Oct 4 2006 11:56:50 (0x4199_60726) >>"; static Vec2 icenter_org = {0.000f, 0.000f}; diff --git a/src/revolution/kpad/__kpad.h b/libs/revolution/src/kpad/__kpad.h similarity index 100% rename from src/revolution/kpad/__kpad.h rename to libs/revolution/src/kpad/__kpad.h diff --git a/src/revolution/mem/mem_allocator.c b/libs/revolution/src/mem/mem_allocator.c similarity index 100% rename from src/revolution/mem/mem_allocator.c rename to libs/revolution/src/mem/mem_allocator.c diff --git a/src/revolution/mem/mem_expHeap.c b/libs/revolution/src/mem/mem_expHeap.c similarity index 100% rename from src/revolution/mem/mem_expHeap.c rename to libs/revolution/src/mem/mem_expHeap.c diff --git a/src/revolution/mem/mem_heapCommon.c b/libs/revolution/src/mem/mem_heapCommon.c similarity index 100% rename from src/revolution/mem/mem_heapCommon.c rename to libs/revolution/src/mem/mem_heapCommon.c diff --git a/src/revolution/mem/mem_list.c b/libs/revolution/src/mem/mem_list.c similarity index 100% rename from src/revolution/mem/mem_list.c rename to libs/revolution/src/mem/mem_list.c diff --git a/src/revolution/mtx/mtx.c b/libs/revolution/src/mtx/mtx.c similarity index 100% rename from src/revolution/mtx/mtx.c rename to libs/revolution/src/mtx/mtx.c diff --git a/src/revolution/mtx/mtx44.c b/libs/revolution/src/mtx/mtx44.c similarity index 100% rename from src/revolution/mtx/mtx44.c rename to libs/revolution/src/mtx/mtx44.c diff --git a/src/revolution/mtx/mtx44vec.c b/libs/revolution/src/mtx/mtx44vec.c similarity index 100% rename from src/revolution/mtx/mtx44vec.c rename to libs/revolution/src/mtx/mtx44vec.c diff --git a/src/revolution/mtx/mtxstack.c b/libs/revolution/src/mtx/mtxstack.c similarity index 100% rename from src/revolution/mtx/mtxstack.c rename to libs/revolution/src/mtx/mtxstack.c diff --git a/src/revolution/mtx/mtxvec.c b/libs/revolution/src/mtx/mtxvec.c similarity index 100% rename from src/revolution/mtx/mtxvec.c rename to libs/revolution/src/mtx/mtxvec.c diff --git a/src/revolution/mtx/psmtx.c b/libs/revolution/src/mtx/psmtx.c similarity index 100% rename from src/revolution/mtx/psmtx.c rename to libs/revolution/src/mtx/psmtx.c diff --git a/src/revolution/mtx/quat.c b/libs/revolution/src/mtx/quat.c similarity index 100% rename from src/revolution/mtx/quat.c rename to libs/revolution/src/mtx/quat.c diff --git a/src/revolution/mtx/vec.c b/libs/revolution/src/mtx/vec.c similarity index 100% rename from src/revolution/mtx/vec.c rename to libs/revolution/src/mtx/vec.c diff --git a/src/revolution/nand/NANDCheck.c b/libs/revolution/src/nand/NANDCheck.c similarity index 100% rename from src/revolution/nand/NANDCheck.c rename to libs/revolution/src/nand/NANDCheck.c diff --git a/src/revolution/nand/NANDCore.c b/libs/revolution/src/nand/NANDCore.c similarity index 100% rename from src/revolution/nand/NANDCore.c rename to libs/revolution/src/nand/NANDCore.c diff --git a/src/revolution/nand/NANDErrorMessage.c b/libs/revolution/src/nand/NANDErrorMessage.c similarity index 100% rename from src/revolution/nand/NANDErrorMessage.c rename to libs/revolution/src/nand/NANDErrorMessage.c diff --git a/src/revolution/nand/NANDLogging.c b/libs/revolution/src/nand/NANDLogging.c similarity index 100% rename from src/revolution/nand/NANDLogging.c rename to libs/revolution/src/nand/NANDLogging.c diff --git a/src/revolution/nand/NANDOpenClose.c b/libs/revolution/src/nand/NANDOpenClose.c similarity index 100% rename from src/revolution/nand/NANDOpenClose.c rename to libs/revolution/src/nand/NANDOpenClose.c diff --git a/src/revolution/nand/nand.c b/libs/revolution/src/nand/nand.c similarity index 100% rename from src/revolution/nand/nand.c rename to libs/revolution/src/nand/nand.c diff --git a/src/revolution/os/OS.c b/libs/revolution/src/os/OS.c similarity index 100% rename from src/revolution/os/OS.c rename to libs/revolution/src/os/OS.c diff --git a/src/revolution/os/OSAddress.c b/libs/revolution/src/os/OSAddress.c similarity index 100% rename from src/revolution/os/OSAddress.c rename to libs/revolution/src/os/OSAddress.c diff --git a/src/revolution/os/OSAlarm.c b/libs/revolution/src/os/OSAlarm.c similarity index 100% rename from src/revolution/os/OSAlarm.c rename to libs/revolution/src/os/OSAlarm.c diff --git a/src/revolution/os/OSAlloc.c b/libs/revolution/src/os/OSAlloc.c similarity index 100% rename from src/revolution/os/OSAlloc.c rename to libs/revolution/src/os/OSAlloc.c diff --git a/src/revolution/os/OSArena.c b/libs/revolution/src/os/OSArena.c similarity index 100% rename from src/revolution/os/OSArena.c rename to libs/revolution/src/os/OSArena.c diff --git a/src/revolution/os/OSAudioSystem.c b/libs/revolution/src/os/OSAudioSystem.c similarity index 100% rename from src/revolution/os/OSAudioSystem.c rename to libs/revolution/src/os/OSAudioSystem.c diff --git a/src/revolution/os/OSCache.c b/libs/revolution/src/os/OSCache.c similarity index 100% rename from src/revolution/os/OSCache.c rename to libs/revolution/src/os/OSCache.c diff --git a/src/revolution/os/OSContext.c b/libs/revolution/src/os/OSContext.c similarity index 100% rename from src/revolution/os/OSContext.c rename to libs/revolution/src/os/OSContext.c diff --git a/src/revolution/os/OSError.c b/libs/revolution/src/os/OSError.c similarity index 100% rename from src/revolution/os/OSError.c rename to libs/revolution/src/os/OSError.c diff --git a/src/revolution/os/OSExec.c b/libs/revolution/src/os/OSExec.c similarity index 100% rename from src/revolution/os/OSExec.c rename to libs/revolution/src/os/OSExec.c diff --git a/src/revolution/os/OSFatal.c b/libs/revolution/src/os/OSFatal.c similarity index 100% rename from src/revolution/os/OSFatal.c rename to libs/revolution/src/os/OSFatal.c diff --git a/src/revolution/os/OSFont.c b/libs/revolution/src/os/OSFont.c similarity index 100% rename from src/revolution/os/OSFont.c rename to libs/revolution/src/os/OSFont.c diff --git a/src/revolution/os/OSInterrupt.c b/libs/revolution/src/os/OSInterrupt.c similarity index 100% rename from src/revolution/os/OSInterrupt.c rename to libs/revolution/src/os/OSInterrupt.c diff --git a/src/revolution/os/OSIpc.c b/libs/revolution/src/os/OSIpc.c similarity index 100% rename from src/revolution/os/OSIpc.c rename to libs/revolution/src/os/OSIpc.c diff --git a/src/revolution/os/OSLaunch.c b/libs/revolution/src/os/OSLaunch.c similarity index 100% rename from src/revolution/os/OSLaunch.c rename to libs/revolution/src/os/OSLaunch.c diff --git a/src/revolution/os/OSLink.c b/libs/revolution/src/os/OSLink.c similarity index 100% rename from src/revolution/os/OSLink.c rename to libs/revolution/src/os/OSLink.c diff --git a/src/revolution/os/OSMemory.c b/libs/revolution/src/os/OSMemory.c similarity index 100% rename from src/revolution/os/OSMemory.c rename to libs/revolution/src/os/OSMemory.c diff --git a/src/revolution/os/OSMessage.c b/libs/revolution/src/os/OSMessage.c similarity index 100% rename from src/revolution/os/OSMessage.c rename to libs/revolution/src/os/OSMessage.c diff --git a/src/revolution/os/OSMutex.c b/libs/revolution/src/os/OSMutex.c similarity index 100% rename from src/revolution/os/OSMutex.c rename to libs/revolution/src/os/OSMutex.c diff --git a/src/revolution/os/OSNandbootInfo.c b/libs/revolution/src/os/OSNandbootInfo.c similarity index 100% rename from src/revolution/os/OSNandbootInfo.c rename to libs/revolution/src/os/OSNandbootInfo.c diff --git a/src/revolution/os/OSNet.c b/libs/revolution/src/os/OSNet.c similarity index 100% rename from src/revolution/os/OSNet.c rename to libs/revolution/src/os/OSNet.c diff --git a/src/revolution/os/OSPlayRecord.c b/libs/revolution/src/os/OSPlayRecord.c similarity index 100% rename from src/revolution/os/OSPlayRecord.c rename to libs/revolution/src/os/OSPlayRecord.c diff --git a/src/revolution/os/OSPlayTime.c b/libs/revolution/src/os/OSPlayTime.c similarity index 100% rename from src/revolution/os/OSPlayTime.c rename to libs/revolution/src/os/OSPlayTime.c diff --git a/src/revolution/os/OSReboot.c b/libs/revolution/src/os/OSReboot.c similarity index 100% rename from src/revolution/os/OSReboot.c rename to libs/revolution/src/os/OSReboot.c diff --git a/src/revolution/os/OSReset.c b/libs/revolution/src/os/OSReset.c similarity index 100% rename from src/revolution/os/OSReset.c rename to libs/revolution/src/os/OSReset.c diff --git a/src/revolution/os/OSRtc.c b/libs/revolution/src/os/OSRtc.c similarity index 100% rename from src/revolution/os/OSRtc.c rename to libs/revolution/src/os/OSRtc.c diff --git a/src/revolution/os/OSStateFlags.c b/libs/revolution/src/os/OSStateFlags.c similarity index 100% rename from src/revolution/os/OSStateFlags.c rename to libs/revolution/src/os/OSStateFlags.c diff --git a/src/revolution/os/OSStateTM.c b/libs/revolution/src/os/OSStateTM.c similarity index 100% rename from src/revolution/os/OSStateTM.c rename to libs/revolution/src/os/OSStateTM.c diff --git a/src/revolution/os/OSStopwatch.c b/libs/revolution/src/os/OSStopwatch.c similarity index 100% rename from src/revolution/os/OSStopwatch.c rename to libs/revolution/src/os/OSStopwatch.c diff --git a/src/revolution/os/OSSync.c b/libs/revolution/src/os/OSSync.c similarity index 100% rename from src/revolution/os/OSSync.c rename to libs/revolution/src/os/OSSync.c diff --git a/src/revolution/os/OSThread.c b/libs/revolution/src/os/OSThread.c similarity index 100% rename from src/revolution/os/OSThread.c rename to libs/revolution/src/os/OSThread.c diff --git a/src/revolution/os/OSTime.c b/libs/revolution/src/os/OSTime.c similarity index 100% rename from src/revolution/os/OSTime.c rename to libs/revolution/src/os/OSTime.c diff --git a/src/revolution/os/OSUtf.c b/libs/revolution/src/os/OSUtf.c similarity index 100% rename from src/revolution/os/OSUtf.c rename to libs/revolution/src/os/OSUtf.c diff --git a/src/revolution/os/__os.h b/libs/revolution/src/os/__os.h similarity index 100% rename from src/revolution/os/__os.h rename to libs/revolution/src/os/__os.h diff --git a/src/revolution/os/__ppc_eabi_init.cpp b/libs/revolution/src/os/__ppc_eabi_init.cpp similarity index 100% rename from src/revolution/os/__ppc_eabi_init.cpp rename to libs/revolution/src/os/__ppc_eabi_init.cpp diff --git a/src/revolution/os/__start.c b/libs/revolution/src/os/__start.c similarity index 100% rename from src/revolution/os/__start.c rename to libs/revolution/src/os/__start.c diff --git a/src/revolution/pad/Pad.c b/libs/revolution/src/pad/Pad.c similarity index 99% rename from src/revolution/pad/Pad.c rename to libs/revolution/src/pad/Pad.c index 1dcc38c52b..b20da7bb14 100644 --- a/src/revolution/pad/Pad.c +++ b/libs/revolution/src/pad/Pad.c @@ -5,7 +5,7 @@ #include #include "__si.h" -#include "revolution/vi/__vi.h" +#include "__vi.h" #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b)) diff --git a/src/revolution/pad/Padclamp.c b/libs/revolution/src/pad/Padclamp.c similarity index 100% rename from src/revolution/pad/Padclamp.c rename to libs/revolution/src/pad/Padclamp.c diff --git a/src/revolution/sc/scapi.c b/libs/revolution/src/sc/scapi.c similarity index 100% rename from src/revolution/sc/scapi.c rename to libs/revolution/src/sc/scapi.c diff --git a/src/revolution/sc/scapi_prdinfo.c b/libs/revolution/src/sc/scapi_prdinfo.c similarity index 100% rename from src/revolution/sc/scapi_prdinfo.c rename to libs/revolution/src/sc/scapi_prdinfo.c diff --git a/src/revolution/sc/scsystem.c b/libs/revolution/src/sc/scsystem.c similarity index 100% rename from src/revolution/sc/scsystem.c rename to libs/revolution/src/sc/scsystem.c diff --git a/src/revolution/si/SIBios.c b/libs/revolution/src/si/SIBios.c similarity index 100% rename from src/revolution/si/SIBios.c rename to libs/revolution/src/si/SIBios.c diff --git a/src/revolution/si/SISamplingRate.c b/libs/revolution/src/si/SISamplingRate.c similarity index 100% rename from src/revolution/si/SISamplingRate.c rename to libs/revolution/src/si/SISamplingRate.c diff --git a/src/revolution/si/__si.h b/libs/revolution/src/si/__si.h similarity index 100% rename from src/revolution/si/__si.h rename to libs/revolution/src/si/__si.h diff --git a/src/revolution/tpl/TPL.c b/libs/revolution/src/tpl/TPL.c similarity index 100% rename from src/revolution/tpl/TPL.c rename to libs/revolution/src/tpl/TPL.c diff --git a/src/revolution/usb/__usb.h b/libs/revolution/src/usb/__usb.h similarity index 100% rename from src/revolution/usb/__usb.h rename to libs/revolution/src/usb/__usb.h diff --git a/src/revolution/usb/usb.c b/libs/revolution/src/usb/usb.c similarity index 99% rename from src/revolution/usb/usb.c rename to libs/revolution/src/usb/usb.c index 822171d510..4f25d1aaf2 100644 --- a/src/revolution/usb/usb.c +++ b/libs/revolution/src/usb/usb.c @@ -1,5 +1,4 @@ #include -#include #include #include @@ -10,6 +9,8 @@ #include #include +#include "__usb.h" + #if SDK_AUG2010 #define IPC_ARENA_SIZE 0x4000 #else diff --git a/src/revolution/vi/__vi.h b/libs/revolution/src/vi/__vi.h similarity index 100% rename from src/revolution/vi/__vi.h rename to libs/revolution/src/vi/__vi.h diff --git a/src/revolution/vi/i2c.c b/libs/revolution/src/vi/i2c.c similarity index 100% rename from src/revolution/vi/i2c.c rename to libs/revolution/src/vi/i2c.c diff --git a/src/revolution/vi/vi.c b/libs/revolution/src/vi/vi.c similarity index 100% rename from src/revolution/vi/vi.c rename to libs/revolution/src/vi/vi.c diff --git a/src/revolution/vi/vi3in1.c b/libs/revolution/src/vi/vi3in1.c similarity index 100% rename from src/revolution/vi/vi3in1.c rename to libs/revolution/src/vi/vi3in1.c diff --git a/src/revolution/wenc/wenc.c b/libs/revolution/src/wenc/wenc.c similarity index 100% rename from src/revolution/wenc/wenc.c rename to libs/revolution/src/wenc/wenc.c diff --git a/src/revolution/wpad/WPAD.c b/libs/revolution/src/wpad/WPAD.c similarity index 99% rename from src/revolution/wpad/WPAD.c rename to libs/revolution/src/wpad/WPAD.c index 31a40e1ab8..20e7509da3 100644 --- a/src/revolution/wpad/WPAD.c +++ b/libs/revolution/src/wpad/WPAD.c @@ -1,15 +1,16 @@ #include -#include #include #include #include #include #include -#include #include #include +#include "__wpad.h" +#include "__wud.h" + extern volatile BOOL __OSIsReturnToIdle; //TODO: this apparently should be aligned to 32 bytes, but diff --git a/src/revolution/wpad/WPADEncrypt.c b/libs/revolution/src/wpad/WPADEncrypt.c similarity index 99% rename from src/revolution/wpad/WPADEncrypt.c rename to libs/revolution/src/wpad/WPADEncrypt.c index 9852cc6162..d910e80636 100644 --- a/src/revolution/wpad/WPADEncrypt.c +++ b/libs/revolution/src/wpad/WPADEncrypt.c @@ -1,4 +1,4 @@ -#include +#include "__wpad.h" #include "cstring" diff --git a/src/revolution/wpad/WPADHIDParser.c b/libs/revolution/src/wpad/WPADHIDParser.c similarity index 99% rename from src/revolution/wpad/WPADHIDParser.c rename to libs/revolution/src/wpad/WPADHIDParser.c index 4b8b774b7c..b7d1339c48 100644 --- a/src/revolution/wpad/WPADHIDParser.c +++ b/libs/revolution/src/wpad/WPADHIDParser.c @@ -1,7 +1,8 @@ #include -#include #include +#include "__wpad.h" + extern void DEBUGPrint(const char*, ...); void __a1_20_status_report(u8 chan, u8* data); diff --git a/src/revolution/wpad/WPADMem.c b/libs/revolution/src/wpad/WPADMem.c similarity index 57% rename from src/revolution/wpad/WPADMem.c rename to libs/revolution/src/wpad/WPADMem.c index efbcc8b9e5..906cc50a05 100644 --- a/src/revolution/wpad/WPADMem.c +++ b/libs/revolution/src/wpad/WPADMem.c @@ -1,3 +1,3 @@ -#include +#include "__wpad.h" WPADMEMControlBlock _wmb[WPAD_MAX_CONTROLLERS]; diff --git a/src/revolution/wpad/__wpad.h b/libs/revolution/src/wpad/__wpad.h similarity index 100% rename from src/revolution/wpad/__wpad.h rename to libs/revolution/src/wpad/__wpad.h diff --git a/src/revolution/wpad/wpad_debug_msg.c b/libs/revolution/src/wpad/wpad_debug_msg.c similarity index 63% rename from src/revolution/wpad/wpad_debug_msg.c rename to libs/revolution/src/wpad/wpad_debug_msg.c index 2713ba81c9..ae5f498226 100644 --- a/src/revolution/wpad/wpad_debug_msg.c +++ b/libs/revolution/src/wpad/wpad_debug_msg.c @@ -1,4 +1,4 @@ -#include +#include "__wpad.h" void DEBUGPrint(const char* fmt, ...) { // NONMATCHING diff --git a/src/revolution/wud/WUD.c b/libs/revolution/src/wud/WUD.c similarity index 99% rename from src/revolution/wud/WUD.c rename to libs/revolution/src/wud/WUD.c index b6f7073699..72a2c9b60b 100644 --- a/src/revolution/wud/WUD.c +++ b/libs/revolution/src/wud/WUD.c @@ -1,5 +1,4 @@ #include -#include #include #include @@ -10,6 +9,8 @@ #include #include +#include "__wud.h" + #define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define CLAMP(val, min, max) ((val) > (max) ? (max) : (val) < (min) ? (min) : (val)) diff --git a/src/revolution/wud/WUDHidHost.c b/libs/revolution/src/wud/WUDHidHost.c similarity index 99% rename from src/revolution/wud/WUDHidHost.c rename to libs/revolution/src/wud/WUDHidHost.c index aaae4d0aa2..0eed6c623a 100644 --- a/src/revolution/wud/WUDHidHost.c +++ b/libs/revolution/src/wud/WUDHidHost.c @@ -1,9 +1,10 @@ #include -#include #include #include #include +#include "__wud.h" + #define DEBUGPrint WUD_DEBUGPrint // TODO(kiwi) Is this from BTA? diff --git a/src/revolution/wud/__wud.h b/libs/revolution/src/wud/__wud.h similarity index 100% rename from src/revolution/wud/__wud.h rename to libs/revolution/src/wud/__wud.h diff --git a/src/revolution/wud/debug_msg.c b/libs/revolution/src/wud/debug_msg.c similarity index 74% rename from src/revolution/wud/debug_msg.c rename to libs/revolution/src/wud/debug_msg.c index 8e05cc0499..470b33e68f 100644 --- a/src/revolution/wud/debug_msg.c +++ b/libs/revolution/src/wud/debug_msg.c @@ -1,8 +1,7 @@ -#include +#include "__wud.h" #include void WUD_DEBUGPrint(const char* msg, ...) { va_list list; } - diff --git a/src/NdevExi2A/DebuggerDriver.c b/src/NdevExi2A/DebuggerDriver.c index 8bbc082f23..670de960db 100644 --- a/src/NdevExi2A/DebuggerDriver.c +++ b/src/NdevExi2A/DebuggerDriver.c @@ -1,8 +1,8 @@ #include "NdevExi2A/DebuggerDriver.h" #include "NdevExi2A/exi2.h" -#include -#include +#include +#include static s32 __DBRecvDataSize; static u32 __DBRecvMail; diff --git a/src/SSystem/SComponent/c_list.cpp b/src/SSystem/SComponent/c_list.cpp index 57f49cec1a..0f590a969a 100644 --- a/src/SSystem/SComponent/c_list.cpp +++ b/src/SSystem/SComponent/c_list.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_list.h" #include "SSystem/SComponent/c_node.h" -#include +#include void cLs_Init(node_list_class* list) { list->mpHead = NULL; diff --git a/src/SSystem/SComponent/c_list_iter.cpp b/src/SSystem/SComponent/c_list_iter.cpp index 077840f838..be97b39c0b 100644 --- a/src/SSystem/SComponent/c_list_iter.cpp +++ b/src/SSystem/SComponent/c_list_iter.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_list_iter.h" #include "SSystem/SComponent/c_list.h" -#include +#include int cLsIt_Method(node_list_class* list, cNdIt_MethodFunc method, void* data) { if (list->mSize > 0) diff --git a/src/SSystem/SComponent/c_node.cpp b/src/SSystem/SComponent/c_node.cpp index a1957273ef..f23b7b3371 100644 --- a/src/SSystem/SComponent/c_node.cpp +++ b/src/SSystem/SComponent/c_node.cpp @@ -4,7 +4,7 @@ */ #include "SSystem/SComponent/c_node.h" -#include +#include void cNd_Join(node_class* node_a, node_class* node_b) { node_a->mpNextNode = node_b; diff --git a/src/SSystem/SComponent/c_node_iter.cpp b/src/SSystem/SComponent/c_node_iter.cpp index a26b6a1743..5eeb939ad4 100644 --- a/src/SSystem/SComponent/c_node_iter.cpp +++ b/src/SSystem/SComponent/c_node_iter.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_node_iter.h" #include "SSystem/SComponent/c_node.h" -#include +#include int cNdIt_Method(node_class* node, cNdIt_MethodFunc method, void* data) { int ret = 1; diff --git a/src/SSystem/SComponent/c_phase.cpp b/src/SSystem/SComponent/c_phase.cpp index fbef09e635..64d291c053 100644 --- a/src/SSystem/SComponent/c_phase.cpp +++ b/src/SSystem/SComponent/c_phase.cpp @@ -7,12 +7,12 @@ #include "global.h" void cPhs_Reset(request_of_phase_process_class* phase) { - phase->id = cPhs_INIT_e; + phase->id = 0; } void cPhs_Set(request_of_phase_process_class* phase, cPhs__Handler* handlerTbl) { phase->mpHandlerTable = handlerTbl; - phase->id = cPhs_INIT_e; + phase->id = 0; } void cPhs_UnCompleate(request_of_phase_process_class* phase) { diff --git a/src/SSystem/SComponent/c_tree_iter.cpp b/src/SSystem/SComponent/c_tree_iter.cpp index f7ffabf4c7..9446dbd52c 100644 --- a/src/SSystem/SComponent/c_tree_iter.cpp +++ b/src/SSystem/SComponent/c_tree_iter.cpp @@ -7,7 +7,7 @@ #include "SSystem/SComponent/c_list.h" #include "SSystem/SComponent/c_list_iter.h" #include "SSystem/SComponent/c_tree.h" -#include +#include int cTrIt_Method(node_lists_tree_class* tree, cNdIt_MethodFunc method, void* data) { node_list_class* list = tree->mpLists; diff --git a/src/amcstubs/AmcExi2Stubs.c b/src/amcstubs/AmcExi2Stubs.c index dcb3b944f7..a036e57a0d 100644 --- a/src/amcstubs/AmcExi2Stubs.c +++ b/src/amcstubs/AmcExi2Stubs.c @@ -3,7 +3,7 @@ * Description: */ -#include +#include void EXI2_Init(vu8**, EXICallback) {} diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index af064dc536..dd11128d6b 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -1047,7 +1047,7 @@ int cDylPhs::Link(request_of_phase_process_class* i_phase, s16 i_ProfName) { (request_of_phase_process_fn)cDylPhs::phase_03 }; - if (i_phase->id == cPhs_NEXT_e) { + if (i_phase->id == 2) { return cPhs_COMPLEATE_e; } @@ -1055,11 +1055,11 @@ int cDylPhs::Link(request_of_phase_process_class* i_phase, s16 i_ProfName) { } int cDylPhs::Unlink(request_of_phase_process_class* i_phase, s16 i_ProfName) { - JUT_ASSERT(460, i_phase->id != cPhs_LOADING_e); + JUT_ASSERT(460, i_phase->id != 1); - if (i_phase->id == cPhs_NEXT_e) { + if (i_phase->id == 2) { int ret = cDyl_Unlink(i_ProfName); - i_phase->id = cPhs_INIT_e; + i_phase->id = 0; return ret; } diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 599a69d452..062aaa975e 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_bg_obj.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include -#include +#include #include #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index 8244ee8446..1830791f66 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -15,7 +15,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" #include "d/d_timer.h" -#include +#include #include #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index a16544f204..da094293f1 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -4,7 +4,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep -#include +#include #include "d/actor/d_a_e_oct_bg.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index eb78ae3b6d..89e84015c9 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -406,7 +406,7 @@ actor_process_profile_definition g_profile_GRASS = { fpcPi_CURRENT_e, // mListPrio PROC_GRASS, // mProcName &g_fpcLf_Method.base, // sub_method - sizeof(daGrass_c), // mSize + sizeof(daGrass_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 228a76281e..90e77c4c60 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -23,6 +23,16 @@ #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_overlap_mng.h" +#include "res/Object/E_yc.h" +#include "res/Object/E_kc.h" + +#define TYPE_TWILIGHT 0 +#define TYPE_NORMAL 1 + +#define SCENE_TYPE_LAKE_HYLIA 0 +#define SCENE_TYPE_RIVER 1 +#define SCENE_TYPE_BOARD_HOUSE 2 +#define SCENE_TYPE_DEFAULT 3 namespace { static dCcD_SrcSph cc_sph_src = { { @@ -143,44 +153,34 @@ void daKago_HIO_c::genMessage(JORMContext* ctx) { } #endif -int daKago_c::getBckName(int param_0) { - if (field_0x6e7 == 0) { - return param_0; +int daKago_c::getBckName(int i_resIdx) { + if (mType == TYPE_TWILIGHT) { + return i_resIdx; } - switch (param_0) { - case 7: - return 4; - case 8: - return 5; - case 9: - return 6; - case 10: - return 7; - case 11: - return 8; - case 12: - return 9; - case 13: - return 10; - case 14: - return 11; - case 15: - return 12; - case 21: - return 13; - default: - return 6; + // convert shadow kargorok res idx to normal kargorok res idx + switch (i_resIdx) { + case dRes_ID_E_YC_BCK_YC_CRASH_e: return dRes_ID_E_KC_BCK_KC_CRASH_e; + case dRes_ID_E_YC_BCK_YC_CRASH2_e: return dRes_ID_E_KC_BCK_KC_CRASH2_e; + case dRes_ID_E_YC_BCK_YC_FLY_e: return dRes_ID_E_KC_BCK_KC_FLY_e; + case dRes_ID_E_YC_BCK_YC_FLY_BRAKE_e: return dRes_ID_E_KC_BCK_KC_FLY_BRAKE_e; + case dRes_ID_E_YC_BCK_YC_FLY_DASH_WL_e: return dRes_ID_E_KC_BCK_KC_FLY_DASH_WL_e; + case dRes_ID_E_YC_BCK_YC_FLY_GLIDE_e: return dRes_ID_E_KC_BCK_KC_FLY_GLIDE_e; + case dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e: return dRes_ID_E_KC_BCK_KC_FLY_GLIDE_WL_e; + case dRes_ID_E_YC_BCK_YC_FLY_LIMIT_WL_e: return dRes_ID_E_KC_BCK_KC_FLY_LIMIT_WL_e; + case dRes_ID_E_YC_BCK_YC_FLY_WL_e: return dRes_ID_E_KC_BCK_KC_FLY_WL_e; + case dRes_ID_E_YC_BCK_YC_HOVERING_e: return dRes_ID_E_KC_BCK_KC_HOVERING_e; + default: return dRes_ID_E_KC_BCK_KC_FLY_e; } } -void daKago_c::setBck(int param_0, u8 param_1, f32 param_2, f32 param_3) { - mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(field_0x75c, getBckName(param_0)), - param_1, param_2, param_3, 0.0f, -1.0f); +void daKago_c::setBck(int i_anm, u8 i_mode, f32 i_morf, f32 i_speed) { + mAnm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(mArcName, getBckName(i_anm)), + i_mode, i_morf, i_speed, 0.0f, -1.0f); } -bool daKago_c::checkBck(int param_0) { - if (mpMorf->getAnm() == dComIfG_getObjectRes(field_0x75c, getBckName(param_0))) { +bool daKago_c::checkBck(int i_anm) { + if (mAnm_p->getAnm() == dComIfG_getObjectRes(mArcName, getBckName(i_anm))) { return true; } else { return false; @@ -193,16 +193,19 @@ int daKago_c::draw() { } g_env_light.settingTevStruct(2, ¤t.pos, &tevStr); - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); g_env_light.setLightTevColorType_MAJI(model, &tevStr); + fopAcM_setEffectMtx(this, model->getModelData()); + dComIfGd_setListDark(); - mpMorf->entryDL(); + mAnm_p->entryDL(); dComIfGd_setList(); + cXyz unkXyz1; unkXyz1.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); - field_0x764 = - dComIfGd_setShadow(field_0x764, 0, model, &unkXyz1, 3500.0f, 0.0f, current.pos.y, + mShadowId = + dComIfGd_setShadow(mShadowId, 0, model, &unkXyz1, 3500.0f, 0.0f, current.pos.y, mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); @@ -216,22 +219,26 @@ static int daKago_Draw(daKago_c* i_this) { int daKago_c::executeBalloonMenu() { dCamera_c* camera = dCam_getBody(); - switch (field_0x6eb) { + switch (mBalloonMenuMode) { case 0: - if (field_0x6e7 == 1 && (mCurrentAction == 0 || mCurrentAction == 5) && - !dComIfGp_event_runCheck() && mDoCPd_c::getTrigB(0)) + if (mType == TYPE_NORMAL && (mAction == ACTION_FLY_e || mAction == ACTION_ATTACK_e) && + !dComIfGp_event_runCheck() && mDoCPd_c::getTrigB(PAD_1)) { - field_0x6eb = 1; + mBalloonMenuMode = 1; return 1; } return 0; case 1: - if (eventInfo.checkCommandDemoAccrpt() == 0) { + if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 1, 0xffff, 0); - eventInfo.onCondition(2); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); + #if VERSION == VERSION_SHIELD_DEBUG + return 0; + #else break; + #endif } mMsgFlow.init(this, 0x457, 0, NULL); @@ -239,32 +246,29 @@ int daKago_c::executeBalloonMenu() { camera->Stop(); camera->SetTrimSize(3); - field_0x6eb = 0x2; - + mBalloonMenuMode = 2; break; case 2: if (mMsgFlow.doFlow(this, NULL, 0)) { if (dMsgObject_getSelectCursorPos() == 0) { - field_0x6eb = 0; + mBalloonMenuMode = 0; camera->Start(); camera->SetTrimSize(0); dComIfGp_event_reset(); - return 1; } if (dMsgObject_getSelectCursorPos() == 1) { - field_0x6eb = 3; + mBalloonMenuMode = 3; dComIfGp_setNextStage("F_SP112", 0, dComIfGp_roomControl_getStayNo(), dComIfG_play_c::getLayerNo(0), 0.0f, 10, 1, 0, 0, 1, 0); } else { - field_0x6eb = 3; + mBalloonMenuMode = 3; dStage_changeScene(3, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); } } - break; } @@ -275,37 +279,35 @@ static u8 hio_set; static daKago_HIO_c l_HIO; f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { - f32 retVal; - - retVal = mGroundHeight; + f32 gnd_height = mGroundHeight; if (mpPath1 != NULL) { - cXyz pointPos1; - cXyz pointPos2; + cXyz nextPntPos; + cXyz prevPntPos; cXyz cStack_140; - pointPos1 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; + nextPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; - int pointIdx2 = (int)mPathIdx - (int)mPathIdxOffset; - if (pointIdx2 >= mpPath1->m_num || pointIdx2 < 0) { - pointIdx2 = mPathIdx; + int prevPntNo = (int)mPathCurrentPointNo - (int)mPathStep; + if (prevPntNo >= mpPath1->m_num || prevPntNo < 0) { + prevPntNo = mPathCurrentPointNo; } - pointPos2 = dPath_GetPnt(mpPath1, pointIdx2)->m_position; + prevPntPos = dPath_GetPnt(mpPath1, prevPntNo)->m_position; - s16 targetAngleY = cLib_targetAngleY(&pointPos2, &pointPos1); + s16 pntAngle = cLib_targetAngleY(&prevPntPos, &nextPntPos); - mDoMtx_stack_c::YrotS(-targetAngleY); + mDoMtx_stack_c::YrotS(-pntAngle); mDoMtx_stack_c::transM(-i_pos.x, -i_pos.y, -i_pos.z); - mDoMtx_stack_c::multVec(&pointPos2, &cStack_140); + mDoMtx_stack_c::multVec(&prevPntPos, &cStack_140); f32 var_f29 = -cStack_140.z; if (var_f29 < 0.0f) { var_f29 = 0.0f; } - mDoMtx_stack_c::YrotS(-targetAngleY); + mDoMtx_stack_c::YrotS(-pntAngle); mDoMtx_stack_c::transM(-i_pos.x, -i_pos.y, -i_pos.z); - mDoMtx_stack_c::multVec(&pointPos1, &cStack_140); + mDoMtx_stack_c::multVec(&nextPntPos, &cStack_140); f32 var_f28 = cStack_140.z; if (var_f28 < 0.0f) { @@ -313,12 +315,12 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { } f32 var_f27 = var_f29 / (var_f29 + var_f28); - retVal = pointPos1.y * var_f27 + pointPos2.y * (1.0f - var_f27); + gnd_height = nextPntPos.y * var_f27 + prevPntPos.y * (1.0f - var_f27); if (o_step != NULL) { - f32 pointLatDist = pointPos1.absXZ(pointPos2); - f32 pointVertDist = std::abs(pointPos1.y - pointPos2.y); - *o_step = pointVertDist * l_HIO.mFlightSpeed / pointLatDist + 5.0f; + f32 pntDistXZ = nextPntPos.absXZ(prevPntPos); + f32 pntDistY = std::abs(nextPntPos.y - prevPntPos.y); + *o_step = pntDistY * l_HIO.mFlightSpeed / pntDistXZ + 5.0f; } } @@ -327,19 +329,20 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { dBgS_GndChk gndChk; cXyz gndChkPos(i_pos.x, i_pos.y + 500.0f, i_pos.z); gndChk.SetPos(&gndChkPos); - field_0x700 = dComIfG_Bgsp().GroundCross(&gndChk); + mGroundFlyHeight = dComIfG_Bgsp().GroundCross(&gndChk); - field_0x738 = 0; + mGndSpecialCode = 0; - if (field_0x700 != -G_CM3D_F_INF) { - field_0x738 = dComIfG_Bgsp().GetSpecialCode(gndChk); - field_0x700 += l_HIO.mFlightGroundAltitude; - if (retVal < field_0x700) { - retVal = field_0x700; - if (current.pos.y < retVal) { + if (mGroundFlyHeight != -G_CM3D_F_INF) { + mGndSpecialCode = dComIfG_Bgsp().GetSpecialCode(gndChk); + + mGroundFlyHeight += l_HIO.mFlightGroundAltitude; + if (gnd_height < mGroundFlyHeight) { + gnd_height = mGroundFlyHeight; + if (current.pos.y < gnd_height) { mGroundHeight = current.pos.y; } else { - mGroundHeight = field_0x700; + mGroundHeight = mGroundFlyHeight; } if (o_step != NULL) { @@ -360,15 +363,15 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { unkFlag1 = TRUE; } - if (retVal < gndCrossMag) { - field_0x700 = gndCrossMag; - retVal = gndCrossMag; + if (gnd_height < gndCrossMag) { + mGroundFlyHeight = gndCrossMag; + gnd_height = gndCrossMag; field_0x6e0 = 1; if (current.pos.y < gndCrossMag) { mGroundHeight = current.pos.y; } else { - mGroundHeight = field_0x700; + mGroundHeight = mGroundFlyHeight; } if (o_step != NULL) { @@ -382,37 +385,37 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { field_0x6e6 = 1; } } else { - field_0x71c = 0; + mWaterSplashTimer = 0; field_0x6e6 = 0; } - return retVal; + return gnd_height; } -f32 daKago_c::checkRoofHeight(cXyz param_0) { - f32 roofChkYVal = mRoofHeight; +f32 daKago_c::checkRoofHeight(cXyz i_pos) { + f32 roof_height = mRoofHeight; BOOL unkFlag1 = FALSE; field_0x6e5 = 0; dBgS_RoofChk roofChk; - cXyz unkXyz1(param_0.x, param_0.y - 500.0f, param_0.z); - roofChk.SetPos(unkXyz1); + cXyz chkpos(i_pos.x, i_pos.y - 500.0f, i_pos.z); + roofChk.SetPos(chkpos); - roofChkYVal = dComIfG_Bgsp().RoofChk(&roofChk); - if (roofChkYVal != G_CM3D_F_INF) { - roofChkYVal -= l_HIO.mFlightCeilingAltitude; - if (current.pos.y > roofChkYVal) { + roof_height = dComIfG_Bgsp().RoofChk(&roofChk); + if (roof_height != G_CM3D_F_INF) { + roof_height -= l_HIO.mFlightCeilingAltitude; + if (current.pos.y > roof_height) { mRoofHeight = current.pos.y; } else { - mRoofHeight = roofChkYVal; + mRoofHeight = roof_height; } if (dComIfG_Bgsp().GetSpecialCode(roofChk) == 1) { unkFlag1 = TRUE; } - if (std::abs(current.pos.y - roofChkYVal) < 310.0f) { + if (std::abs(current.pos.y - roof_height) < 310.0f) { fopAc_ac_c* actor = dComIfG_Bgsp().GetActorPointer(roofChk); if (actor != NULL && fopAcM_GetName(actor) == PROC_Obj_RIVERROCK) { if (((daObjRIVERROCK_c*)actor)->mBreakSubAction == daObjRIVERROCK_c::BREAK_MOVE) { @@ -432,7 +435,7 @@ f32 daKago_c::checkRoofHeight(cXyz param_0) { field_0x6e3 = 0; } - return roofChkYVal; + return roof_height; } void daKago_c::checkMoveHeight() { @@ -444,58 +447,61 @@ void daKago_c::checkMoveHeight() { void daKago_c::checkSizeBg() { dBgS_LinChk linChk; - cXyz unkXyz1; - cXyz unkXyz2; + cXyz line_start; + cXyz line_end; cM3dGPla plane; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); field_0x6d9 = 0; - if (mCurrentAction == 4) { + if (mAction == ACTION_WAIT_e) { return; } - mDoMtx_stack_c::copy(model->getAnmMtx(10)); - mDoMtx_stack_c::multVecZero(&unkXyz1); - mDoMtx_stack_c::copy(model->getAnmMtx(14)); - mDoMtx_stack_c::multVecZero(&unkXyz2); - unkXyz2 = unkXyz1 + (unkXyz2 - unkXyz1) * 0.9f; - linChk.Set(&unkXyz1, &unkXyz2, NULL); + mDoMtx_stack_c::copy(model->getAnmMtx(YC_JNT_SHOULDERL_1_e)); + mDoMtx_stack_c::multVecZero(&line_start); + mDoMtx_stack_c::copy(model->getAnmMtx(YC_JNT_HANDL_3_e)); + mDoMtx_stack_c::multVecZero(&line_end); + line_end = line_start + (line_end - line_start) * 0.9f; + linChk.Set(&line_start, &line_end, NULL); + if (dComIfG_Bgsp().LineCross(&linChk)) { dComIfG_Bgsp().GetTriPla(linChk, &plane); if (dComIfG_Bgsp().GetSpecialCode(linChk) == 1) { field_0x6d9 |= (u8)1; - field_0x650[0] = linChk.GetCross(); + mWallHitEffPos[0] = linChk.GetCross(); } } - mDoMtx_stack_c::copy(model->getAnmMtx(15)); - mDoMtx_stack_c::multVecZero(&unkXyz1); - mDoMtx_stack_c::copy(model->getAnmMtx(19)); - mDoMtx_stack_c::multVecZero(&unkXyz2); - unkXyz2 = (unkXyz1 + (unkXyz2 - unkXyz1) * 0.9f); - linChk.Set(&unkXyz1, &unkXyz2, NULL); + mDoMtx_stack_c::copy(model->getAnmMtx(YC_JNT_SHOULDERR_1_e)); + mDoMtx_stack_c::multVecZero(&line_start); + mDoMtx_stack_c::copy(model->getAnmMtx(YC_JNT_HANDR_3_e)); + mDoMtx_stack_c::multVecZero(&line_end); + line_end = (line_start + (line_end - line_start) * 0.9f); + linChk.Set(&line_start, &line_end, NULL); + if (dComIfG_Bgsp().LineCross(&linChk)) { dComIfG_Bgsp().GetTriPla(linChk, &plane); if (dComIfG_Bgsp().GetSpecialCode(linChk) == 1) { field_0x6d9 |= (u8)0x2; - field_0x650[1] = linChk.GetCross(); + mWallHitEffPos[1] = linChk.GetCross(); } } - unkXyz1 = current.pos; - mDoMtx_stack_c::copy(model->getAnmMtx(1)); - mDoMtx_stack_c::multVecZero(&unkXyz1); + line_start = current.pos; + mDoMtx_stack_c::copy(model->getAnmMtx(YC_JNT_BACKBONE1_e)); + mDoMtx_stack_c::multVecZero(&line_start); mDoMtx_stack_c::transM(300.0f, 0.0f, 0.0f); - mDoMtx_stack_c::multVecZero(&unkXyz2); - linChk.Set(&unkXyz1, &unkXyz2, NULL); + mDoMtx_stack_c::multVecZero(&line_end); + linChk.Set(&line_start, &line_end, NULL); + if (dComIfG_Bgsp().LineCross(&linChk)) { dComIfG_Bgsp().GetTriPla(linChk, &plane); if (dComIfG_Bgsp().GetSpecialCode(linChk) == 1) { if (!checkYaguraPos(linChk.GetCross())) { field_0x6d9 |= (u8)4; - this->field_0x650[2] = linChk.GetCross(); + mWallHitEffPos[2] = linChk.GetCross(); } } } @@ -505,12 +511,12 @@ s16 daKago_c::getBeforeGroundHeight(u8 param_0) { return 0; } -void daKago_c::demo_skip(int param_0) { +void daKago_c::demo_skip(int i_parameter) { dCamera_c* camera = dCam_getBody(); - switch (param_0) { + switch (i_parameter) { case 0: - field_0x748 = 2; + mDemoMode = 2; field_0x74c = 0; break; case 1: @@ -521,10 +527,10 @@ void daKago_c::demo_skip(int param_0) { case 2: setMidnaRideOn(); setPlayerRideOn(); - field_0x718 = field_0x71a = 0; + mHeadRotZ = mHeadRotY = 0; /* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete (Horse grass appears in various places) */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[84]); - field_0x748 = 7; + mDemoMode = 7; field_0x74c = 0; break; case 4: @@ -534,10 +540,10 @@ void daKago_c::demo_skip(int param_0) { case 5: case 6: if (setSceneChange(3)) { - if (param_0 == 5) { - field_0x748 = 6; + if (i_parameter == 5) { + mDemoMode = 6; } else { - field_0x748 = 5; + mDemoMode = 5; field_0x6cc = 1.0f; } } @@ -545,14 +551,14 @@ void daKago_c::demo_skip(int param_0) { case 7: setRideOff(); case 8: { - field_0x68c.set(-77875.0f, -18287.0f, 42000.0f); - field_0x698.set(-77275.0f, -18500.0f, 41090.0f); + mDemoCamCenter.set(-77875.0f, -18287.0f, 42000.0f); + mDemoCamEye.set(-77275.0f, -18500.0f, 41090.0f); field_0x6a4.set(-77615.0f, -18640.0f, 41400.0f); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&field_0x6a4, 0, 0); field_0x6de = 0; speed.y = speedF = 0.0f; - setActionMode(4, 0); - camera->Set(field_0x68c, field_0x698, 70.0f, 0); + setActionMode(ACTION_WAIT_e, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, 70.0f, 0); camera->Reset(); camera->Start(); camera->SetTrimSize(0); @@ -563,14 +569,14 @@ void daKago_c::demo_skip(int param_0) { case 9: setRideOff(); case 10: - field_0x68c.set(3703.0f, 337.0f, 863.0f); - field_0x698.set(3726.0f, 272.0f, 1196.0f); + mDemoCamCenter.set(3703.0f, 337.0f, 863.0f); + mDemoCamEye.set(3726.0f, 272.0f, 1196.0f); field_0x6a4.set(3782.0f, 222.0f, 690.0f); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&field_0x6a4, 0, 0); field_0x6de = 0; speed.y = speedF = 0.0f; - setActionMode(4, 0); - camera->Set(field_0x68c, field_0x698, 70.0f, 0); + setActionMode(ACTION_WAIT_e, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, 70.0f, 0); camera->Reset(); camera->Start(); camera->SetTrimSize(0); @@ -579,27 +585,28 @@ void daKago_c::demo_skip(int param_0) { } } -int daKago_c::DemoSkipCallBack(void* param_0, int param_1) { - if (param_0 != NULL) { - ((daKago_c*)param_0)->demo_skip(param_1); - return 1; +int daKago_c::DemoSkipCallBack(void* i_this, int i_parameter) { + if (i_this != NULL) { + ((daKago_c*)i_this)->demo_skip(i_parameter); + return TRUE; } - return 0; + + return FALSE; } -void daKago_c::setActionMode(int param_0, int param_1) { +void daKago_c::setActionMode(int i_action, int i_mode) { mIsFlying = false; - mCurrentAction = param_0; - field_0x744 = param_1; + mAction = i_action; + mMode = i_mode; } void daKago_c::setMidnaTagPos() { - cXyz unkXyz1; + cXyz tagPos; daMidna_c* midna = daPy_getPlayerActorClass()->getMidnaActor(); if (midna != NULL) { mDoMtx_stack_c::copy(getMidnaLocaterMtx()); - mDoMtx_stack_c::multVecZero(&unkXyz1); - midna->onTagWaitPos(&unkXyz1); + mDoMtx_stack_c::multVecZero(&tagPos); + midna->onTagWaitPos(&tagPos); } } @@ -621,6 +628,7 @@ void daKago_c::setRideOff() { midna->offTagWaitPos(); midna->offCargoActor(); } + daPy_getPlayerActorClass()->offCargoCarry(); } @@ -628,78 +636,75 @@ s8 daKago_c::searchNearPassPoint() { cXyz pointPos; cXyz playerPos(daPy_getPlayerActorClass()->current.pos); - f32 unkFloat1; - f32 unkFloat2 = unkFloat1 = 100000.0f; - int pointIdx1; - for (int i = 0; i < mpPath1->m_num; i++) { - pointPos = dPath_GetPnt(mpPath1,i)->m_position; + f32 prev_nearest_distXZ, nearest_distXZ; + nearest_distXZ = prev_nearest_distXZ = 100000.0f; + int nearest_point_no; - f32 playerLatDist = playerPos.absXZ(pointPos); - if (playerLatDist < unkFloat2) { - unkFloat1 = unkFloat2; - unkFloat2 = playerLatDist; - pointIdx1 = i; - } else if (playerLatDist < unkFloat1) { - unkFloat1 = playerLatDist; + for (int i = 0; i < mpPath1->m_num; i++) { + pointPos = dPath_GetPnt(mpPath1, i)->m_position; + + f32 player_pnt_distXZ = playerPos.absXZ(pointPos); + if (player_pnt_distXZ < nearest_distXZ) { + prev_nearest_distXZ = nearest_distXZ; + nearest_distXZ = player_pnt_distXZ; + nearest_point_no = i; + } else if (player_pnt_distXZ < prev_nearest_distXZ) { + prev_nearest_distXZ = player_pnt_distXZ; } } - int pointIdx2 = pointIdx1 + mPathIdxOffset; - if (pointIdx2 < 0) { - pointIdx2 = 1; - } else if (pointIdx2 >= mpPath1->m_num) { - pointIdx2 = mpPath1->m_num - 1; + int next_point_no = nearest_point_no + mPathStep; + if (next_point_no < 0) { + next_point_no = 1; + } else if (next_point_no >= mpPath1->m_num) { + next_point_no = mpPath1->m_num - 1; } - return pointIdx2; + return next_point_no; } -int daKago_c::setSceneChange(int param_0) { - int unkInt1 = 0; - switch (param_0) { - case 0: - if (field_0x6e7 == 0) { - unkInt1 = 1; - } else { - unkInt1 = 6; - } +int daKago_c::setSceneChange(int i_mode) { + int exitID = 0; + switch (i_mode) { + case 0: + if (mType == TYPE_TWILIGHT) { + exitID = 1; + } else { + exitID = 6; + } break; case 1: - unkInt1 = 0; - + exitID = 0; endBalloonScore(); - break; case 2: - if (field_0x6e7 == 0) { - unkInt1 = 3; + if (mType == TYPE_TWILIGHT) { + exitID = 3; } else { - unkInt1 = 0; + exitID = 0; } endBalloonScore(); - break; case 3: - unkInt1 = 3; - + exitID = 3; break; } - return dStage_changeScene(unkInt1, 0.0f, 10, fopAcM_GetRoomNo(this), 0, -1); + return dStage_changeScene(exitID, 0.0f, 10, fopAcM_GetRoomNo(this), 0, -1); } void daKago_c::createBalloonScore() { - if (field_0x6e7 != 0 && mBalloon2DId == fpcM_ERROR_PROCESS_ID_e) { - mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, 0, 0xffffffff, 0, 0, -1); + if (mType != TYPE_TWILIGHT && mBalloon2DId == fpcM_ERROR_PROCESS_ID_e) { + mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, NULL, -1, NULL, NULL, -1); field_0x6e9 = 1; } } void daKago_c::startBalloonScore() { fopAc_ac_c* balloon_actor; - if (field_0x6e7 != 0 && field_0x6e9 == 1) { + if (mType != TYPE_TWILIGHT && field_0x6e9 == 1) { fopAcM_SearchByID(mBalloon2DId, &balloon_actor); if (balloon_actor != NULL) { ((daBalloon2D_c*)balloon_actor)->show(); @@ -711,9 +716,9 @@ void daKago_c::startBalloonScore() { void daKago_c::endBalloonScore() { fopAc_ac_c* balloon2D; - fopAc_ac_c *balloonObj; + fopAc_ac_c* balloonObj; - if (field_0x6e7 != 0) { + if (mType != TYPE_TWILIGHT) { fopAcM_SearchByID(mBalloon2DId, &balloon2D); if (balloon2D != NULL) { ((daBalloon2D_c*)balloon2D)->hide(); @@ -726,11 +731,11 @@ void daKago_c::endBalloonScore() { } } -f32 daKago_c::checkNextPath(cXyz param_0) { +f32 daKago_c::checkNextPath(cXyz i_pntPos) { cXyz cStack_14; mDoMtx_stack_c::YrotS(-field_0x714); mDoMtx_stack_c::transM(-current.pos.x, -current.pos.y, -current.pos.z); - mDoMtx_stack_c::multVec(¶m_0, &cStack_14); + mDoMtx_stack_c::multVec(&i_pntPos, &cStack_14); return cStack_14.z; } @@ -745,10 +750,11 @@ void daKago_c::checkHeight() { bool daKago_c::checkYaguraPos(cXyz param_0) { cXyz local_18(-22984.0f, 0.0f, 7455.0f); cXyz cStack_24; - s16 temp = -0x770; - mDoMtx_stack_c::YrotS(-temp); + s16 rot_y = -0x770; + mDoMtx_stack_c::YrotS(-rot_y); mDoMtx_stack_c::transM(-local_18.x, -local_18.y, -local_18.z); mDoMtx_stack_c::multVec(¶m_0, &cStack_24); + if (std::abs(cStack_24.z) < 700.0f) { return true; } else { @@ -758,12 +764,12 @@ bool daKago_c::checkYaguraPos(cXyz param_0) { bool daKago_c::checkWallHitFall(int param_0) { if (field_0x6e5 != 0) { - cXyz unkXyz1; - setActionMode(1, 3); - dComIfGp_getVibration().StartShock(8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - unkXyz1 = current.pos; - unkXyz1.y += 200.0f; - setWallHitEffect(unkXyz1, 0); + cXyz effpos; + setActionMode(ACTION_STAGGER_e, 3); + dComIfGp_getVibration().StartShock(VIBMODE_S_POWER8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + effpos = current.pos; + effpos.y += 200.0f; + setWallHitEffect(effpos, 0); return true; } @@ -773,37 +779,37 @@ bool daKago_c::checkWallHitFall(int param_0) { if (!checkYaguraPos(current.pos)) { if (abs(unkInt1) > 0x7000) { field_0x6d9 |= (u8)0x4; - field_0x650[2].set(current.pos.x + cM_ssin(shape_angle.y) * 200.0f, current.pos.y, current.pos.z + cM_scos(shape_angle.y) * 200.0f); + mWallHitEffPos[2].set(current.pos.x + cM_ssin(shape_angle.y) * 200.0f, current.pos.y, current.pos.z + cM_scos(shape_angle.y) * 200.0f); } } if (unkInt1 > 0) { field_0x6d9 |= (u8)0x1; - field_0x650[0].set(current.pos.x + cM_ssin(shape_angle.y + 0x4000) * 200.0f, current.pos.y, - current.pos.z + cM_scos(shape_angle.y + 0x4000) * 200.0f); + mWallHitEffPos[0].set(current.pos.x + cM_ssin(shape_angle.y + 0x4000) * 200.0f, current.pos.y, + current.pos.z + cM_scos(shape_angle.y + 0x4000) * 200.0f); } else { field_0x6d9 |= (u8)0x2; - field_0x650[1].set(current.pos.x + cM_ssin(shape_angle.y + -0x4000) * 200.0f, - current.pos.y, - current.pos.z + cM_scos(shape_angle.y + -0x4000) * 200.0f); + mWallHitEffPos[1].set(current.pos.x + cM_ssin(shape_angle.y + -0x4000) * 200.0f, + current.pos.y, + current.pos.z + cM_scos(shape_angle.y + -0x4000) * 200.0f); } } if ((field_0x6d9 & 0x4) != 0) { - setActionMode(1, 0); - dComIfGp_getVibration().StartShock(8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - setWallHitEffect(field_0x650[2], 0); + setActionMode(ACTION_STAGGER_e, 0); + dComIfGp_getVibration().StartShock(VIBMODE_S_POWER8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + setWallHitEffect(mWallHitEffPos[2], 0); return true; } - if (param_0 != 0 && field_0x720 == 0 && (field_0x6d9 & 0x3) != 0) { - dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + if (param_0 != 0 && mWallHitInvulnTimer == 0 && (field_0x6d9 & 0x3) != 0) { + dComIfGp_getVibration().StartShock(VIBMODE_S_POWER2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); if ((field_0x6d9 & 0x1) != 0) { - setActionMode(1, 1); - setWallHitEffect(field_0x650[0], 1); + setActionMode(ACTION_STAGGER_e, 1); + setWallHitEffect(mWallHitEffPos[0], 1); } else { - setActionMode(1, 2); - setWallHitEffect(field_0x650[1], 1); + setActionMode(ACTION_STAGGER_e, 2); + setWallHitEffect(mWallHitEffPos[1], 1); } return true; } @@ -816,8 +822,8 @@ bool daKago_c::checkAttackStart() { return false; } - if (mDoCPd_c::getTrigA(0)) { - setActionMode(5, 0); + if (mDoCPd_c::getTrigA(PAD_1)) { + setActionMode(ACTION_ATTACK_e, 0); mIsFlying = true; return true; } else { @@ -825,11 +831,9 @@ bool daKago_c::checkAttackStart() { } } -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define MAX(a, b) ((a) > (b) ? (a) : (b)) - s16 daKago_c::getValueY(f32 param_0) { - s16 valueY = field_0x6f4 * param_0; + s16 valueY = mStickY * param_0; + f32 var_f31; if (valueY < 0) { if (current.pos.y > mRoofHeight - 200.0f) { @@ -853,11 +857,11 @@ s16 daKago_c::getValueY(f32 param_0) { } s16 daKago_c::getValueX(f32 param_0) { - return -field_0x6f0 * param_0; + return -mStickX * param_0; } s16 daKago_c::getValueAbsX(f32 param_0) { - return std::abs(-field_0x6f0 * param_0); + return std::abs(-mStickX * param_0); } void daKago_c::flySpeedCalcLockOn() { @@ -873,31 +877,31 @@ void daKago_c::flySpeedCalcLockOn() { cLib_addCalcAngleS(¤t.angle.x, angleX, 8, 0x100, 0x10); shape_angle.x = current.angle.x; - s16 angleX2 = current.angle.y; + + s16 prevAngleY = current.angle.y; cLib_addCalcAngleS(¤t.angle.y, angleY, 8, 0x100, 0x10); shape_angle.y = current.angle.y; - cLib_addCalcAngleS(&shape_angle.z, ((angleX2 - current.angle.y) * 0x20), 8, 0x400, 0x10); + cLib_addCalcAngleS(&shape_angle.z, ((prevAngleY - current.angle.y) * 0x20), 8, 0x400, 0x10); if (shape_angle.z > 0x3000) { shape_angle.z = 0x3000; } - if (shape_angle.z < -0x3000) { shape_angle.z = -0x3000; } } -void daKago_c::flySpeedCalc(s16 param_0, int param_1) { +void daKago_c::flySpeedCalc(s16 param_0, int i_calcType) { s16 var_r29; s16 var_r28; s16 var_r27; s16 sp_8; - if (param_1 == 0) { + if (i_calcType == 0) { sp_8 = 0x2000; - } else if (param_1 == 1) { + } else if (i_calcType == 1) { sp_8 = 0x1000; - } else if (param_1 == 2) { + } else if (i_calcType == 2) { sp_8 = 0x2aaa; } @@ -910,7 +914,7 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { field_0x710 += getValueY(40.0f); var_r29 = 0x200; - if (param_1 == 2) { + if (i_calcType == 2) { var_r29 = 0x400; } if (field_0x710 > var_r29) { @@ -920,7 +924,7 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { field_0x710 = -var_r29; } - if (field_0x6f4 > 0.0f) { + if (mStickY > 0.0f) { if (current.angle.x < var_r28) { current.angle.x += field_0x710; } else { @@ -952,6 +956,7 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { } current.angle.x += field_0x710; } + if (current.angle.x > 0x2aaa) { current.angle.x = 0x2aaa; } @@ -961,28 +966,28 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { shape_angle.x = current.angle.x; var_r27 = 0x2000; - if (param_1 == 1) { + if (i_calcType == 1) { var_r27 = 0x1000; - } else if (param_1 == 2) { + } else if (i_calcType == 2) { var_r27 = 0x2aaa; } f32 unkFloat1 = 20.0f; var_r29 = 0x100; - if (param_1 == 2) { + if (i_calcType == 2) { unkFloat1 = 30.0f; var_r29 = 0x200; } var_r28 = param_0 + getValueX(var_r27); if (mpLockActor != NULL) { - var_r28 = cLib_targetAngleY((Vec*)¤t, (Vec*)&mpLockActor->current); + var_r28 = cLib_targetAngleY(¤t.pos, &mpLockActor->current.pos); } int always_zero = 0; if (!always_zero) { if (abs((s16)(current.angle.y - param_0)) < var_r27) { - if (field_0x6f0) { + if (mStickX) { field_0x712 += getValueX(unkFloat1); if (field_0x712 > getValueAbsX(var_r29)) { field_0x712 = getValueAbsX(var_r29); @@ -993,18 +998,20 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { } else { cLib_addCalcAngleS(&field_0x712, 0, 8, 0x20, 0x10); } + current.angle.y += field_0x712; } else { int sp_14 = 0; - if (field_0x6f0 < 0.0f) { + if (mStickX < 0.0f) { if ((s16)(current.angle.y - param_0) < var_r27) { sp_14 = 1; } } else { - if (field_0x6f0 > 0.0f && (s16)(current.angle.y - param_0) > var_r27) { + if (mStickX > 0.0f && (s16)(current.angle.y - param_0) > var_r27) { sp_14 = 1; } } + if (sp_14 != 0) { field_0x712 += getValueX(unkFloat1); if (field_0x712 > getValueAbsX(var_r29)) { @@ -1020,7 +1027,9 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { } } } + shape_angle.y = current.angle.y; + cLib_addCalcAngleS(&shape_angle.z, -field_0x712 * 0x20, 8, 0x400, 0x10); if (shape_angle.z > 0x3000) { shape_angle.z = 0x3000; @@ -1031,7 +1040,7 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { if (field_0x6e3 == 1) { field_0x6e3 = 2; - if (field_0x6e7 == 1) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -1040,58 +1049,60 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { if (field_0x6e6 == 1) { field_0x6e6 = 2; - if (mCurrentAction == 5) { - field_0x71c = l_HIO.mSplashGenTimeDuringDash; + if (mAction == ACTION_ATTACK_e) { + mWaterSplashTimer = l_HIO.mSplashGenTimeDuringDash; } else { - field_0x71c = l_HIO.mWaterSplashTime; + mWaterSplashTimer = l_HIO.mWaterSplashTime; } } } bool daKago_c::checkFlySceneChange() { - if ((mPathIdxOffset > 0 && mPathIdx >= mpPath1->m_num - 1 || - mPathIdxOffset < 0 && mPathIdx < 1) && - field_0x73c == 1 && fopOvlpM_IsPeek() == 0) + if (((mPathStep > 0 && mPathCurrentPointNo >= mpPath1->m_num - 1) || (mPathStep < 0 && mPathCurrentPointNo < 1)) + && mSceneType == SCENE_TYPE_RIVER + && !fopOvlpM_IsPeek()) { - setActionMode(0, 4); + setActionMode(ACTION_FLY_e, 4); field_0x728 = 300; - if (checkBck(9) == 0) { - setBck(9, 2, 10.0f, 1.0f); + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_e, 2, 10.0f, 1.0f); } - if (mPathIdxOffset > 0) { + if (mPathStep > 0) { setSceneChange(1); } else { setSceneChange(2); } return true; - } else { - return false; } + + return false; } void daKago_c::setFlyAway() { current.angle.y = shape_angle.y; - setActionMode(0, 3); + setActionMode(ACTION_FLY_e, 3); field_0x728 = 90; - if (!checkBck(9)) { - setBck(9, 2, 10.0f, 1.0f); + + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_e, 2, 10.0f, 1.0f); } + dComIfGp_getVibration().StopQuake(0x1f); } void daKago_c::setFlyAnime() { if (cM_rnd() < 0.5) { - if (checkBck(15) == 0) { - setBck(15, 2, 10.0f, 1.0f); + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); } else { - setBck(13, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e, 2, 10.0f, 1.0f); } } else { - if (!checkBck(13)) { - setBck(13, 2, 10.0f, 1.0f); + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e, 2, 10.0f, 1.0f); } } @@ -1099,23 +1110,24 @@ void daKago_c::setFlyAnime() { } void daKago_c::executeFly() { - s16 unkInt1; - s16 unkInt2; - f32 unkFloat1; - cXyz unkXyz1; - cXyz unkXyz2; + s16 pntAngleY; + s16 pntAngleX; + f32 targetFlySpeed; + cXyz nextPntPos; + cXyz prevPntPos; cXyz unkXyz3; startBalloonScore(); - if (field_0x744 < 3) { + if (mMode < 3) { if (mDashCooldownTime == 0) { - dComIfGp_setDoStatusForce(0x4b, 0); + dComIfGp_setDoStatusForce(BUTTON_STATUS_UNK_75, 0); } - if (field_0x6e7 == 1) { - dComIfGp_setAStatusForce(0x2a, 0); + + if (mType == TYPE_NORMAL) { + dComIfGp_setAStatusForce(BUTTON_STATUS_QUIT, 0); } else { - dComIfGp_setAStatusForce(0x27, 0); + dComIfGp_setAStatusForce(BUTTON_STATUS_UNK_39, 0); } } @@ -1126,7 +1138,7 @@ void daKago_c::executeFly() { checkHeight(); mIsFlying = true; - switch (field_0x744) { + switch (mMode) { case 0: shape_angle.y = current.angle.y; mGroundHeight = checkGroundHeight(current.pos, NULL); @@ -1135,27 +1147,29 @@ void daKago_c::executeFly() { case 1: setFlyAnime(); field_0x710 = field_0x712 = 0; - field_0x744 = 2; + mMode = 2; break; case 2: - unkXyz1 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; - unkXyz2 = dPath_GetPnt(mpPath1, mPathIdx - mPathIdxOffset)->m_position; - unkInt1 = cLib_targetAngleY(&unkXyz2, &unkXyz1); - field_0x714 = unkInt1; - flySpeedCalc(unkInt1, 0); - if (checkBck(11)) { - if (mpMorf->isStop()) { + nextPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + prevPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo - mPathStep)->m_position; + pntAngleY = cLib_targetAngleY(&prevPntPos, &nextPntPos); + field_0x714 = pntAngleY; + + flySpeedCalc(pntAngleY, 0); + + if (checkBck(dRes_ID_E_YC_BCK_YC_FLY_DASH_WL_e)) { + if (mAnm_p->isStop()) { setFlyAnime(); } } else { if (field_0x710 < 0) { - if (!checkBck(15)) { - setBck(15, 2, 10.0f, 1.0f); + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); } field_0x728 = 10; } else if (field_0x710 > 0) { - if (!checkBck(13)) { - setBck(13, 2, 10.0f, 1.0f); + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e, 2, 10.0f, 1.0f); } field_0x728 = 90; } else { @@ -1164,22 +1178,26 @@ void daKago_c::executeFly() { } } } + if (cM_ssin(current.angle.x) > 0.0f) { - unkFloat1 = l_HIO.mFlightSpeed + l_HIO.mDescentRateIncrement * cM_ssin(current.angle.x); + targetFlySpeed = l_HIO.mFlightSpeed + l_HIO.mDescentRateIncrement * cM_ssin(current.angle.x); } else { - unkFloat1 = l_HIO.mFlightSpeed + l_HIO.mAscentRateDecel * cM_ssin(current.angle.x); + targetFlySpeed = l_HIO.mFlightSpeed + l_HIO.mAscentRateDecel * cM_ssin(current.angle.x); } - if (std::abs(field_0x6f8 - unkFloat1) > 10.0f) { - cLib_chaseF(&field_0x6f8, unkFloat1, 2.0f); + + if (std::abs(mFlySpeed - targetFlySpeed) > 10.0f) { + cLib_chaseF(&mFlySpeed, targetFlySpeed, 2.0f); } else { - cLib_chaseF(&field_0x6f8, unkFloat1, 1.0f); + cLib_chaseF(&mFlySpeed, targetFlySpeed, 1.0f); } - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - unkXyz3.z = checkNextPath(unkXyz1); + + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + + unkXyz3.z = checkNextPath(nextPntPos); if (unkXyz3.z < 0.0f) { - if (abs((s16)(unkInt1 - cLib_targetAngleY(&unkXyz2, ¤t.pos))) < 0x4000) { - mPathIdx += mPathIdxOffset; + if (abs((s16)(pntAngleY - cLib_targetAngleY(&prevPntPos, ¤t.pos))) < 0x4000) { + mPathCurrentPointNo += mPathStep; if (checkFlySceneChange()) { return; } @@ -1188,35 +1206,40 @@ void daKago_c::executeFly() { break; case 3: case 4: - if (mPathIdx >= mpPath1->m_num) { - unkInt1 = current.angle.y; - unkInt2 = 0; + if (mPathCurrentPointNo >= mpPath1->m_num) { + pntAngleY = current.angle.y; + pntAngleX = 0; } else { - unkXyz1 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; - unkXyz2 = dPath_GetPnt(mpPath1, mPathIdx - mPathIdxOffset)->m_position; - unkInt1 = cLib_targetAngleY(&unkXyz2, &unkXyz1); - unkInt2 = -cLib_targetAngleX(&unkXyz2, &unkXyz1); + nextPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + prevPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo - mPathStep)->m_position; + pntAngleY = cLib_targetAngleY(&prevPntPos, &nextPntPos); + pntAngleX = -cLib_targetAngleX(&prevPntPos, &nextPntPos); } - if (field_0x744 == 3) { + + if (mMode == 3) { cLib_chaseUC(&field_0x6de, 0, 4); - cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x10); + cLib_addCalcAngleS(¤t.angle.x, -0x2000, 8, 0x100, 0x10); } else { - cLib_addCalcAngleS(¤t.angle.x, unkInt2, 8, 0x100, 0x10); + cLib_addCalcAngleS(¤t.angle.x, pntAngleX, 8, 0x100, 0x10); } + shape_angle.x = current.angle.x; - cLib_addCalcAngleS(¤t.angle.y, unkInt1, 8, 0x400, 0x10); + cLib_addCalcAngleS(¤t.angle.y, pntAngleY, 8, 0x400, 0x10); shape_angle.y = current.angle.y; cLib_addCalcAngleS(&shape_angle.z, 0, 8, 0x400, 0x10); - unkFloat1 = l_HIO.mFlightSpeed + 20.0f; - if (std::abs(field_0x6f8 - unkFloat1) > 10.0f) { - cLib_chaseF(&field_0x6f8, unkFloat1, 2.0f); + targetFlySpeed = l_HIO.mFlightSpeed + 20.0f; + + if (std::abs(mFlySpeed - targetFlySpeed) > 10.0f) { + cLib_chaseF(&mFlySpeed, targetFlySpeed, 2.0f); } else { - cLib_chaseF(&field_0x6f8, unkFloat1, 1.0f); + cLib_chaseF(&mFlySpeed, targetFlySpeed, 1.0f); } - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + if (field_0x728 == 0) { - setActionMode(4, 0); + setActionMode(ACTION_WAIT_e, 0); } return; } @@ -1229,31 +1252,31 @@ void daKago_c::executeFly() { void daKago_c::executeStagger() { dCamera_c* camera = dCam_getBody(); - cXyz cStack_94 = (Vec)dPath_GetPnt(mpPath1, mPathIdx)->m_position; - cXyz cStack_a0 = (Vec)dPath_GetPnt(mpPath1, mPathIdx - mPathIdxOffset)->m_position; + cXyz nextPntPos = (Vec)dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + cXyz prevPntPos = (Vec)dPath_GetPnt(mpPath1, mPathCurrentPointNo - mPathStep)->m_position; - field_0x714 = cLib_targetAngleY(&cStack_a0, &cStack_94); + field_0x714 = cLib_targetAngleY(&prevPntPos, &nextPntPos); - if (field_0x6e7 == 1) { - dComIfGp_setAStatusForce(0x2a, 0); + if (mType == TYPE_NORMAL) { + dComIfGp_setAStatusForce(BUTTON_STATUS_QUIT, 0); } else { - dComIfGp_setAStatusForce(0x27, 0); + dComIfGp_setAStatusForce(BUTTON_STATUS_UNK_39, 0); } checkHeight(); mIsFlying = true; - switch (field_0x744) { + switch (mMode) { case 0: mSph.OffAtSetBit(); - daPy_getPlayerActorClass()->setPlayerDamage(0, 1); + daPy_getPlayerActorClass()->setPlayerDamage(0, TRUE); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(6)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(YC_JNT_HEAD_e)); mDoMtx_stack_c::multVecZero(&field_0x674); - if (field_0x6e7 == 0) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSound(Z2SE_EN_YC_CRASH, 0, -1); mSound.startCreatureVoice(Z2SE_EN_YC_V_HANGED, -1); } else { @@ -1261,12 +1284,12 @@ void daKago_c::executeStagger() { mSound.startCreatureVoice(Z2SE_EN_KC_V_CRASH, -1); } - setBck(7, 0, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_CRASH_e, 0, 10.0f, 1.0f); field_0x728 = 60; speedF = 30.0f; - if (current.pos.y < cStack_94.y) { + if (current.pos.y < nextPntPos.y) { speed.y = 30.0f; } else { speed.y = -30.0f; @@ -1274,22 +1297,21 @@ void daKago_c::executeStagger() { current.angle.y = field_0x6da - (s16)(current.angle.y - field_0x6da) + 0x8000; - field_0x744 = 4; - + mMode = 4; break; case 1: case 2: mSph.OffAtSetBit(); - daPy_getPlayerActorClass()->setPlayerDamage(0, 1); + daPy_getPlayerActorClass()->setPlayerDamage(0, TRUE); - setBck(15, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); field_0x728 = 10; - field_0x720 = (int)l_HIO.mWallHitInvulnTime; + mWallHitInvulnTimer = (int)l_HIO.mWallHitInvulnTime; speedF = 40.0f; - if (field_0x744 == 1) { + if (mMode == 1) { shape_angle.z = 0x3000; ANGLE_ADD(current.angle.y, -0x2000); if (abs((s16)(current.angle.y - field_0x714)) > 0x2000) { @@ -1306,18 +1328,17 @@ void daKago_c::executeStagger() { mSound.startCreatureSound(Z2SE_EN_YC_HIT_SIDE, 0, -1); dComIfGp_getVibration().StartQuake(1, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - field_0x744 = 5; - + mMode = 5; break; case 3: - daPy_getPlayerActorClass()->setPlayerDamage(2, 1); + daPy_getPlayerActorClass()->setPlayerDamage(2, TRUE); mSph.OffAtSetBit(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(6)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(YC_JNT_HEAD_e)); mDoMtx_stack_c::multVecZero(&field_0x674); - if (field_0x6e7 == 0) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSound(Z2SE_EN_YC_CRASH, 0, -1); mSound.startCreatureVoice(Z2SE_EN_YC_V_HANGED, -1); } else { @@ -1325,14 +1346,13 @@ void daKago_c::executeStagger() { mSound.startCreatureVoice(Z2SE_EN_KC_V_CRASH, -1); } - setBck(7, 0, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_CRASH_e, 0, 10.0f, 1.0f); - field_0x728 = 0x3c; + field_0x728 = 60; speedF = 30.0f; speed.y = -50.0f; - field_0x744 = 6; - + mMode = 6; break; case 5: cLib_addCalcAngleS(&shape_angle.y, current.angle.y, 8, 0x400, 0x40); @@ -1351,28 +1371,27 @@ void daKago_c::executeStagger() { } shape_angle.y = current.angle.y; - field_0x6f8 = 40.0f; + mFlySpeed = 40.0f; - setActionMode(0, 1); + setActionMode(ACTION_FLY_e, 1); dComIfGp_getVibration().StopQuake(0x1f); - break; case 4: case 6: - if (checkBck(7)) { - cXyz cStack_ac; + if (checkBck(dRes_ID_E_YC_BCK_YC_CRASH_e)) { + cXyz line_end; mDoMtx_stack_c::copy(mLegR3Mtx); - mDoMtx_stack_c::multVecZero(&cStack_ac); - cStack_ac.y -= 20.0f; + mDoMtx_stack_c::multVecZero(&line_end); + line_end.y -= 20.0f; - cXyz cStack_b8 = current.pos; - cStack_b8.y += 50.0f; + cXyz line_start = current.pos; + line_start.y += 50.0f; - dBgS_LinChk dStack_88; - dStack_88.Set(&cStack_b8, &cStack_ac, NULL); + dBgS_LinChk linechk; + linechk.Set(&line_start, &line_end, NULL); - if (dComIfG_Bgsp().LineCross(&dStack_88)) { + if (dComIfG_Bgsp().LineCross(&linechk)) { current.pos.y += 5.0f; } @@ -1380,13 +1399,13 @@ void daKago_c::executeStagger() { field_0x728 = 60; - if (mpMorf->checkFrame(22.0f)) { + if (mAnm_p->checkFrame(22.0f)) { setRideOff(); - setBck(8, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_CRASH2_e, 2, 10.0f, 1.0f); } } - if (field_0x744 == 4) { + if (mMode == 4) { cLib_addCalcAngleS(&shape_angle.y, current.angle.y + 0x8000, 8, 0x100, 0x10); } else { cLib_addCalcAngleS(&shape_angle.y, current.angle.y, 8, 0x100, 0x10); @@ -1401,40 +1420,38 @@ void daKago_c::executeStagger() { if (field_0x728 == 0) { setFlyAway(); - field_0x6f8 = -10.0f; + mFlySpeed = -10.0f; } - break; } } void daKago_c::executeWait() { - daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass()->getMidnaActor(); + daMidna_c* midna = daPy_getPlayerActorClass()->getMidnaActor(); if (field_0x728 == 0) { cLib_chaseUC(&field_0x6de, 0, 4); } if (field_0x6df == 0) { - if (player->checkWolfCargoCarrySceneChange()) { - if (field_0x73c == 1) { + if (daPy_py_c::checkWolfCargoCarrySceneChange()) { + if (mSceneType == SCENE_TYPE_RIVER) { createBalloonScore(); if (dComIfGp_getStartStagePoint() == 0) { - mPathIdxOffset = 1; - mPathIdx = 0; + mPathStep = 1; + mPathCurrentPointNo = 0; mPathDir = 1; } else { - mPathIdxOffset = -1; - mPathIdx = mpPath1->m_num + -1; + mPathStep = -1; + mPathCurrentPointNo = mpPath1->m_num + -1; mPathDir = -1; } - old.pos = dPath_GetPnt(mpPath1, mPathIdx)->m_position; - current.pos = old.pos; - mPathIdx += mPathIdxOffset; - field_0x6a4 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; + current.pos = old.pos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + mPathCurrentPointNo += mPathStep; + field_0x6a4 = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; - current.angle.y = shape_angle.y = cLib_targetAngleY((Vec*)¤t, &field_0x6a4); - if (player != NULL) { + current.angle.y = shape_angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); + if (midna != NULL) { setMidnaRideOn(); setPlayerRideOn(); @@ -1442,16 +1459,16 @@ void daKago_c::executeWait() { field_0x6de = 0xff; field_0x6df = 1; - if (mPathDir == 1 && field_0x6e7 == 0 && dComIfGs_isSaveSwitch(9) == 0) { - setActionMode(9, 0); + if (mPathDir == 1 && mType == TYPE_TWILIGHT && !dComIfGs_isSaveSwitch(9)) { + setActionMode(ACTION_DEMO_FLY_e, 0); } else { - setActionMode(10, 0); + setActionMode(ACTION_DEMO_FLY2_e, 0); } setFlyAnime(); moveDemoFly(); } - } else if (field_0x73c == 0 || field_0x73c == 2) { + } else if (mSceneType == SCENE_TYPE_LAKE_HYLIA || mSceneType == SCENE_TYPE_BOARD_HOUSE) { setMidnaRideOn(); setPlayerRideOn(); @@ -1459,30 +1476,29 @@ void daKago_c::executeWait() { field_0x6de = 0xff; field_0x6df = 1; - setActionMode(8, 0); + setActionMode(ACTION_LANDING_e, 0); executeLanding(); } - } - return; } #if DEBUG mPathDir = 1; - if (mDoCPd_c::getHoldL(0) && mDoCPd_c::getHoldR(0) && - mDoCPd_c::getTrigB(0)) + if (mDoCPd_c::getHoldL(PAD_1) && mDoCPd_c::getHoldR(PAD_1) && + mDoCPd_c::getTrigB(PAD_1)) { - setActionMode(2, 0); + setActionMode(ACTION_EVENT_e, 0); - if (field_0x73c == 2) { + if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { setKagoPath(1); } else { setKagoPath(5); - if (field_0x73c == 1) { + if (mSceneType == SCENE_TYPE_RIVER) { createBalloonScore(); + return; } } } @@ -1490,48 +1506,49 @@ void daKago_c::executeWait() { } bool daKago_c::calcAttackMove(int param_0) { - cXyz acStack_20; - cXyz cStack_2c; + cXyz nextPntPos; + cXyz prevPntPos; cXyz cStack_38; - acStack_20 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; - cStack_2c = dPath_GetPnt(mpPath1, mPathIdx - mPathIdxOffset)->m_position; + nextPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + prevPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo - mPathStep)->m_position; - s16 targetAngleY = cLib_targetAngleY(&cStack_2c, &acStack_20); - field_0x714 = targetAngleY; + s16 pntAngleY = cLib_targetAngleY(&prevPntPos, &nextPntPos); + field_0x714 = pntAngleY; if (mpLockActor != NULL) { flySpeedCalcLockOn(); } else { if (param_0 == 0) { - flySpeedCalc(targetAngleY, 1); + flySpeedCalc(pntAngleY, 1); } else { - flySpeedCalc(targetAngleY, 2); + flySpeedCalc(pntAngleY, 2); } } - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); - cStack_38.z = checkNextPath(acStack_20); + cStack_38.z = checkNextPath(nextPntPos); if (cStack_38.z < 0.0f) { - if (abs((s16)(targetAngleY - cLib_targetAngleY(&cStack_2c, ¤t.pos))) < 0x4000) { - mPathIdx += mPathIdxOffset; + if (abs((s16)(pntAngleY - cLib_targetAngleY(&prevPntPos, ¤t.pos))) < 0x4000) { + mPathCurrentPointNo += mPathStep; if (checkFlySceneChange()) { return true; } } } + return false; } void daKago_c::executeAttack() { - field_0x6dd = 1; + mIsAttack = TRUE; - if (field_0x6e7 == 1) { - dComIfGp_setAStatusForce(0x2a, 0); + if (mType == TYPE_NORMAL) { + dComIfGp_setAStatusForce(BUTTON_STATUS_QUIT, 0); } else { - dComIfGp_setAStatusForce(0x27, 0); + dComIfGp_setAStatusForce(BUTTON_STATUS_UNK_39, 0); } checkHeight(); @@ -1543,15 +1560,15 @@ void daKago_c::executeAttack() { setDashSibukiEffect(); } - switch (field_0x744) { + switch (mMode) { case 0: mDashCooldownTime = l_HIO.mDashCooldownTime; mDashTime = l_HIO.mDashTime; - field_0x744 = 1; + mMode = 1; setDashBlurEffect(0); - setBck(11, 0, 5.0f, l_HIO.mDashTimeMultiplier); + setBck(dRes_ID_E_YC_BCK_YC_FLY_DASH_WL_e, 0, 5.0f, l_HIO.mDashTimeMultiplier); dComIfGp_getVibration().StartShock(1, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); @@ -1568,18 +1585,20 @@ void daKago_c::executeAttack() { break; case 1: setDashEffect(); + if (calcAttackMove(0) == 0) { - cLib_chaseF(&field_0x6f8, 30.0f, l_HIO.mDashTimeMultiplier * 3.0f); - if (mpMorf->checkFrame(9.0f)) { - if (field_0x6e7 == 0) { + cLib_chaseF(&mFlySpeed, 30.0f, l_HIO.mDashTimeMultiplier * 3.0f); + if (mAnm_p->checkFrame(9.0f)) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSound(Z2SE_EN_YC_DASH, 0, -1); } else { mSound.startCreatureSound(Z2SE_EN_KC_DASH, 0, -1); } } - if (mpMorf->checkFrame(12.0f)) { - field_0x744 = 2; - field_0x728 = 0x14; + + if (mAnm_p->checkFrame(12.0f)) { + mMode = 2; + field_0x728 = 20; dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); dComIfGp_getVibration().StartQuake(1, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); @@ -1593,15 +1612,15 @@ void daKago_c::executeAttack() { case 2: setDashEffect(); - if (mpMorf->checkFrame(23.0f)) { + if (mAnm_p->checkFrame(23.0f)) { mSph.OnAtSetBit(); } if (calcAttackMove(1) == 0) { - cLib_chaseF(&field_0x6f8, 100.0f, 5.0f); + cLib_chaseF(&mFlySpeed, 100.0f, 5.0f); if (field_0x728 == 0) { - field_0x744 = 3; + mMode = 3; } if (field_0x728 < 10 && checkWallHitFall(0)) { @@ -1617,8 +1636,9 @@ void daKago_c::executeAttack() { break; case 3: setDashEffect(); + if (calcAttackMove(1) == 0) { - cLib_chaseF(&field_0x6f8, 100.0f, 3.0f); + cLib_chaseF(&mFlySpeed, 100.0f, 3.0f); if (checkWallHitFall(0)) { dComIfGp_getVibration().StopQuake(0x1f); @@ -1626,8 +1646,7 @@ void daKago_c::executeAttack() { } else { mDashTime--; if (mDashTime == 0) { - field_0x744 = 4; - + mMode = 4; dComIfGp_getVibration().StopQuake(0x1f); } } @@ -1637,13 +1656,13 @@ void daKago_c::executeAttack() { setDashEffect(); case 5: if (calcAttackMove(0) == 0) { - cLib_chaseF(&field_0x6f8, l_HIO.mFlightSpeed, 5.0f); - if (field_0x6f8 <= l_HIO.mFlightSpeed) { + cLib_chaseF(&mFlySpeed, l_HIO.mFlightSpeed, 5.0f); + if (mFlySpeed <= l_HIO.mFlightSpeed) { mpLockActor = NULL; mSph.OffAtSetBit(); - setActionMode(0, 2); + setActionMode(ACTION_FLY_e, 2); field_0x6c8 = 0; field_0x6c4 = 8000.0f; @@ -1655,56 +1674,57 @@ void daKago_c::executeAttack() { } void daKago_c::calcCircleCamera(int param_0) { - cXyz cStack_20; + cXyz targetPos; mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::XrotM(shape_angle.x); mDoMtx_stack_c::transM(0.0f, 0.0f, 1500.0f); - mDoMtx_stack_c::multVecZero(&cStack_20); + mDoMtx_stack_c::multVecZero(&targetPos); if (param_0 == 0) { - field_0x68c = cStack_20; + mDemoCamCenter = targetPos; } else if (param_0 == 1) { - cLib_addCalcPos(&field_0x68c, cStack_20, 0.1f, field_0x6f8 + 100.0f, + cLib_addCalcPos(&mDemoCamCenter, targetPos, 0.1f, mFlySpeed + 100.0f, 10.0f); } else { - cLib_addCalcPos(&field_0x68c, cStack_20, 0.5f, field_0x6f8 + 30.0f, + cLib_addCalcPos(&mDemoCamCenter, targetPos, 0.5f, mFlySpeed + 30.0f, 10.0f); } + mDoMtx_stack_c::transM(0.0f, 0.0f, -1000.0f); - mDoMtx_stack_c::multVecZero(&cStack_20); + mDoMtx_stack_c::multVecZero(&targetPos); if (param_0 == 0) { - field_0x698 = cStack_20; + mDemoCamEye = targetPos; } else if (param_0 == 1) { - cLib_addCalcPos(&field_0x698, cStack_20, 0.1f, field_0x6f8 + 100.0f, + cLib_addCalcPos(&mDemoCamEye, targetPos, 0.1f, mFlySpeed + 100.0f, 10.0f); } else { - cLib_addCalcPos(&field_0x698, cStack_20, 0.5f, field_0x6f8 + 30.0f, 10.0f); + cLib_addCalcPos(&mDemoCamEye, targetPos, 0.5f, mFlySpeed + 30.0f, 10.0f); } - field_0x6d4 = 60.0f; - dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0); + mDemoCamFovy = 60.0f; + dCam_getBody()->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); } void daKago_c::executeEvent() { dCamera_c* camera = dCam_getBody(); - daPy_py_c* unusedPlayer = daPy_getPlayerActorClass(); + daPy_py_c* player = daPy_getPlayerActorClass(); - if ((field_0x73c == 0) && dComIfG_play_c::getLayerNo(0) == 13 && dComIfGs_isSaveSwitch(0x10)) { - dComIfGs_onSaveSwitch(0x1a); - setActionMode(4, 0); + if (mSceneType == SCENE_TYPE_LAKE_HYLIA && dComIfG_play_c::getLayerNo(0) == 13 && dComIfGs_isSaveSwitch(16)) { + dComIfGs_onSaveSwitch(26); + setActionMode(ACTION_WAIT_e, 0); } else { if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xffff, 3); - eventInfo.onCondition(2); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } else { camera->Stop(); camera->SetTrimSize(3); - field_0x748 = 0; + mDemoMode = 0; field_0x74c = 0; - setActionMode(3, 0); + setActionMode(ACTION_PERCH_e, 0); field_0x6dc = 1; field_0x6de = 0xff; dComIfGs_onSaveSwitch(8); @@ -1718,13 +1738,13 @@ void daKago_c::initPerchDemo() { cXyz midnaPos; fopAc_ac_c* midna = daPy_getPlayerActorClass()->getMidnaActor(); - if (midna != 0) { + if (midna != NULL) { midnaPos = midna->current.pos; } - switch (field_0x748) { + switch (mDemoMode) { case 0: { - Z2GetAudioMgr()->setDemoName(field_0x760); + Z2GetAudioMgr()->setDemoName(mDemoName); field_0x771 = 0; current.pos = dPath_GetPnt(mpPath2, field_0x771)->m_position; @@ -1753,46 +1773,44 @@ void daKago_c::initPerchDemo() { speed.y = 0.0f; speedF = 20.0f; - field_0x72c = 0xb4; + field_0x72c = 180; field_0x728 = field_0x72c + 90; field_0x6e8 = 0; - if ((field_0x73c == 0) && dComIfG_play_c::getLayerNo(0) == 13 && (playerPos.x > -90000.0f)) - { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA && dComIfG_play_c::getLayerNo(0) == 13 && playerPos.x > -90000.0f) { field_0x6e8 = 1; } calcCircleCamera(0); field_0x6e4 = 0; - break; } case 1: { field_0x728 = 90; - field_0x6f8 = 20.0f; + mFlySpeed = 20.0f; break; } case 2: { - if (field_0x73c != 0) { - mPathIdx = searchNearPassPoint(); + if (mSceneType != SCENE_TYPE_LAKE_HYLIA) { + mPathCurrentPointNo = searchNearPassPoint(); } field_0x758 = 1; - if (mPathIdxOffset < 0) { + if (mPathStep < 0) { angleY = angleY + 0x8000; daPy_getPlayerActorClass()->setPlayerPosAndAngle(&playerPos, angleY, 0); - field_0x758 = 0xffffffff; + field_0x758 = -1; } mDoMtx_stack_c::transS(midnaPos); mDoMtx_stack_c::YrotM(angleY); mDoMtx_stack_c::transM(0.0f, 1000.0f, -1000.0f); - mDoMtx_stack_c::multVecZero((Vec*)¤t); + mDoMtx_stack_c::multVecZero(¤t.pos); - setBck(0xc, 2, 0.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_e, 2, 0.0f, 1.0f); mDoMtx_stack_c::transS(midnaPos); mDoMtx_stack_c::YrotM(angleY); @@ -1801,10 +1819,10 @@ void daKago_c::initPerchDemo() { current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); current.angle.x = -cLib_targetAngleX(¤t.pos, &field_0x6a4); - field_0x6f8 = 20.0f; + mFlySpeed = 20.0f; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; @@ -1813,37 +1831,35 @@ void daKago_c::initPerchDemo() { mDoMtx_stack_c::transS(playerPos); mDoMtx_stack_c::YrotM(angleY); mDoMtx_stack_c::transM(-100.0f, 100.0f, -300.0f); - mDoMtx_stack_c::multVecZero(&field_0x68c); + mDoMtx_stack_c::multVecZero(&mDemoCamCenter); mDoMtx_stack_c::transM(100.0f, -100.0f, 300.0f); mDoMtx_stack_c::transM(100.0f, 30.0f, 300.0f); - mDoMtx_stack_c::multVecZero(&field_0x698); + mDoMtx_stack_c::multVecZero(&mDemoCamEye); - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0); + dCam_getBody()->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); field_0x728 = 10; - break; } case 3: { - setBck(9, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_e, 2, 10.0f, 1.0f); setMidnaTagPos(); speedF = speed.y = 0.0f; field_0x728 = 30; - break; } case 4: { - setBck(0xf, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); - if (field_0x73c == 0) { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA) { field_0x6a4.set(-90000.0f, -16000.0f, 40000.0f); } else { - field_0x6a4 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; + field_0x6a4 = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; } setMidnaRideOn(); @@ -1851,15 +1867,14 @@ void daKago_c::initPerchDemo() { dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - field_0x744 = 1; + mMode = 1; field_0x728 = 30; - break; } } field_0x74c = 1; - field_0x744 = 0; + mMode = 0; } bool daKago_c::executePerchDemo() { @@ -1870,17 +1885,17 @@ bool daKago_c::executePerchDemo() { daMidna_c* midna = daPy_getPlayerActorClass()->getMidnaActor(); s16 midnaYaw; - if (midna != 0) { + if (midna != NULL) { midnaPos = midna->current.pos; midnaYaw = midna->shape_angle.y; } field_0x750++; - switch (field_0x748) { + switch (mDemoMode) { case 0: { calcCircleCamera(1); - if ((field_0x750 & 0x20) != 0) { + if (field_0x750 & 0x20) { cLib_chaseF(&field_0x6fc, 3.0f, 0.3f); } else { cLib_chaseF(&field_0x6fc, -3.0f, 0.3f); @@ -1900,7 +1915,7 @@ bool daKago_c::executePerchDemo() { cLib_addCalcAngleS(&shape_angle.y, current.angle.y, 0x20, 0x100, 0x40); } else { if (field_0x754 == 0) { - if (field_0x6e7 == 1) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -1914,57 +1929,55 @@ bool daKago_c::executePerchDemo() { } if (field_0x728 == 0) { - field_0x748 = 1; + mDemoMode = 1; return true; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); - break; } case 1: { calcCircleCamera(2); cLib_addCalcAngleS(&shape_angle.x, -cLib_targetAngleX(¤t.pos, &playerPos), 4, 0x400, 0x40); - cLib_addCalcAngleS(&shape_angle.y, cLib_targetAngleY((Vec*)¤t, &playerPos), 4, 0x200, 0x40); + cLib_addCalcAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, &playerPos), 4, 0x200, 0x40); current.angle.y = shape_angle.y; current.angle.x = shape_angle.x; - cLib_chaseF(&field_0x6f8, 60.0f, 1.0f); + cLib_chaseF(&mFlySpeed, 60.0f, 1.0f); - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (current.pos.abs(playerPos) < 2000.0f) { - field_0x748 = 2; + mDemoMode = 2; return true; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); - break; } case 2: { if (field_0x6e4 == 0) { - if (field_0x73c == 0) { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4); - } else if (field_0x73c == 2) { + } else if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 5); } } - if (field_0x744 == 0) { + if (mMode == 0) { current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); current.angle.x = -cLib_targetAngleX(¤t.pos, &field_0x6a4); - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 != 0) { shape_angle.x = current.angle.x; if (field_0x728 == 1) { - if (field_0x6e7 == 1) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -1976,9 +1989,9 @@ bool daKago_c::executePerchDemo() { shape_angle.y = current.angle.y; if (field_0x6a4.abs(current.pos) < 300.0f) { - field_0x744 = 1; + mMode = 1; - setBck(0x15, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_HOVERING_e, 2, 10.0f, 1.0f); field_0x728 = 60; @@ -1988,16 +2001,16 @@ bool daKago_c::executePerchDemo() { mDoMtx_stack_c::multVecZero(&field_0x6a4); } } else { - cLib_chaseF(&field_0x6f8, 0.0f, 1.0f); + cLib_chaseF(&mFlySpeed, 0.0f, 1.0f); cLib_addCalcAngleS(¤t.angle.y, cLib_targetAngleY(¤t.pos, &field_0x6a4), 4, 0x400, 0x100); cLib_addCalcAngleS(¤t.angle.x, 0, 4, 0x100, 0x80); cLib_addCalcAngleS(&shape_angle.x, 0, 4, 0x100, 0x80); shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - if (!field_0x6f8 && field_0x728 == 0) { - field_0x748 = 3; + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + if (!mFlySpeed && field_0x728 == 0) { + mDemoMode = 3; return true; } } @@ -2006,23 +2019,22 @@ bool daKago_c::executePerchDemo() { mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(0.0f, 400.0f, -300.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 5.0f, 5.0f); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 5.0f, 5.0f); mDoMtx_stack_c::transS(playerPos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(100.0f, 30.0f, 300.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 20.0f, 10.0f); - - dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 20.0f, 10.0f); + dCam_getBody()->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); break; } case 3: { if (field_0x6e4 == 0) { - if (field_0x73c == 0) { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4); - } else if (field_0x73c == 2) { + } else if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 5); } } @@ -2031,34 +2043,33 @@ bool daKago_c::executePerchDemo() { mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(0.0f, 100.0f, 0.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 20.0f, 10.0f); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 20.0f, 10.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(300.0f, 50.0f, 500.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 20.0f, 10.0f); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 20.0f, 10.0f); - cLib_chaseF(&field_0x6d4, 70.0f, 1.0f); + cLib_chaseF(&mDemoCamFovy, 70.0f, 1.0f); - dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0); + dCam_getBody()->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); cLib_addCalcAngleS(¤t.angle.x, 0, 4, 0x400, 0x100); shape_angle.x = current.angle.x; if (field_0x728 == 0) { - field_0x748 = 4; + mDemoMode = 4; return true; } - break; } case 4: { if (field_0x6e4 == 0) { - if (field_0x73c == 0) { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4); - } else if (field_0x73c == 2) { + } else if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 6); } } @@ -2066,22 +2077,20 @@ bool daKago_c::executePerchDemo() { if (PerchDemoAwayForward()) { return true; } - break; } case 5: { f32 maxStep = field_0x6cc * 50.0f; f32 minStep = field_0x6cc * 10.0f; cLib_chaseF(&field_0x6cc, 0.0f, 0.05f); - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, maxStep, minStep); + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, maxStep, minStep); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(0.0f, 50.0f, -800.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, maxStep, minStep); - cLib_chaseF(&field_0x6d4, 70.0f, 1.0f); - dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0); - + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, maxStep, minStep); + cLib_chaseF(&mDemoCamFovy, 70.0f, 1.0f); + dCam_getBody()->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); break; } case 6: @@ -2092,7 +2101,6 @@ bool daKago_c::executePerchDemo() { } bool daKago_c::PerchDemoAwayForward() { - cXyz playerPos = daPy_getPlayerActorClass()->current.pos; s16 playerYaw = daPy_getPlayerActorClass()->shape_angle.y; @@ -2108,58 +2116,58 @@ bool daKago_c::PerchDemoAwayForward() { midnaYaw = midna->shape_angle.y; } - switch (field_0x744) { + switch (mMode) { case 0: case 1: { f32 unusedFloat1 = 20.0f; f32 unusedFloat2 = 10.0f; - field_0x68c += speed; - field_0x698 += speed; + mDemoCamCenter += speed; + mDemoCamEye += speed; mDoMtx_stack_c::transS(midnaPos); mDoMtx_stack_c::YrotM(playerYaw); - if (field_0x744 == 0) { + if (mMode == 0) { mDoMtx_stack_c::transM(0.0f, 100.0f, 0.0f); } else { mDoMtx_stack_c::transM(0.0f, -200.0f, 0.0f); } mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 5.0f); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 5.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); - if (field_0x744 == 0) { + if (mMode == 0) { mDoMtx_stack_c::transM(300.0f, 50.0f, 500.0f); } else { mDoMtx_stack_c::transM(500.0f, 50.0f, 0.0f); } mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 10.0f, 5.0f); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 10.0f, 5.0f); - cLib_chaseF(&field_0x6d4, 70.0f, 1.0f); + cLib_chaseF(&mDemoCamFovy, 70.0f, 1.0f); - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); mGroundHeight = checkGroundHeight(current.pos, NULL); mRoofHeight = checkRoofHeight(current.pos); - cLib_chaseF(&field_0x6f8, 30.0f, 1.0f); + cLib_chaseF(&mFlySpeed, 30.0f, 1.0f); cLib_addCalcAngleS(¤t.angle.x, 0, 8, 0x200, 0x80); shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - if (field_0x744 == 0) { + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + if (mMode == 0) { cLib_addCalcAngleS(&shape_angle.x, 0x2000, 8, 0x200, 0x40); } else { cLib_addCalcAngleS(&shape_angle.x, 0, 8, 0x200, 0x40); } - if (field_0x728 == 0x14 && field_0x744 == 0) { - if (field_0x6e7 == 1) { + if (field_0x728 == 20 && mMode == 0) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -2167,90 +2175,89 @@ bool daKago_c::PerchDemoAwayForward() { } if (field_0x728 == 0) { - if (field_0x744 == 0) { - field_0x744 = 1; - field_0x728 = 0x1e; + if (mMode == 0) { + mMode = 1; + field_0x728 = 30; setPlayerRideOn(); dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - } else if (field_0x73c != 0) { + } else if (mSceneType != SCENE_TYPE_LAKE_HYLIA) { field_0x728 = 60; - field_0x744 = 2; + mMode = 2; } else { field_0x728 = 90; - field_0x744 = 3; + mMode = 3; field_0x6cc = 1.0f; } } - break; } case 2: { if (field_0x728 > 10) { - field_0x68c += speed; - field_0x698 += speed; + mDemoCamCenter += speed; + mDemoCamEye += speed; - s16 targetYaw = cLib_targetAngleY(&field_0x698, &field_0x68c); + s16 targetYaw = cLib_targetAngleY(&mDemoCamEye, &mDemoCamCenter); if (abs((s16)(midnaYaw - targetYaw)) < 0x2000) { - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 5.0f, 10.0f); + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, 5.0f, 10.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(0.0f, 50.0f, -800.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 20.0f, 10.0f); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 20.0f, 10.0f); } else { - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 5.0f, 10.0f); + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, 5.0f, 10.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(300.0f, 50.0f, -500.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 20.0f, 10.0f); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 20.0f, 10.0f); } } else { - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 50.0f, 10.0f); + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, 50.0f, 10.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(0.0f, 50.0f, -800.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 50.0f, 10.0f); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 50.0f, 10.0f); } - cLib_chaseF(&field_0x6d4, 70.0f, 1.0f); - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + cLib_chaseF(&mDemoCamFovy, 70.0f, 1.0f); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); mGroundHeight = checkGroundHeight(current.pos, NULL); mRoofHeight = checkRoofHeight(current.pos); - cLib_chaseF(&field_0x6f8, l_HIO.mFlightSpeed, 2.0f); + cLib_chaseF(&mFlySpeed, l_HIO.mFlightSpeed, 2.0f); if (field_0x728 < 30) { cLib_addCalcAngleS(¤t.angle.x, 0, 8, 0x100, 0x40); } else { - cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x40); + cLib_addCalcAngleS(¤t.angle.x, -0x2000, 8, 0x100, 0x40); } shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 == 0) { - if (field_0x73c == 2) { + if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { if (setSceneChange(3)) { - field_0x748 = 5; + mDemoMode = 5; field_0x6cc = 1.0f; } } else { field_0x6dc = 0; - setActionMode(0, 0); + setActionMode(ACTION_FLY_e, 0); - camera->Reset(field_0x68c, field_0x698); + camera->Reset(mDemoCamCenter, mDemoCamEye); camera->Start(); camera->SetTrimSize(0); @@ -2259,37 +2266,35 @@ bool daKago_c::PerchDemoAwayForward() { Z2GetAudioMgr()->setDemoName(NULL); } } - break; } case 3: { cLib_chaseF(&field_0x6cc, 0.0f, 0.1f); - field_0x68c += speed; - field_0x698 += speed * field_0x6cc; + mDemoCamCenter += speed; + mDemoCamEye += speed * field_0x6cc; unkXyz1.set(playerPos.x, playerPos.y + 100.0f, playerPos.z); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 3.0f); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 3.0f); - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); - cLib_chaseF(&field_0x6f8, 30.0f, 1.0f); + cLib_chaseF(&mFlySpeed, 30.0f, 1.0f); - cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x40); + cLib_addCalcAngleS(¤t.angle.x, -0x2000, 8, 0x100, 0x40); shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 == 0) { - setActionMode(7, 0); - field_0x748 = 8; + setActionMode(ACTION_PERCH2_e, 0); + mDemoMode = 8; return true; } - break; } } @@ -2310,14 +2315,14 @@ void daKago_c::executePerch() { void daKago_c::executeEvent2() { dCamera_c* camera = dCam_getBody(); if (!eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(this,2,0xffff,3); + fopAcM_orderPotentialEvent(this, 2, 0xffff, 3); eventInfo.onCondition(2); } else { camera->Stop(); camera->SetTrimSize(3); - field_0x748 = 0; + mDemoMode = 0; field_0x74c = 0; - setActionMode(7,0); + setActionMode(ACTION_PERCH2_e, 0); field_0x6dc = 1; field_0x6de = 0xff; } @@ -2327,47 +2332,51 @@ void daKago_c::initFirstDemo() { dCamera_c* camera = dCam_getBody(); cXyz acStack_28; cXyz cStack_34; + daPy_py_c* player = daPy_getPlayerActorClass(); s16 playerYaw = player->shape_angle.y; cXyz playerPos = player->current.pos; + daMidna_c* midna = daPy_py_c::getMidnaActor(); cXyz midnaPos; - if (midna != 0) { + if (midna != NULL) { midnaPos = midna->current.pos; } s16 targetYaw; - switch (field_0x748) { + switch (mDemoMode) { case 0: { - Z2GetAudioMgr()->setDemoName(field_0x760); - field_0x718 = -0x800; + Z2GetAudioMgr()->setDemoName(mDemoName); + mHeadRotZ = -0x800; player->changeOriginalDemo(); - player->changeDemoMode(0x17, 0, 0, 0); + player->changeDemoMode(daPy_demo_c::DEMO_UNK_23_e, 0, 0, 0); + playerPos.set(-103292.0f, -23437.0f, 39925.0f); field_0x6a4.set(-60000.0f, -11000.0f, 28000.0f); shape_angle.y = current.angle.y = cLib_targetAngleY(&playerPos, &field_0x6a4); cStack_34.set(-300.0f, 400.0f, -1000.0f); cLib_offsetPos(¤t.pos, &playerPos, shape_angle.y, &cStack_34); targetYaw = cLib_targetAngleY(&playerPos, ¤t.pos); + player->setPlayerPosAndAngle(&playerPos, targetYaw, 0); if (midna != NULL) { midna->current.pos = playerPos; midnaPos = midna->current.pos; } + field_0x680.set(0.0f, 0.0f, 0.0f); - field_0x68c = current.pos; + mDemoCamCenter = current.pos; field_0x6bc = 0x3000; field_0x6cc = 500.0f; field_0x6d0 = 400.0f; cStack_34.set(0.0f, field_0x6d0, field_0x6cc); - cLib_offsetPos(&field_0x698, ¤t.pos, shape_angle.y + field_0x6bc, - &cStack_34); - field_0x6d4 = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); - field_0x728 = 0xa0; - setBck(15, 2, 10.0f, 1.0f); - field_0x6e4 = 0; + cLib_offsetPos(&mDemoCamEye, ¤t.pos, shape_angle.y + field_0x6bc, &cStack_34); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); + field_0x728 = 160; + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); + field_0x6e4 = 0; break; } case 1: { @@ -2375,37 +2384,33 @@ void daKago_c::initFirstDemo() { midna->current.pos = playerPos; midnaPos = midna->current.pos; } - field_0x68c = current.pos; + + mDemoCamCenter = current.pos; field_0x6bc = 0x800; field_0x6cc = 700.0f; cStack_34.set(0.0f, 0.0f, field_0x6cc); - cLib_offsetPos(&field_0x698, ¤t.pos, shape_angle.y + field_0x6bc, - &cStack_34); - field_0x6d4 = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); - field_0x728 = 0x50; - + cLib_offsetPos(&mDemoCamEye, ¤t.pos, shape_angle.y + field_0x6bc, &cStack_34); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); + field_0x728 = 80; break; } case 2: { field_0x728 = 60; mMsgFlow.init(this, 0x7d3, 0, NULL); - break; } case 3: { - field_0x718 = cLib_targetAngleX(¤t.pos, &playerPos) / 4; + mHeadRotZ = cLib_targetAngleX(¤t.pos, &playerPos) / 4; targetYaw = cLib_targetAngleY(¤t.pos, &playerPos) - shape_angle.y; - field_0x71a = targetYaw / 4; + mHeadRotY = targetYaw / 4; cStack_34.set(50.0f, 150.0f, -200.0f); - cLib_offsetPos(&field_0x698, &midnaPos, shape_angle.y, &cStack_34); + cLib_offsetPos(&mDemoCamEye, &midnaPos, shape_angle.y, &cStack_34); cStack_34.set(50.0f, 0.0f, 50.0f); - cLib_offsetPos(&field_0x68c, &midnaPos, shape_angle.y, &cStack_34); - field_0x6d4 = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); - targetYaw = cLib_targetAngleY(&playerPos, (Vec*)¤t); - player->setPlayerPosAndAngle(&playerPos, targetYaw, 0); - + cLib_offsetPos(&mDemoCamCenter, &midnaPos, shape_angle.y, &cStack_34); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); + player->setPlayerPosAndAngle(&playerPos, cLib_targetAngleY(&playerPos, ¤t.pos), 0); break; } case 4: { @@ -2416,8 +2421,7 @@ void daKago_c::initFirstDemo() { mDoMtx_stack_c::YrotM(field_0x6bc); mDoMtx_stack_c::transM(0.0f, 300.0f, field_0x6cc); mDoMtx_stack_c::multVecZero(&field_0x6a4); - field_0x6f8 = 0.0f; - + mFlySpeed = 0.0f; break; } case 5: { @@ -2426,68 +2430,66 @@ void daKago_c::initFirstDemo() { mDoMtx_stack_c::YrotM(field_0x6bc); mDoMtx_stack_c::transM(0.0f, 300.0f, 200.0f); mDoMtx_stack_c::multVecZero(&field_0x6a4); - break; } case 6: { player->cancelOriginalDemo(); setPlayerRideOn(); dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - field_0x728 = 0x96; + field_0x728 = 150; field_0x6cc = 1.0f; - break; } case 7: { field_0x6e8 = 0; } case 8: { - setBck(15, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); + if (field_0x6e8 != 0) { - mpMorf->setFrame(0.0f); + mAnm_p->setFrame(0.0f); field_0x6a4.set(-67000.0f, -13000.0f, 28000.0f); current.pos.set(-76600.0f, -15500.0f, 37340.0f); shape_angle.y = current.angle.y = -0x8000; shape_angle.x = current.angle.x = -0x1000; - field_0x6f8 = 50.0f; - field_0x698.set(-75232.0f, -14685.0f, 34417.0f); - field_0x68c.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); - field_0x6d4 = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + mFlySpeed = 50.0f; + mDemoCamEye.set(-75232.0f, -14685.0f, 34417.0f); + mDemoCamCenter.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); field_0x728 = 200; } else { field_0x6a4.set(-60000.0f, -11000.0f, 28000.0f); current.pos.set(-90000.0f, -16000.0f, 40000.0f); shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); shape_angle.x = current.angle.x = -0x2000; - field_0x6f8 = 50.0f; + mFlySpeed = 50.0f; cStack_34.set(-500.0f, 1000.0f, 5000.0f); - cLib_offsetPos(&field_0x698, ¤t.pos, shape_angle.y, &cStack_34); - field_0x68c.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); - field_0x6d4 = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + cLib_offsetPos(&mDemoCamEye, ¤t.pos, shape_angle.y, &cStack_34); + mDemoCamCenter.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); field_0x728 = 200; } - break; } } field_0x74c = 1; - field_0x744 = 0; + mMode = 0; } bool daKago_c::executeFirstDemo() { dCamera_c* camera = dCam_getBody(); cXyz unkXyz1; - cXyz unkXyz2; + cXyz offset; cXyz midnaPos; daPy_py_c* player = daPy_getPlayerActorClass(); daMidna_c* midna = daPy_py_c::getMidnaActor(); - if (midna != 0) { + if (midna != NULL) { midnaPos = midna->current.pos; } @@ -2495,8 +2497,8 @@ bool daKago_c::executeFirstDemo() { cXyz playerPos = player->current.pos; int unkFlag1; - int switchVal = field_0x748; - switch (switchVal) { + int mode = mDemoMode; // fakematch + switch (mode) { case 0: dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); @@ -2504,21 +2506,21 @@ bool daKago_c::executeFirstDemo() { cLib_chaseF(&field_0x6cc, 1250.0f, 6.7f); cLib_chaseF(&field_0x6d0, -400.0f, 7.1f); - unkXyz2.set(0.0f, field_0x6d0, field_0x6cc); - cLib_offsetPos(&field_0x698, ¤t.pos, shape_angle.y + field_0x6bc, &unkXyz2); + offset.set(0.0f, field_0x6d0, field_0x6cc); + cLib_offsetPos(&mDemoCamEye, ¤t.pos, shape_angle.y + field_0x6bc, &offset); unkXyz1.set(0.0f, -200.0f, 400.0f); cLib_chasePos(&field_0x680, unkXyz1, 4.0f); - cLib_offsetPos(&field_0x68c, ¤t.pos, shape_angle.y, &field_0x680); + cLib_offsetPos(&mDemoCamCenter, ¤t.pos, shape_angle.y, &field_0x680); - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); if (field_0x728 < 10) { setMidnaTagPos(); if (field_0x728 == 0) { - field_0x748 = 1; + mDemoMode = 1; return 1; } } @@ -2529,35 +2531,35 @@ bool daKago_c::executeFirstDemo() { cLib_chaseAngleS(&field_0x6bc, 0x1000, 0x20); - unkXyz2.set(0.0f, 0.0f, field_0x6cc); - cLib_offsetPos(&field_0x698, ¤t.pos, shape_angle.y + field_0x6bc, &unkXyz2); + offset.set(0.0f, 0.0f, field_0x6cc); + cLib_offsetPos(&mDemoCamEye, ¤t.pos, shape_angle.y + field_0x6bc, &offset); - if (field_0x728 < 0x46) { - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 10.0f, 10.0f); + if (field_0x728 < 70) { + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, 10.0f, 10.0f); } else { - field_0x68c = current.pos; + mDemoCamCenter = current.pos; } - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); setMidnaTagPos(); if (field_0x728 == 30) { - setBck(0x14, 0x02, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_HANGED_WAIT_e, 2, 10.0f, 1.0f); } if (field_0x728 > 30) { cLib_chaseF(&field_0x6cc, 350.0f, 4.0f); - cLib_addCalcAngleS(&field_0x718, -2048, 8, 0x100, 0x10); + cLib_addCalcAngleS(&mHeadRotZ, -0x800, 8, 0x100, 0x10); } else { cLib_chaseF(&field_0x6cc, 350.0f, 6.0f); - cLib_addCalcAngleS(&field_0x718, 0x400, 8, 0x200, 0x10); + cLib_addCalcAngleS(&mHeadRotZ, 0x400, 8, 0x200, 0x10); if (field_0x728 == 30) { setMidnaRideOn(); } - if (field_0x728 == 0x14) { - if (field_0x6e7 == 1) { + if (field_0x728 == 20) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -2565,7 +2567,7 @@ bool daKago_c::executeFirstDemo() { } if (field_0x728 == 0) { - field_0x748 = 2; + mDemoMode = 2; return true; } @@ -2575,25 +2577,24 @@ bool daKago_c::executeFirstDemo() { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 3); setMidnaTagPos(); - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 10.0f, 10.0f); - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, 10.0f, 10.0f); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); mMsgFlow.doFlow(this, NULL, 0); if (field_0x728 != 0) { if (field_0x728 == 1) { - setBck(0xf, 0x02, 20.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 20.0f, 1.0f); } if (mMsgFlow.getNowMsgNo() == 0x1774) { - setBck(0xf, 0x02, 20.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 20.0f, 1.0f); field_0x728 = 0; } } if (mMsgFlow.getNowMsgNo() == 0x1775) { - field_0x748 = 3; - + mDemoMode = 3; return true; } @@ -2603,18 +2604,17 @@ bool daKago_c::executeFirstDemo() { setMidnaTagPos(); cLib_addCalcAngleS( - &field_0x718, cLib_targetAngleX(¤t.pos, &playerPos) / 4, + &mHeadRotZ, cLib_targetAngleX(¤t.pos, &playerPos) / 4, 8, 0x100, 0x10); // adding braces to the switch case for this decl regresses debug match s16 targetYaw = cLib_targetAngleY(¤t.pos, &playerPos) - shape_angle.y; cLib_addCalcAngleS( - &field_0x71a, targetYaw / 4, + &mHeadRotY, targetYaw / 4, 8, 0x100, 0x10); if (mMsgFlow.doFlow(this, NULL, 0)) { - field_0x748 = 4; - + mDemoMode = 4; return true; } @@ -2623,8 +2623,8 @@ bool daKago_c::executeFirstDemo() { case 4: dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); - cLib_addCalcAngleS(&field_0x718, 0, 8, 0x100, 0x10); - cLib_addCalcAngleS(&field_0x71a, 0, 8, 0x100, 0x10); + cLib_addCalcAngleS(&mHeadRotZ, 0, 8, 0x100, 0x10); + cLib_addCalcAngleS(&mHeadRotY, 0, 8, 0x100, 0x10); cLib_chaseF(&field_0x6cc, -300.0f, 10.0f); @@ -2638,27 +2638,27 @@ bool daKago_c::executeFirstDemo() { shape_angle.y = current.angle.y; shape_angle.x = current.angle.x; - cLib_chaseF(&field_0x6f8, 20.0f, 1.0f); + cLib_chaseF(&mFlySpeed, 20.0f, 1.0f); - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - field_0x68c += speed; - field_0x698 += speed; + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + mDemoCamCenter += speed; + mDemoCamEye += speed; - unkXyz2.set(0.0f, 200.0f, -500.0f); - cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 10.0f, 3.0f); - unkXyz2.set(0.0f, 0.0f, 0.0f); + offset.set(0.0f, 200.0f, -500.0f); + cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(0.0f, 0.0f, 0.0f); - cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 3.0f); + cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 3.0f); - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); if (field_0x6a4.abs(current.pos) < 100.0f) { - field_0x748 = 5; + mDemoMode = 5; return true; } @@ -2671,87 +2671,84 @@ bool daKago_c::executeFirstDemo() { shape_angle.y = current.angle.y; shape_angle.x = current.angle.x; - cLib_chaseF(&field_0x6f8, 20.0f, 1.0f); - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); + cLib_chaseF(&mFlySpeed, 20.0f, 1.0f); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - field_0x68c += speed; - field_0x698 += speed; + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + mDemoCamCenter += speed; + mDemoCamEye += speed; - unkXyz2.set(400.0f, 50.0f, -300.0f); - cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(400.0f, 50.0f, -300.0f); + cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 10.0f, 3.0f); - unkXyz2.set(0.0f, 50.0f, 0.0f); - cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(0.0f, 50.0f, 0.0f); + cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 3.0f); - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); if (field_0x6a4.abs(current.pos) < 100.0f) { - field_0x748 = 6; - + mDemoMode = 6; return true; } break; case 6: dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); - cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x40); + cLib_addCalcAngleS(¤t.angle.x, -0x2000, 8, 0x100, 0x40); shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 > 120) { - field_0x68c += speed; - field_0x698 += speed; + mDemoCamCenter += speed; + mDemoCamEye += speed; - unkXyz2.set(400.0f, 100.0f, -300.0f); - cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(400.0f, 100.0f, -300.0f); + cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 10.0f, 3.0f); - unkXyz2.set(0.0f, 100.0f, 0.0f); - cLib_offsetPos(&unkXyz1, &playerPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(0.0f, 100.0f, 0.0f); + cLib_offsetPos(&unkXyz1, &playerPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 3.0f); } else { cLib_chaseF(&field_0x6cc, 0.0f, 0.1f); - field_0x68c += speed; - field_0x698 += speed * field_0x6cc; + mDemoCamCenter += speed; + mDemoCamEye += speed * field_0x6cc; - unkXyz2.set(0.0f, 100.0f, 0.0f); - cLib_offsetPos(&unkXyz1, &playerPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(0.0f, 100.0f, 0.0f); + cLib_offsetPos(&unkXyz1, &playerPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 3.0f); } - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); if (field_0x728 == 0) { - field_0x748 = 7; - + mDemoMode = 7; return true; } - break; case 7: case 8: unkFlag1 = 0; - if (switchVal == 7 || field_0x6e8 == 0) { + if (mode == 7 || field_0x6e8 == 0) { if (field_0x728 == 110) { unkFlag1 = 1; } - } else if (switchVal == 8 && field_0x728 == 140) { + } else if (mode == 8 && field_0x728 == 140) { unkFlag1 = 1; } if (unkFlag1 != 0) { - if (field_0x6e7 == 1) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -2761,8 +2758,8 @@ bool daKago_c::executeFirstDemo() { if (field_0x728 != 0) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); } else { - if (field_0x73c == 0 && setSceneChange(0)) { - field_0x748 = 9; + if (mSceneType == SCENE_TYPE_LAKE_HYLIA && setSceneChange(0)) { + mDemoMode = 9; } } case 9: @@ -2771,16 +2768,15 @@ bool daKago_c::executeFirstDemo() { shape_angle.y = current.angle.y; shape_angle.x = current.angle.x; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); - unkXyz2.set(0.0f, 100.0f, 0.0f); - cLib_offsetPos(&field_0x68c, ¤t.pos, shape_angle.y, &unkXyz2); + offset.set(0.0f, 100.0f, 0.0f); + cLib_offsetPos(&mDemoCamCenter, ¤t.pos, shape_angle.y, &offset); - field_0x6d4 = 70.0f; - - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); break; } @@ -2802,13 +2798,13 @@ void daKago_c::executeLandingLakeHairia() { cXyz unkXyz1; cXyz unkXyz2(-700.0f, 0.0f, -300.0f); - switch (field_0x744) { + switch (mMode) { case 0: current.pos.set(-74500.0f, -12775.0f, 31400.0f); if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xffff, 3); - eventInfo.onCondition(2); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } @@ -2816,38 +2812,37 @@ void daKago_c::executeLandingLakeHairia() { camera->SetTrimSize(3); current.pos.set(-74500.0f, -12775.0f, 31400.0f); - field_0x698.set(-79460.0f, -13000.0f, 34200.0f); - field_0x68c = current.pos; + mDemoCamEye.set(-79460.0f, -13000.0f, 34200.0f); + mDemoCamCenter = current.pos; - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - current.angle.x = 0; - shape_angle.x = 0; - shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x698); + shape_angle.x = current.angle.x = 0; + shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &mDemoCamEye); field_0x716 = shape_angle.y + 0x2000; field_0x6a4.set(-77615.0f, -18500.0f, 41400.0f); field_0x6a4 += unkXyz2; - field_0x744 = 1; + mMode = 1; field_0x712 = 0; field_0x728 = 150; - field_0x6f8 = 50.0f; + mFlySpeed = 50.0f; break; case 1: - Z2GetAudioMgr()->setDemoName(field_0x760); - field_0x744 = 2; + Z2GetAudioMgr()->setDemoName(mDemoName); + mMode = 2; case 2: - if (field_0x728 == 0x8c) { - if (field_0x6e7 == 0x01) { + if (field_0x728 == 140) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); } } - field_0x68c = current.pos; + mDemoCamCenter = current.pos; cLib_chaseAngleS(&field_0x712, 0x80, 4); @@ -2856,17 +2851,16 @@ void daKago_c::executeLandingLakeHairia() { cLib_chaseAngleS(&shape_angle.x, 0x1000, 0x20); current.angle.x = shape_angle.x; - field_0x6f8 = 50.0f; + mFlySpeed = 50.0f; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 == 0) { - field_0x744 = 3; + mMode = 3; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7); - break; case 3: current.pos.set(-76600.0f, -15500.0f, 37340.0f); @@ -2875,37 +2869,36 @@ void daKago_c::executeLandingLakeHairia() { field_0x6a4.set(-77615.0f, -18500.0f, 41400.0f); field_0x6a4 += unkXyz2; - field_0x698.set(-76900.0f, -18550.0f, 41660.0f); - field_0x698 += unkXyz2; + mDemoCamEye.set(-76900.0f, -18550.0f, 41660.0f); + mDemoCamEye += unkXyz2; - field_0x68c = current.pos; + mDemoCamCenter = current.pos; - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; shape_angle.x = current.angle.x = -cLib_targetAngleX(¤t.pos, &field_0x6a4); shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); - field_0x744 = 4; + mMode = 4; field_0x728 = 60; - setBck(13, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e, 2, 10.0f, 1.0f); case 4: - field_0x68c = current.pos; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + mDemoCamCenter = current.pos; + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 == 0) { - field_0x744 = 5; - field_0x728 = 0x28; + mMode = 5; + field_0x728 = 40; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7); - break; case 5: - field_0x68c = current.pos; + mDemoCamCenter = current.pos; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); cLib_chaseAngleS(&shape_angle.x, 0, 0x80); current.angle.x = shape_angle.x; @@ -2913,10 +2906,10 @@ void daKago_c::executeLandingLakeHairia() { if (field_0x728 == 0) { setRideOff(); - field_0x744 = 6; + mMode = 6; field_0x728 = 100; - setBck(0xf, 0x02, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); } else { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7); } @@ -2927,28 +2920,29 @@ void daKago_c::executeLandingLakeHairia() { case 6: unkXyz1.set(-77875.0f, -18287.0f, 42000.0f); unkXyz1 += unkXyz2; - cLib_chasePos(&field_0x68c, unkXyz1, field_0x6cc); - if (field_0x68c.abs(unkXyz1) < 500.0f) { + cLib_chasePos(&mDemoCamCenter, unkXyz1, field_0x6cc); + if (mDemoCamCenter.abs(unkXyz1) < 500.0f) { cLib_chaseF(&field_0x6cc, 0.0f, 3.0f); } unkXyz1.set(-77275.0f, -18500.0f, 41090.0f); unkXyz1 += unkXyz2; - cLib_chasePos(&field_0x698, unkXyz1, field_0x6d0); - if (field_0x698.abs(unkXyz1) < 200.0f) { + cLib_chasePos(&mDemoCamEye, unkXyz1, field_0x6d0); + + if (mDemoCamEye.abs(unkXyz1) < 200.0f) { cLib_chaseF(&field_0x6d0, 0.0f, 1.0f); } else { cLib_chaseF(&field_0x6d0, 20.0f, 1.0f); } - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); - cLib_chaseAngleS(&shape_angle.x, -8192, 0x100); + cLib_chaseAngleS(&shape_angle.x, -0x2000, 0x100); current.angle.x = shape_angle.x; if (field_0x728 == 90) { - if (field_0x6e7 == 0x01) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -2956,7 +2950,7 @@ void daKago_c::executeLandingLakeHairia() { } if (field_0x728 == 0) { - setActionMode(4, 0); + setActionMode(ACTION_WAIT_e, 0); camera->Reset(); camera->Start(); @@ -2965,91 +2959,87 @@ void daKago_c::executeLandingLakeHairia() { dComIfGp_event_reset(); Z2GetAudioMgr()->setDemoName(NULL); - return; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 8); } - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); } void daKago_c::executeLandingBoartHouse() { dCamera_c* camera = dCam_getBody(); cXyz unkXyz1; - switch (field_0x744) { + switch (mMode) { case 0: { current.pos.set(5750.0f, 1600.0f, 6100.0f); if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xffff, 3); eventInfo.onCondition(2); - return; } camera->Stop(); camera->SetTrimSize(3); - field_0x744 = 10; - + mMode = 10; break; } case 10: { - Z2GetAudioMgr()->setDemoName(field_0x760); + Z2GetAudioMgr()->setDemoName(mDemoName); current.pos.set(5750.0f, 1600.0f, 6100.0f); - setBck(0xf, 0x02, 10.0f, 1.0f); - field_0x698.set(2900.0f, 300.0f, 500.0f); - field_0x68c = current.pos; - field_0x6d4 = 70.0f; + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 0x02, 10.0f, 1.0f); + mDemoCamEye.set(2900.0f, 300.0f, 500.0f); + mDemoCamCenter = current.pos; + mDemoCamFovy = 70.0f; field_0x6a4.set(3630.0f, 300.0f, 600.0f); shape_angle.x = current.angle.x = -cLib_targetAngleX(¤t.pos, &field_0x6a4); shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); - field_0x744 = 1; + mMode = 1; field_0x712 = 0; - field_0x728 = 0x50; - field_0x6f8 = 50.0f; + field_0x728 = 80; + mFlySpeed = 50.0f; } case 1: { - if (field_0x728 == 0x46) { - if (field_0x6e7 == 0x01) { + if (field_0x728 == 70) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); } } - field_0x68c = current.pos; + mDemoCamCenter = current.pos; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 == 0) { - field_0x744 = 2; - field_0x728 = 0x28; + mMode = 2; + field_0x728 = 40; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 9); - break; } case 2: { - field_0x68c = current.pos; + mDemoCamCenter = current.pos; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); cLib_chaseAngleS(&shape_angle.x, 0, 0x80); current.angle.x = shape_angle.x; if (field_0x728 == 0) { setRideOff(); - field_0x744 = 3; + mMode = 3; field_0x728 = 90; } else { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 9); @@ -3057,32 +3047,31 @@ void daKago_c::executeLandingBoartHouse() { field_0x6cc = 40.0f; field_0x6d0 = 15.0f; - break; } case 3: { unkXyz1.set(3440.0f, 500.0f, 400.0f); - cLib_chasePos(&field_0x68c, unkXyz1, field_0x6cc); - if (field_0x68c.abs(unkXyz1) < 500.0f) { + cLib_chasePos(&mDemoCamCenter, unkXyz1, field_0x6cc); + if (mDemoCamCenter.abs(unkXyz1) < 500.0f) { cLib_chaseF(&field_0x6cc, 0.0f, 3.0f); } unkXyz1.set(3584.0f, 270.0f, 1007.0f); - cLib_chasePos(&field_0x698, unkXyz1, field_0x6d0); - if (field_0x698.abs(unkXyz1) < 200.0f) { + cLib_chasePos(&mDemoCamEye, unkXyz1, field_0x6d0); + if (mDemoCamEye.abs(unkXyz1) < 200.0f) { cLib_chaseF(&field_0x6d0, 0.0f, 1.0f); } else { cLib_chaseF(&field_0x6d0, 15.0f, 1.0f); } - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); - cLib_chaseAngleS(&shape_angle.x, -8192, 0x100); + cLib_chaseAngleS(&shape_angle.x, -0x2000, 0x100); current.angle.x = shape_angle.x; - if (field_0x728 == 0x50) { - if (field_0x6e7 == 0x01) { + if (field_0x728 == 80) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -3090,10 +3079,10 @@ void daKago_c::executeLandingBoartHouse() { } if (field_0x728 == 0) { - setActionMode(4, 0); + setActionMode(ACTION_WAIT_e, 0); - if (field_0x6e7 == 0x01) { - field_0x728 = 0x78; + if (mType == TYPE_NORMAL) { + field_0x728 = 120; } camera->Reset(); @@ -3103,44 +3092,42 @@ void daKago_c::executeLandingBoartHouse() { dComIfGp_event_reset(); Z2GetAudioMgr()->setDemoName(NULL); - return; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 10); - break; } } - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); } void daKago_c::executeLanding() { - if (this->field_0x73c == 0) { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA) { executeLandingLakeHairia(); - } else if (this->field_0x73c == 2) { + } else if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { executeLandingBoartHouse(); } else { setRideOff(); - setActionMode(4, 0); + setActionMode(ACTION_WAIT_e, 0); } } void daKago_c::moveDemoFly() { - if (field_0x744 == 0) { - cLib_chaseF(&field_0x6f8, l_HIO.mFlightSpeed, 2.0f); + if (mMode == 0) { + cLib_chaseF(&mFlySpeed, l_HIO.mFlightSpeed, 2.0f); if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xffff, 3); - eventInfo.onCondition(2); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } else { setPlayerRideOn(); mDashCooldownTime = (int)l_HIO.mDashCooldownTime; mDashTime = (int)l_HIO.mDashTime; - field_0x744 = 1; + mMode = 1; setDashBlurEffect(0); - setBck(11, 0, 5.0f, l_HIO.mDashTimeMultiplier); + setBck(dRes_ID_E_YC_BCK_YC_FLY_DASH_WL_e, 0, 5.0f, l_HIO.mDashTimeMultiplier); dComIfGp_getVibration().StartShock(1, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); mpLockActor = NULL; @@ -3148,9 +3135,8 @@ void daKago_c::moveDemoFly() { mGroundHeight = checkGroundHeight(current.pos, NULL); mRoofHeight = checkRoofHeight(current.pos); - if (mCurrentAction == 9) { + if (mAction == ACTION_DEMO_FLY_e) { dComIfGs_onSaveSwitch(9); - mMsgFlow.init(this, 0xbbf, 0, NULL); } } @@ -3159,75 +3145,72 @@ void daKago_c::moveDemoFly() { mIsFlying = true; - if (mCurrentAction == 9) { + if (mAction == ACTION_DEMO_FLY_e) { mMsgFlow.doFlow(this, NULL, 0); } - if (field_0x744 < 6) { + + if (mMode < 6) { setDashEffect(); - - field_0x6dd = 0x01; - - dComIfGp_setAStatusForce(0x27, 0); + mIsAttack = TRUE; + dComIfGp_setAStatusForce(BUTTON_STATUS_UNK_39, 0); } - switch (field_0x744) { + switch (mMode) { case 1: { - Z2GetAudioMgr()->setDemoName(field_0x760); - - field_0x744 = 2; + Z2GetAudioMgr()->setDemoName(mDemoName); + mMode = 2; } case 2: { - cLib_chaseF(&field_0x6f8, 30.0f, l_HIO.mDashTimeMultiplier * 3.0f); - if (mpMorf->checkFrame(9.0f)) { - if (field_0x6e7 == 0) { + cLib_chaseF(&mFlySpeed, 30.0f, l_HIO.mDashTimeMultiplier * 3.0f); + if (mAnm_p->checkFrame(9.0f)) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSound(Z2SE_EN_YC_DASH, 0, -1); } else { mSound.startCreatureSound(Z2SE_EN_KC_DASH, 0, -1); } } - if (mpMorf->checkFrame(12.0f)) { - field_0x744 = 3; - field_0x728 = 0x14; + + if (mAnm_p->checkFrame(12.0f)) { + mMode = 3; + field_0x728 = 20; dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); dComIfGp_getVibration().StartQuake(1, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); field_0x6e6 = 0; } - break; } case 3: case 4: { - cLib_chaseF(&field_0x6f8, 100.0f, 5.0f); + cLib_chaseF(&mFlySpeed, 100.0f, 5.0f); if (field_0x728 == 0) { - if (field_0x744 == 3) { - field_0x744 = 4; - field_0x728 = 0xf; + if (mMode == 3) { + mMode = 4; + field_0x728 = 15; } else { - field_0x744 = 5; + mMode = 5; dComIfGp_getVibration().StopQuake(0x1f); } } - break; } case 5: { - cLib_chaseF(&field_0x6f8, l_HIO.mFlightSpeed, 5.0f); - if (field_0x6f8 <= l_HIO.mFlightSpeed) { + cLib_chaseF(&mFlySpeed, l_HIO.mFlightSpeed, 5.0f); + if (mFlySpeed <= l_HIO.mFlightSpeed) { field_0x6c8 = 0; field_0x6c4 = 8000.0f; field_0x710 = field_0x712 = 0; -#if VERSION == VERSION_WII_USA_R0 + #if VERSION == VERSION_WII_USA_R0 field_0x72c = 30; -#else + #else if (dComIfGp_getStartStagePoint() == 0) { field_0x72c = 30; } else { field_0x72c = 60 + nREG_S(1); } -#endif + #endif shape_angle.y = current.angle.y; @@ -3237,9 +3220,8 @@ void daKago_c::moveDemoFly() { setFlyAnime(); field_0x710 = field_0x712 = 0; - field_0x744 = 6; + mMode = 6; } - break; } case 6: { @@ -3249,32 +3231,30 @@ void daKago_c::moveDemoFly() { f32 fVar11 = 0.0f; if (cM_ssin(current.angle.x) > 0.0f) { - fVar11 = - l_HIO.mFlightSpeed + l_HIO.mDescentRateIncrement * cM_ssin(current.angle.x); + fVar11 = l_HIO.mFlightSpeed + l_HIO.mDescentRateIncrement * cM_ssin(current.angle.x); } else { fVar11 = l_HIO.mFlightSpeed + l_HIO.mAscentRateDecel * cM_ssin(current.angle.x); } - if (std::abs(field_0x6f8 - fVar11) > 10.0f) { - cLib_chaseF(&field_0x6f8, fVar11, 2.0f); + if (std::abs(mFlySpeed - fVar11) > 10.0f) { + cLib_chaseF(&mFlySpeed, fVar11, 2.0f); } else { - cLib_chaseF(&field_0x6f8, fVar11, 1.0f); + cLib_chaseF(&mFlySpeed, fVar11, 1.0f); } if (field_0x72c == 0) { - setActionMode(0, 0); + setActionMode(ACTION_FLY_e, 0); dComIfGp_event_reset(); Z2GetAudioMgr()->setDemoName(NULL); return; } - break; } } } - cXyz unkXyz1 = (Vec)dPath_GetPnt(mpPath1, mPathIdx)->m_position; - cXyz unkXyz2 = (Vec)dPath_GetPnt(mpPath1, mPathIdx - mPathIdxOffset)->m_position; + cXyz unkXyz1 = (Vec)dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + cXyz unkXyz2 = (Vec)dPath_GetPnt(mpPath1, mPathCurrentPointNo - mPathStep)->m_position; s16 targetYaw = field_0x714 = cLib_targetAngleY(&unkXyz2, &unkXyz1); if (dComIfGp_getStartStagePoint() == 0) { @@ -3288,13 +3268,13 @@ void daKago_c::moveDemoFly() { cLib_addCalcAngleS(¤t.angle.y, cLib_targetAngleY(&unkXyz2, &unkXyz1), 8, 0x40, 0x10); shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); f32 nextPath = checkNextPath(unkXyz1); if (nextPath < 0.0f) { if (abs((s16)(targetYaw - cLib_targetAngleY(&unkXyz2, ¤t.pos))) < 0x4000) { - mPathIdx += this->mPathIdxOffset; + mPathCurrentPointNo += mPathStep; if (checkFlySceneChange()) { return; } @@ -3303,41 +3283,41 @@ void daKago_c::moveDemoFly() { } void daKago_c::setFlyEffect() { - if (field_0x6e7 == 1) { + if (mType == TYPE_NORMAL) { return; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); JPABaseEmitter* emitter; - field_0xb30 = dComIfGp_particle_set(field_0xb30, 0x8607, ¤t.pos, &tevStr); + field_0xb30 = dComIfGp_particle_set(field_0xb30, dPa_RM(ID_ZF_S_YCFLY_HANDLR2), ¤t.pos, &tevStr); emitter = dComIfGp_particle_getEmitter(field_0xb30); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(13)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDL_2_e)); } - field_0xb34 = dComIfGp_particle_set(field_0xb34, 0x8607, ¤t.pos, &tevStr); + field_0xb34 = dComIfGp_particle_set(field_0xb34, dPa_RM(ID_ZF_S_YCFLY_HANDLR2), ¤t.pos, &tevStr); emitter = dComIfGp_particle_getEmitter(field_0xb34); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(18)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDR_2_e)); } } void daKago_c::setDashEffect() { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); JPABaseEmitter* emitter; - if (field_0x6e7 == 0) { - field_0xb38 = dComIfGp_particle_set(field_0xb38, 0x8609, ¤t.pos, &tevStr); - emitter = dComIfGp_particle_getEmitter(this->field_0xb38); + if (mType == TYPE_TWILIGHT) { + field_0xb38 = dComIfGp_particle_set(field_0xb38, dPa_RM(ID_ZF_S_YCDASH_HANDL2), ¤t.pos, &tevStr); + emitter = dComIfGp_particle_getEmitter(field_0xb38); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(13)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDL_2_e)); } - field_0xb3c = dComIfGp_particle_set(field_0xb3c, 0x860a, ¤t.pos, &tevStr); + field_0xb3c = dComIfGp_particle_set(field_0xb3c, dPa_RM(ID_ZF_S_YCDASH_HANDR2), ¤t.pos, &tevStr); emitter = dComIfGp_particle_getEmitter(field_0xb3c); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(18)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDR_2_e)); } } @@ -3345,25 +3325,27 @@ void daKago_c::setDashEffect() { } void daKago_c::setDamageEffect() { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); JPABaseEmitter* emitter; - if (field_0x6e7 != 1) { - field_0xb38 = dComIfGp_particle_set(field_0xb38, 0x8603, ¤t.pos, &tevStr); - emitter = dComIfGp_particle_getEmitter(this->field_0xb38); + if (mType != TYPE_NORMAL) { + field_0xb38 = dComIfGp_particle_set(field_0xb38, dPa_RM(ID_ZF_S_YCDAMAGE00_HANDLR2), ¤t.pos, &tevStr); + emitter = dComIfGp_particle_getEmitter(field_0xb38); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(13)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDL_2_e)); } - field_0xb3c = dComIfGp_particle_set(field_0xb3c, 0x8603, ¤t.pos, &tevStr); + field_0xb3c = dComIfGp_particle_set(field_0xb3c, dPa_RM(ID_ZF_S_YCDAMAGE00_HANDLR2), ¤t.pos, &tevStr); emitter = dComIfGp_particle_getEmitter(field_0xb3c); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(18)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDR_2_e)); } } } void daKago_c::setDashBlurEffect(int param_0) { + UNUSED(param_0); + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz cameraEye = dCam_getBody()->Eye(); cXyz cameraEyeOffset; @@ -3381,51 +3363,53 @@ void daKago_c::setDashBlurEffect(int param_0) { cameraEyeOffset = cameraEye + local_78; - local_94.set((s16)cLib_targetAngleX(&field_0x6b0, &cameraEye), (s16)cLib_targetAngleY(&field_0x6b0, &cameraEye), 0); + local_94.set((s16)cLib_targetAngleX(&mPrevCamEye, &cameraEye), (s16)cLib_targetAngleY(&mPrevCamEye, &cameraEye), 0); if (l_HIO.mAngleTrackingMode == 0) { field_0x6be.x = -local_94.x; field_0x6be.y = local_94.y; field_0x6be.z = 0; } else { - field_0x6be.x = shape_angle.x * (0.5f + XREG_F(0x13)); + field_0x6be.x = shape_angle.x * (0.5f + XREG_F(19)); field_0x6be.y = shape_angle.y; field_0x6be.z = 0; } - field_0xb40 = dComIfGp_particle_set(field_0xb40, 0x860f, &cameraEyeOffset, &tevStr, &field_0x6be, 0, 0xff, 0, -1, 0, 0, 0); + + field_0xb40 = dComIfGp_particle_set(field_0xb40, dPa_RM(ID_ZF_S_YCSPEED), &cameraEyeOffset, &tevStr, &field_0x6be, NULL, 0xff, NULL, -1, NULL, NULL, NULL); } -void daKago_c::setWallHitEffect(cXyz param_0, int param_1) { +void daKago_c::setWallHitEffect(cXyz i_pos, int i_effType) { // might be a 2D array? static u16 kago_wall_hit_id[6] = { - 0x8658, - 0x86F9, - 0x86FA, - 0x8659, - 0x86FB, - 0x86FC, + dPa_RM(ID_ZF_S_YCHITA), + dPa_RM(ID_ZF_S_YCHITA_1), + dPa_RM(ID_ZF_S_YCHITA_2), + + dPa_RM(ID_ZF_S_YCHITB), + dPa_RM(ID_ZF_S_YCHITB_1), + dPa_RM(ID_ZF_S_YCHITB_2), }; for (int i = 0; i < 3; i++) { - dComIfGp_particle_set(kago_wall_hit_id[i + param_1 * 3], ¶m_0, &tevStr, 0, 0); + dComIfGp_particle_set(kago_wall_hit_id[i + i_effType * 3], &i_pos, &tevStr, NULL, NULL); } } void daKago_c::setSibukiEffect() { static u16 kago_wave_id[3] = { - 0x865A, - 0x865B, - 0x865C, + dPa_RM(ID_ZF_S_YCWAVE00_WAVE), + dPa_RM(ID_ZF_S_YCWAVE01_SPLASH), + dPa_RM(ID_ZF_S_YCWAVE02_DROP), }; - cXyz acStack_28(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z); - csXyz cStack_30(0, shape_angle.y, 0); + cXyz effpos(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z); + csXyz effrot(0, shape_angle.y, 0); for (int i = 0; i < 3; i++) { - field_0xb44[i] = - dComIfGp_particle_set(field_0xb44[i], kago_wave_id[i], &acStack_28, &tevStr, &cStack_30, - 0, 0xff, 0, -1, 0, 0, 0); + mSibukiEmitterIDs[i] = + dComIfGp_particle_set(mSibukiEmitterIDs[i], kago_wave_id[i], &effpos, &tevStr, &effrot, + NULL, 0xff, NULL, -1, NULL, NULL, NULL); } - if (field_0x6e7 == 0) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSoundLevel(Z2SE_EN_YC_SPLASH, 0, -1); } else { mSound.startCreatureSoundLevel(Z2SE_EN_KC_SPLASH, 0, -1); @@ -3433,40 +3417,40 @@ void daKago_c::setSibukiEffect() { } void daKago_c::setDashSibukiEffect() { - cXyz acStack_20(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z); - csXyz cStack_28(0, shape_angle.y, 0); - field_0xb50 = dComIfGp_particle_set(field_0xb50, 0x86fe, &acStack_20, &tevStr, &cStack_28, 0, - 0xff, 0, -1, 0, 0, 0); + cXyz effpos(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z); + csXyz effrot(0, shape_angle.y, 0); + mDashSibukiEmitterID = dComIfGp_particle_set(mDashSibukiEmitterID, dPa_RM(ID_ZF_S_YCWAVE03_SPLASH), &effpos, &tevStr, &effrot, NULL, + 0xff, NULL, -1, NULL, NULL, NULL); } void daKago_c::setWaterFallEffect() { static u16 kago_wave_id[2] = { - 0x865B, - 0x865C, + dPa_RM(ID_ZF_S_YCWAVE01_SPLASH), + dPa_RM(ID_ZF_S_YCWAVE02_DROP), }; - cXyz acStack_28(current.pos.x, current.pos.y, current.pos.z); - csXyz cStack_30(0, shape_angle.y, 0); + cXyz effpos(current.pos.x, current.pos.y, current.pos.z); + csXyz effrot(0, shape_angle.y, 0); for (int i = 0; i < 2; i++) { - field_0xb44[i] = - dComIfGp_particle_set(field_0xb44[i], kago_wave_id[i], &acStack_28, &tevStr, &cStack_30, - 0, 0xff, 0, -1, 0, 0, 0); + mSibukiEmitterIDs[i] = + dComIfGp_particle_set(mSibukiEmitterIDs[i], kago_wave_id[i], &effpos, &tevStr, &effrot, + NULL, 0xFF, NULL, -1, NULL, NULL, NULL); } - if (field_0x6e7 == 0) { + + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSoundLevel(Z2SE_EN_YC_SPLASH, 0, -1); } else { mSound.startCreatureSoundLevel(Z2SE_EN_KC_SPLASH, 0, -1); } } -static void* s_waterfall(void* param_0, void* param_1) { - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_Tag_WaterFall) { - if (!fpcM_IsCreating(fopAcM_GetID(param_0))) { - if (((daTagWaterFall_c*)param_0) - ->checkHitWaterFall(((fopAc_ac_c*)param_1)->current.pos)) +static void* s_waterfall(void* i_actor, void* i_data) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Tag_WaterFall) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor))) { + if (((daTagWaterFall_c*)i_actor)->checkHitWaterFall(((fopAc_ac_c*)i_data)->current.pos)) { - ((daKago_c*)param_1)->onWaterFall(); - return param_0; + ((daKago_c*)i_data)->onWaterFall(); + return i_actor; } } } @@ -3475,44 +3459,46 @@ static void* s_waterfall(void* param_0, void* param_1) { } void daKago_c::setFlySound() { + BOOL isPlayWingSound; + if (field_0x6de != 0) { - BOOL unkFlag1 = FALSE; - if (checkBck(9) || checkBck(15)) { - if (field_0x6e7 == 0) { - if (mpMorf->checkFrame(27.0f)) { - unkFlag1 = TRUE; + isPlayWingSound = FALSE; + if (checkBck(dRes_ID_E_YC_BCK_YC_FLY_e) || checkBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e)) { + if (mType == TYPE_TWILIGHT) { + if (mAnm_p->checkFrame(27.0f)) { + isPlayWingSound = TRUE; } } else { - if (mpMorf->checkFrame(29.0f)) { - unkFlag1 = TRUE; + if (mAnm_p->checkFrame(29.0f)) { + isPlayWingSound = TRUE; } } - } else if (checkBck(21)) { - if (mpMorf->checkFrame(10.0f)) { - unkFlag1 = TRUE; + } else if (checkBck(dRes_ID_E_YC_BCK_YC_HOVERING_e)) { + if (mAnm_p->checkFrame(10.0f)) { + isPlayWingSound = TRUE; } - } else if (checkBck(6)) { - if (mpMorf->checkFrame(26.0f)) { - unkFlag1 = TRUE; + } else if (checkBck(dRes_ID_E_YC_BCK_YC_CATCH_START_e)) { + if (mAnm_p->checkFrame(26.0f)) { + isPlayWingSound = TRUE; } - } else if (checkBck(5)) { - if (mpMorf->checkFrame(10.0f)) { - unkFlag1 = TRUE; + } else if (checkBck(dRes_ID_E_YC_BCK_YC_CATCH_MIDDLE_e)) { + if (mAnm_p->checkFrame(10.0f)) { + isPlayWingSound = TRUE; } - } else if (checkBck(4)) { - if (mpMorf->checkFrame(10.0f) || mpMorf->checkFrame(35.0f)) { - unkFlag1 = TRUE; + } else if (checkBck(dRes_ID_E_YC_BCK_YC_CATCH_END_e)) { + if (mAnm_p->checkFrame(10.0f) || mAnm_p->checkFrame(35.0f)) { + isPlayWingSound = TRUE; } - } else if (checkBck(12) || checkBck(13)) { - if (field_0x6e7 == 0) { + } else if (checkBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_e) || checkBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e)) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSoundLevel(Z2SE_EN_YC_GLIDE, 0, -1); } else { mSound.startCreatureSoundLevel(Z2SE_EN_KC_GLIDE, 0, -1); } } - if (unkFlag1) { - if (field_0x6e7 == 0) { + if (isPlayWingSound) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSound(Z2SE_EN_YC_WING, 0, -1); } else { mSound.startCreatureSound(Z2SE_EN_KC_WING, 0, -1); @@ -3526,78 +3512,78 @@ void daKago_c::action() { checkSizeBg(); setFlyEffect(); - field_0x6f0 = mDoCPd_c::getStickX3D(0); - field_0x6f4 = mDoCPd_c::getStickY(0); + mStickX = mDoCPd_c::getStickX3D(PAD_1); + mStickY = mDoCPd_c::getStickY(PAD_1); - u32 unkInt1 = field_0x6ea; - field_0x6ea = 0; + u8 prevIsWaterfall = mIsWaterfall; + mIsWaterfall = FALSE; fpcM_Search(s_waterfall, this); - if (field_0x6ea != 0) { - if (unkInt1 == 0) { + if (mIsWaterfall) { + if (!prevIsWaterfall) { current.angle.x = 0x1000; dComIfGp_getVibration().StartQuake(3, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } - field_0x6f0 = field_0x6f0 * 0.5f; + mStickX = mStickX * 0.5f; - if (field_0x6f4 < 0.0f) { - field_0x6f4 = field_0x6f4 * 0.5f; + if (mStickY < 0.0f) { + mStickY = mStickY * 0.5f; } else { - field_0x6f4 = field_0x6f4 * 1.5f; + mStickY = mStickY * 1.5f; } setWaterFallEffect(); - } else if (unkInt1 != 0) { + } else if (prevIsWaterfall) { dComIfGp_getVibration().StopQuake(0x1f); } - field_0x6dd = 0; + mIsAttack = FALSE; - switch (mCurrentAction) { - case 0: + switch (mAction) { + case ACTION_FLY_e: executeFly(); break; - case 1: + case ACTION_STAGGER_e: executeStagger(); break; - case 2: + case ACTION_EVENT_e: executeEvent(); break; - case 3: + case ACTION_PERCH_e: executePerch(); break; - case 4: + case ACTION_WAIT_e: executeWait(); break; - case 5: + case ACTION_ATTACK_e: executeAttack(); break; - case 6: + case ACTION_EVENT2_e: executeEvent2(); break; - case 7: + case ACTION_PERCH2_e: executePerch2(); break; - case 8: + case ACTION_LANDING_e: executeLanding(); break; - case 9: + case ACTION_DEMO_FLY_e: moveDemoFly(); break; - case 10: + case ACTION_DEMO_FLY2_e: moveDemoFly(); break; } - if (field_0x6e7 == 1 && (mCurrentAction == 0 || mCurrentAction == 5)) { + if (mType == TYPE_NORMAL && (mAction == ACTION_FLY_e || mAction == ACTION_ATTACK_e)) { mSph.OnAtSetBit(); } setFlySound(); if (daPy_getPlayerActorClass()->checkCargoCarry()) { - if (mCurrentAction == 9 || mCurrentAction == 10) { + if (mAction == ACTION_DEMO_FLY_e || mAction == ACTION_DEMO_FLY2_e) { dCam_getBody()->SetTrimTypeForce(2); } else if (isAttack()) { dCam_getBody()->SetTrimTypeForce(0); @@ -3605,19 +3591,20 @@ void daKago_c::action() { } } - fopAcM_posMoveF(this, 0); + fopAcM_posMoveF(this, NULL); + if (field_0x6dc == 0) { mObjAcch.CrrPos(dComIfG_Bgsp()); } - if (mpMorf != NULL) { - mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + if (mAnm_p != NULL) { + mAnm_p->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } field_0x674 = current.pos; if (cLib_chaseF(&field_0x6c4, 0.0f, 60.0f) == 0) { - field_0x6c8 = field_0x6c8 + 0x800; + ANGLE_ADD(field_0x6c8, 0x800); } field_0x6ca = field_0x6c4 * cM_ssin(field_0x6c8); @@ -3628,11 +3615,11 @@ void daKago_c::mtx_set() { mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::scaleM(l_HIO.mBasicSize,l_HIO.mBasicSize,l_HIO.mBasicSize); - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); model->setBaseTRMtx(mDoMtx_stack_c::get()); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x1c)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(YC_JNT_LEGR_3_e)); mDoMtx_stack_c::ZrotM(field_0x6ca); cMtx_copy(mDoMtx_stack_c::get(), mLegR3Mtx); } @@ -3654,7 +3641,7 @@ void daKago_c::cc_set() { int daKago_c::execute() { if (executeBalloonMenu()) { #if VERSION != VERSION_SHIELD_DEBUG - dComIfGp_setAStatusForce(0x27, 0); + dComIfGp_setAStatusForce(BUTTON_STATUS_UNK_39, 0); #endif return 1; } @@ -3667,24 +3654,27 @@ int daKago_c::execute() { field_0x72c--; } - if (field_0x720 != 0) { - field_0x720--; + if (mWallHitInvulnTimer != 0) { + mWallHitInvulnTimer--; } + if (mDashCooldownTime != 0) { mDashCooldownTime--; } - if (field_0x71c != 0) { - field_0x71c--; + + if (mWaterSplashTimer != 0) { + mWaterSplashTimer--; } - if (field_0x6ed != 0) { - field_0x6ed--; + + if (unk_0x6ed != 0) { + unk_0x6ed--; } action(); mtx_set(); cc_set(); - field_0x6b0 = dCam_getBody()->Eye(); + mPrevCamEye = dCam_getBody()->Eye(); return 1; } @@ -3698,9 +3688,9 @@ static int daKago_IsDelete(daKago_c* i_this) { } int daKago_c::_delete() { - dComIfG_resDelete(&mPhase, field_0x75c); + dComIfG_resDelete(&mPhase, mArcName); - if (field_0xb54 != 0) { + if (mIsHioSet != 0) { hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mChild); } @@ -3717,65 +3707,64 @@ static int daKago_Delete(daKago_c* i_this) { return i_this->_delete(); } -int daKago_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { - J3DJoint* joint = param_0; +int daKago_c::ctrlJoint(J3DJoint* i_joint, J3DModel* param_1) { + J3DJoint* joint = i_joint; int jointNo = joint->getJntNo(); mDoMtx_stack_c::copy(param_1->getAnmMtx(jointNo)); - if (jointNo == 3 || jointNo == 5 || jointNo == 6) { - mDoMtx_stack_c::YrotM(field_0x71a); - mDoMtx_stack_c::ZrotM(field_0x718); + if (jointNo == YC_JNT_NECK1_e || jointNo == YC_JNT_NECK2_e || jointNo == YC_JNT_HEAD_e) { + mDoMtx_stack_c::YrotM(mHeadRotY); + mDoMtx_stack_c::ZrotM(mHeadRotZ); } param_1->setAnmMtx(jointNo,mDoMtx_stack_c::get()); cMtx_copy(mDoMtx_stack_c::get(),J3DSys::mCurrentMtx); - return 1; } -int daKago_c::JointCallBack(J3DJoint* param_0, int param_1) { +int daKago_c::JointCallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daKago_c* kago = (daKago_c*)model->getUserArea(); if (kago != NULL) { - kago->ctrlJoint(param_0, model); + kago->ctrlJoint(i_joint, model); } } + return 1; } int daKago_c::CreateHeap() { J3DModelData* modelData; - if (field_0x6e7 == 0) { - modelData = (J3DModelData*)dComIfG_getObjectRes(field_0x75c, 0x18); + if (mType == TYPE_TWILIGHT) { + modelData = (J3DModelData*)dComIfG_getObjectRes(mArcName, dRes_ID_E_YC_BMD_YC_e); } else { - modelData = (J3DModelData*)dComIfG_getObjectRes(field_0x75c, 0x10); + modelData = (J3DModelData*)dComIfG_getObjectRes(mArcName, dRes_ID_E_KC_BMD_KC_e); } - JUT_ASSERT(0x139f, modelData != NULL); + JUT_ASSERT(5023, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO( - modelData, NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes(field_0x75c, getBckName(9)), 2, 1.0f, 0, -1, &this->mSound, 0x80000, 0x11000084); - - if (mpMorf == NULL || mpMorf->getModel() == NULL) { + mAnm_p = new mDoExt_McaMorfSO(modelData, NULL, NULL, + (J3DAnmTransform*)dComIfG_getObjectRes(mArcName, getBckName(dRes_ID_E_YC_BCK_YC_FLY_e)), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + if (mAnm_p == NULL || mAnm_p->getModel() == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); model->setUserArea((uintptr_t)this); for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) { - if (i == 3 || i == 5 || i == 6) { + if (i == YC_JNT_NECK1_e || i == YC_JNT_NECK2_e || i == YC_JNT_HEAD_e) { model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack); } } + return 1; } -static int useHeapInit(fopAc_ac_c* param_0) { - daKago_c* kago = (daKago_c*)param_0; - return kago->CreateHeap(); +static int useHeapInit(fopAc_ac_c* actor) { + daKago_c* i_this = (daKago_c*)actor; + return i_this->CreateHeap(); } int daKago_c::create() { @@ -3786,39 +3775,40 @@ int daKago_c::create() { mpPath1 = dPath_GetRoomPath(param & 0xff, fopAcM_GetRoomNo(this)); if (mpPath1 == NULL) { OS_REPORT("KAGO ......NONONONONONO PATH !!!!\n"); - return 5; + return cPhs_ERROR_e; } } - field_0x6e7 = (fopAcM_GetParam(this) >> 16) & 0xff; - if (field_0x6e7 == 0xff) { - field_0x6e7 = 0; - } - if (field_0x6e7 == 0) { - field_0x75c = "E_YC"; - field_0x760 = "KAGO_YAMI"; - } else { - field_0x75c = "E_KC"; - field_0x760 = "KAGO_HIKARI"; + mType = (fopAcM_GetParam(this) >> 16) & 0xff; + if (mType == 0xFF) { + mType = TYPE_TWILIGHT; } - int phase_state = dComIfG_resLoad(&mPhase, field_0x75c); + if (mType == TYPE_TWILIGHT) { + mArcName = "E_YC"; + mDemoName = "KAGO_YAMI"; + } else { + mArcName = "E_KC"; + mDemoName = "KAGO_HIKARI"; + } + + int phase_state = dComIfG_resLoad(&mPhase, mArcName); if (phase_state == cPhs_COMPLEATE_e) { OS_REPORT("Kago PARAM %x \n", fopAcM_GetParam(this)); - if (fopAcM_entrySolidHeap(this, useHeapInit, 0x23a0) == 0) { + if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x23a0)) { return cPhs_ERROR_e; } - if (hio_set == 0) { - field_0xb54 = 1; - hio_set = 1; - l_HIO.mChild = mDoHIO_CREATE_CHILD("", &l_HIO); + if (!hio_set) { + mIsHioSet = TRUE; + hio_set = TRUE; + l_HIO.mChild = mDoHIO_CREATE_CHILD("カーゴロック（いい奴）", &l_HIO); } attention_info.flags = 0; - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f); fopAcM_SetMax(this, 200.0f, 200.0f, 200.0f); @@ -3841,16 +3831,16 @@ int daKago_c::create() { maxFallSpeed = -100.0f; gravity = 0.0f; - mPathIdxOffset = 0x01; + mPathStep = 1; - setActionMode(4, 0); + setActionMode(ACTION_WAIT_e, 0); #if DEBUG - if (mDoCPd_c::getHoldL(0) && mDoCPd_c::getHoldR(0)) { - dComIfGs_offSwitch(0x2d, fopAcM_GetRoomNo(this)); - dComIfGs_offSwitch(0x32, fopAcM_GetRoomNo(this)); + if (mDoCPd_c::getHoldL(PAD_1) && mDoCPd_c::getHoldR(PAD_1)) { + dComIfGs_offSwitch(45, fopAcM_GetRoomNo(this)); + dComIfGs_offSwitch(50, fopAcM_GetRoomNo(this)); - setActionMode(8, 0); + setActionMode(ACTION_LANDING_e, 0); setMidnaRideOn(); setPlayerRideOn(); @@ -3860,19 +3850,19 @@ int daKago_c::create() { } #endif - field_0x73c = 3; + mSceneType = SCENE_TYPE_DEFAULT; if (strcmp("F_SP115", dComIfGp_getStartStageName()) == 0) { if (dComIfGp_getStartStageRoomNo() == 0) { - field_0x73c = 0; + mSceneType = SCENE_TYPE_LAKE_HYLIA; } } else if (strcmp("F_SP112", dComIfGp_getStartStageName()) == 0) { if (dComIfGp_getStartStageRoomNo() == 1) { - field_0x73c = 1; + mSceneType = SCENE_TYPE_RIVER; } } else if (strcmp("F_SP126", dComIfGp_getStartStageName()) == 0 && dComIfGp_getStartStageRoomNo() == 0) { - field_0x73c = 2; + mSceneType = SCENE_TYPE_BOARD_HOUSE; } mBalloon2DId = fpcM_ERROR_PROCESS_ID_e; @@ -3885,8 +3875,8 @@ int daKago_c::create() { return phase_state; } -static int daKago_Create(daKago_c* param_0) { - return param_0->create(); +static int daKago_Create(daKago_c* i_this) { + return i_this->create(); } static actor_method_class l_daKago_Method = { diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index b6a8b14ad5..cd3ff1ef19 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -1778,7 +1778,7 @@ actor_process_profile_definition g_profile_FSHOP = { fpcPi_CURRENT_e, // mListPrio PROC_FSHOP, // mProcName &g_fpcLf_Method.base, // sub_method - sizeof(fshop_class), // mSize + sizeof(fshop_class), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 5dc2f871df..e3c0332925 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -10,8 +10,8 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include -#include +#include +#include #include "m_Do/m_Do_lib.h" #ifndef __MWERKS__ diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index cc26d8172f..730c0674f7 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -18,7 +18,7 @@ #include "d/d_msg_object.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_camera_mng.h" -#include +#include #include static daNpc_Maro_c::actionFunc dummy_lit_3931() { diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 1280bb0517..f57c4c34a7 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_npc_wrestler.h" #include "d/d_timer.h" -#include +#include #include #include "d/actor/d_a_tag_arena.h" #include "d/actor/d_a_npc_gra.h" @@ -5226,7 +5226,7 @@ actor_process_profile_definition g_profile_NPC_WRESTLER = { fpcPi_CURRENT_e, // mListPrio PROC_NPC_WRESTLER, // mProcName &g_fpcLf_Method.base, // sub_method - sizeof(daNpcWrestler_c), // mSize (fix this) + sizeof(daNpcWrestler_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index c079a2a000..a36f20c2dd 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -19,7 +19,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include +#include #include daObj_Maki_HIO_c::daObj_Maki_HIO_c() { diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index fc9e9074ab..586d6451a1 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_nameplate.h" #include "d/actor/d_a_alink.h" #include "d/d_a_obj.h" -#include +#include #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index fcf5bf8107..b29714116e 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -6,7 +6,7 @@ #include "d/actor/d_a_obj_smtile.h" #include "d/actor/d_a_tag_evtarea.h" #include "d/actor/d_a_tag_kmsg.h" -#include +#include #include #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg.h" diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index c76fa02d5e..6c02a2311b 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -618,7 +618,7 @@ actor_process_profile_definition g_profile_Obj_VolcanicBall = { fpcPi_CURRENT_e, // mListPrio PROC_Obj_VolcanicBall, // mProcName &g_fpcLf_Method.base, // sub_method - sizeof(daObjVolcBall_c), // mSize + sizeof(daObjVolcBall_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index 5a1c51639f..bdbd66e198 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_wind_stone.h" #include "d/actor/d_a_alink.h" #include "d/d_meter2_info.h" -#include +#include static int daWindStone_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index 5ede524dae..ea68b43705 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "SSystem/SComponent/c_lib.h" #include "f_op/f_op_overlap_mng.h" -#include +#include #include #include "d/d_camera.h" diff --git a/src/d/d_com_inf_actor.cpp b/src/d/d_com_inf_actor.cpp index e9f7bd97f9..772ad8542a 100644 --- a/src/d/d_com_inf_actor.cpp +++ b/src/d/d_com_inf_actor.cpp @@ -6,7 +6,7 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_com_inf_actor.h" -#include +#include dComIfAc_info_c g_dComIfAc_gameInfo = { 0, // field_0x0 diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 8feb9268a0..4ad58e66fa 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -1287,7 +1287,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_arcNa static int (*l_method[3])(void*) = {(int (*)(void*))phase_1, (int (*)(void*))phase_2, (int (*)(void*))phase_3}; - if (i_phase->id == cPhs_NEXT_e) { + if (i_phase->id == 2) { return cPhs_COMPLEATE_e; } @@ -1335,7 +1335,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa static int (*l_method[3])(void*) = {(int (*)(void*))phase_01, (int (*)(void*))phase_02, (int (*)(void*))phase_03}; - if (i_phase->id == cPhs_NEXT_e) { + if (i_phase->id == 2) { return cPhs_COMPLEATE_e; } @@ -1352,12 +1352,12 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa */ int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* i_resName) { JUT_ASSERT(1889, i_phase->id != 1); - if (i_phase->id != cPhs_NEXT_e) { + if (i_phase->id != 2) { return 0; } int r30 = dComIfG_deleteObjectResMain(i_resName); - i_phase->id = cPhs_INIT_e; + i_phase->id = 0; return 1; } diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index ef92c23dd3..b391c3acfb 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -1,8 +1,12 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kankyo.h" -#include -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif +#include #include "JSystem/JHostIO/JORFile.h" #include "JSystem/JHostIO/JORServer.h" diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index 0cdfcde90b..6536067bcf 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -27,7 +27,7 @@ #include "d/d_item.h" #include "d/d_lib.h" #include "d/d_meter2_info.h" -#include +#include #include #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_mtx.h" diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index 0ac02bdfac..32947bb6a3 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -10,7 +10,7 @@ #include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" #include "d/d_msg_string.h" -#include +#include #include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index cc34f26938..32762905d9 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -4,7 +4,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/JKernel/JKRMemArchive.h" #include "d/d_com_inf_game.h" @@ -18,7 +18,7 @@ #include "d/d_meter_haihai.h" #include "d/d_msg_string.h" #include "d/d_select_cursor.h" -#include +#include #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp index fb15758e06..a01cfdc8a6 100644 --- a/src/d/d_path.cpp +++ b/src/d/d_path.cpp @@ -111,3 +111,22 @@ u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* par return 1; } + +#if VERSION == VERSION_SHIELD_DEBUG +void dPath_Ct() { + #if DEBUG + #endif +} + +void dPath_Dt() { + #if DEBUG + #endif +} + +void dPath_Move() {} + +void dPath_Draw() { + #if DEBUG + #endif +} +#endif diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index b663219517..95d884d9c1 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -20,12 +20,32 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" #include +#include "m_Do/m_Do_main.h" +#include "JSystem/JUtility/JUTConsole.h" -#if PLATFORM_WII -#include "d/d_cursor_mng.h" +#if !PLATFORM_GCN +#include +#include +#include "m_Do/m_Do_Reset.h" + +#include "res/Object/LogoUsWii.h" #endif -#if VERSION == VERSION_GCN_JPN +#if PLATFORM_WII || VERSION == VERSION_SHIELD +#include "m_Re/m_Re_controller_pad.h" +#include "d/d_cursor_mng.h" +#include "d/d_home_button.h" + +struct homeBtnData { + /* 0x0 */ int region; + /* 0x4 */ const char* path; +}; +#endif + +#if VERSION == VERSION_SHIELD +#define LOGO_ARC "LogoUs" +#define MSG_PATH "/res/Msgcn/bmgres.arc" +#elif VERSION == VERSION_GCN_JPN #define LOGO_ARC "Logo" #define MSG_PATH "/res/Msgjp/bmgres.arc" #elif VERSION == VERSION_GCN_PAL @@ -44,22 +64,70 @@ #define PROGRESSIVE_MODE_ON OS_PROGRESSIVE_MODE_ON #endif -static dLog_HIO_c g_LogHIO; +#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG +#define FMAP_RES_PATH "/res/LayoutRevo/fmapresR.arc" +#define DMAP_RES_PATH "/res/LayoutRevo/dmapresR.arc" +#define COLLECT_RES_PATH "/res/LayoutRevo/clctresR.arc" -typedef void (dScnLogo_c::*execFunc)(); -static execFunc l_execFunc[16] = { - &dScnLogo_c::warningInDraw, &dScnLogo_c::warningDispDraw, &dScnLogo_c::warningOutDraw, - &dScnLogo_c::nintendoInDraw, &dScnLogo_c::nintendoOutDraw, &dScnLogo_c::dolbyInDraw, - &dScnLogo_c::dolbyOutDraw, &dScnLogo_c::dolbyOutDraw2, &dScnLogo_c::progInDraw, - &dScnLogo_c::progSelDraw, &dScnLogo_c::progOutDraw, &dScnLogo_c::progSetDraw, - &dScnLogo_c::progSet2Draw, &dScnLogo_c::progChangeDraw, &dScnLogo_c::dvdWaitDraw, - &dScnLogo_c::nextSceneChange, -}; +#define MSG_COM_PATH "/res/LayoutRevo/msgcomR.arc" +#define MSG_RES0_PATH "/res/LayoutRevo/msgres00R.arc" +#define MSG_RES1_PATH "/res/LayoutRevo/msgres01R.arc" +#define MSG_RES2_PATH "/res/LayoutRevo/msgres02R.arc" +#define MSG_RES3_PATH "/res/LayoutRevo/msgres03R.arc" +#else +#define FMAP_RES_PATH "/res/Layout/fmapres.arc" +#define DMAP_RES_PATH "/res/Layout/dmapres.arc" +#define COLLECT_RES_PATH "/res/Layout/clctres.arc" + +#define MSG_COM_PATH "/res/Layout/msgcom.arc" +#define MSG_RES0_PATH "/res/Layout/msgres00.arc" +#define MSG_RES1_PATH "/res/Layout/msgres01.arc" +#define MSG_RES2_PATH "/res/Layout/msgres02.arc" +#define MSG_RES3_PATH "/res/Layout/msgres03.arc" +#endif + +#if PLATFORM_WII || PLATFORM_SHIELD +#define ICON_RES_PATH "/res/WiiBannerIcon/bannerIcon.arc" +#define PARTICLE_COM_PATH "/res/Particle/common-r.jpc" +#else +#define ICON_RES_PATH "/res/CardIcon/cardicon.arc" +#define PARTICLE_COM_PATH "/res/Particle/common.jpc" +#endif + +#if PLATFORM_WII +#define RING_RES_PATH "/res/LayoutRevo/ringresR.arc" +#define ITEM_INF_RES_PATH "/res/LayoutRevo/itmInfResR.arc" +#define BUTTON_RES_PATH "/res/LayoutRevo/buttonR.arc" +#define MAIN2D_PATH "/res/LayoutRevo/main2DR.arc" +#else +#define RING_RES_PATH "/res/Layout/ringres.arc" +#define ITEM_INF_RES_PATH "/res/Layout/itmInfRes.arc" +#define BUTTON_RES_PATH "/res/Layout/button.arc" +#define MAIN2D_PATH "/res/Layout/main2D.arc" +#endif + +class dLog_HIO_c : public JORReflexible { +public: + dLog_HIO_c(); + virtual ~dLog_HIO_c() {} + + void genMessage(JORMContext*); + + u8 field_0x4[0x8 - 0x4]; +}; // Size: 0x8 + +static dLog_HIO_c g_LogHIO; dLog_HIO_c::dLog_HIO_c() {} +#if DEBUG +void dLog_HIO_c::genMessage(JORMContext*) {} +#endif + void dScnLogo_c::preLoad_dyl_create() { m_preLoad_dylPhase = new request_of_phase_process_class[14]; + JUT_ASSERT(194, m_preLoad_dylPhase != NULL); + memset(m_preLoad_dylPhase, 0, sizeof(request_of_phase_process_class) * 14); } @@ -67,15 +135,54 @@ void dScnLogo_c::preLoad_dyl_remove() { delete[] m_preLoad_dylPhase; } +typedef void (dScnLogo_c::*execFunc)(); +static execFunc l_execFunc[] = { + &dScnLogo_c::warningInDraw, &dScnLogo_c::warningDispDraw, &dScnLogo_c::warningOutDraw, + &dScnLogo_c::nintendoInDraw, &dScnLogo_c::nintendoOutDraw, &dScnLogo_c::dolbyInDraw, + &dScnLogo_c::dolbyOutDraw, &dScnLogo_c::dolbyOutDraw2, &dScnLogo_c::progInDraw, + &dScnLogo_c::progSelDraw, &dScnLogo_c::progOutDraw, &dScnLogo_c::progSetDraw, + &dScnLogo_c::progSet2Draw, &dScnLogo_c::progChangeDraw, &dScnLogo_c::dvdWaitDraw, + &dScnLogo_c::nextSceneChange, + + #if PLATFORM_WII || PLATFORM_SHIELD + &dScnLogo_c::strapInDraw, + &dScnLogo_c::strapDispDraw, + &dScnLogo_c::strapOutDraw, + &dScnLogo_c::strapOut2Draw, + #endif + + #if VERSION == VERSION_SHIELD + &dScnLogo_c::mocInDraw, + &dScnLogo_c::mocDispDraw, + &dScnLogo_c::mocOutDraw, + &dScnLogo_c::nvLogoInDraw, + &dScnLogo_c::nvLogoDispDraw, + &dScnLogo_c::nvLogoOutDraw, + #endif +}; + static s16 const l_preLoad_dylKeyTbl[14] = { - 0x02DC, 0x02CE, 0x0221, 0x00F2, 0x021B, 0x02F4, 0x0139, - 0x015A, 0x02E4, 0x00FE, 0x0308, 0x030F, 0x00FF, 0x013F, + PROC_BG, + PROC_DEMO00, + PROC_NBOMB, + PROC_SPINNER, + PROC_Obj_LifeContainer, + PROC_CROD, + PROC_DISAPPEAR, + PROC_Tag_Attp, + PROC_MG_ROD, + PROC_BOOMERANG, + PROC_ARROW, + PROC_SUSPEND, + PROC_MIDNA, + PROC_Obj_Yousei, }; bool dScnLogo_c::preLoad_dyl() { bool ret = true; + int var_r28 = 14; - for (int i = 0; i < 14; i++) { + for (int i = 0; i < var_r28; i++) { int phase_state = cDylPhs::Link(&m_preLoad_dylPhase[i], l_preLoad_dylKeyTbl[i]); if (phase_state != cPhs_COMPLEATE_e) { @@ -86,6 +193,10 @@ bool dScnLogo_c::preLoad_dyl() { return ret; } +#if DEBUG +u8 dScnLogo_c::mOpeningCut; +#endif + void dScnLogo_c::checkProgSelect() { #if VERSION == VERSION_GCN_PAL if (mDoRst::getProgSeqFlag() == 0) { @@ -141,16 +252,34 @@ void dScnLogo_c::progSelDraw() { if (field_0x20b == 0) { if (field_0x209 == 0) { - if (mDoCPd_c::getHoldRight(PAD_1) || mDoCPd_c::getStickX(PAD_1) > 0.5f) { + #if PLATFORM_WII + if (mReCPd::getTrigRight(PAD_1) || mReCPd::getStickX(PAD_1) > 0.5f) + #else + if (mDoCPd_c::getHoldRight(PAD_1) || mDoCPd_c::getStickX(PAD_1) > 0.5f) + #endif + { + #if PLATFORM_WII || PLATFORM_SHIELD + mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0); + #else mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0); + #endif field_0x209 = 1; field_0x20e = 30; field_0x210 = field_0x20e; field_0x212 = 0; } } else { - if (mDoCPd_c::getHoldLeft(PAD_1) || mDoCPd_c::getStickX(PAD_1) < -0.5f) { + #if PLATFORM_WII + if (mReCPd::getTrigLeft(PAD_1) || mReCPd::getStickX(PAD_1) < -0.5f) + #else + if (mDoCPd_c::getHoldLeft(PAD_1) || mDoCPd_c::getStickX(PAD_1) < -0.5f) + #endif + { + #if PLATFORM_WII || PLATFORM_SHIELD + mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0); + #else mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0); + #endif field_0x209 = 0; field_0x20e = 30; field_0x210 = field_0x20e; @@ -158,16 +287,40 @@ void dScnLogo_c::progSelDraw() { } } - if (mDoCPd_c::getTrigA(PAD_1) || mTimer == 0) { + #if PLATFORM_WII + if (cAPICPad_A_TRIGGER(PAD_1) || mTimer == 0) + #else + if (mDoCPd_c::getTrigA(PAD_1) || mTimer == 0) + #endif + { if (field_0x209 == 0) { - mProgressiveSel->getPicture()->changeTexture(mProgressivePro, 0); + J2DPicture* pic = mProgressiveSel->getPicture(); + pic->changeTexture(mProgressivePro, 0); + + #if VERSION != VERSION_SHIELD setProgressiveMode(PROGRESSIVE_MODE_ON); + #endif + mDoRst::setProgChgFlag(1); + + #if PLATFORM_WII || PLATFORM_SHIELD + mDoAud_seStart(Z2SE_SY_TALK_WIN_CLOSE, NULL, 0, 0); + #else mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + #endif } else { - mProgressiveSel->getPicture()->changeTexture(mProgressiveInter, 0); + J2DPicture* pic = mProgressiveSel->getPicture(); + pic->changeTexture(mProgressiveInter, 0); + + #if VERSION != VERSION_SHIELD setProgressiveMode(PROGRESSIVE_MODE_OFF); + #endif + + #if PLATFORM_WII || PLATFORM_SHIELD + mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0); + #else mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + #endif } if (mTimer > 540) { @@ -181,7 +334,12 @@ void dScnLogo_c::progSelDraw() { field_0x210 = field_0x20e; field_0x212 = 0; } + + #if PLATFORM_WII || PLATFORM_SHIELD + mDoRst::setProgSeqFlag(0); + #else mDoRst::setProgSeqFlag(1); + #endif } } else { if (field_0x214 == 0) { @@ -232,13 +390,18 @@ void dScnLogo_c::progOutDraw() { if (mTimer == 0) { #if VERSION == VERSION_GCN_PAL - if (field_0x218 == 1 && field_0x209 == 0) { + if (field_0x218 == 1 && field_0x209 == 0) #else - if (field_0x218 != 0 && field_0x209 == 0) { + if (field_0x218 != 0 && field_0x209 == 0) #endif + { mExecCommand = EXEC_PROG_CHANGE; mTimer = 150; } else if (field_0x218 == 0 && field_0x209 != 0) { + #if PLATFORM_WII || PLATFORM_SHIELD + mTimer = 90; + mExecCommand = EXEC_NINTENDO_IN; + #else if (mDoRst::getWarningDispFlag() != 0) { mTimer = 90; mExecCommand = EXEC_NINTENDO_IN; @@ -246,6 +409,7 @@ void dScnLogo_c::progOutDraw() { mTimer = 120; mExecCommand = EXEC_WARNING_IN; } + #endif mDoGph_gInf_c::startFadeIn(1); } else { @@ -281,11 +445,22 @@ void dScnLogo_c::progSet2Draw() { } void dScnLogo_c::progChangeDraw() { + #if PLATFORM_SHIELD + OSReport("progChangeDraw"); + #endif + if (getProgressiveMode() != 0 && mTimer == 90 && field_0x209 == 0) { setRenderMode(); } if (mTimer == 0) { + #if VERSION == VERSION_SHIELD_DEBUG + mExecCommand = EXEC_STRAP_IN; + mTimer = 0; + #elif PLATFORM_WII || PLATFORM_SHIELD + mExecCommand = EXEC_STRAP_IN; + mTimer = 90; + #else if (mDoRst::getWarningDispFlag() != 0) { mTimer = 1; mExecCommand = EXEC_NINTENDO_IN; @@ -293,6 +468,7 @@ void dScnLogo_c::progChangeDraw() { mTimer = 1; mExecCommand = EXEC_WARNING_IN; } + #endif mDoGph_gInf_c::startFadeIn(1); } @@ -314,12 +490,14 @@ void dScnLogo_c::warningDispDraw() { dComIfGd_set2DOpa(mWarning); dComIfGd_set2DOpa(mWarningStart); - f32 alpha = (f32)field_0x210 / (f32)field_0x20e; + f32 alphaf = (f32)field_0x210 / (f32)field_0x20e; if (field_0x212 != 0) { - alpha = 1.0f - alpha; + alphaf = 1.0f - alphaf; } - mWarningStart->setAlpha(255.0f * alpha); + u8 alpha = 255.0f * alphaf; + mWarningStart->setAlpha(alpha); + if (field_0x210 == 0) { field_0x210 = field_0x20e; field_0x212 ^= 1; @@ -327,10 +505,14 @@ void dScnLogo_c::warningDispDraw() { field_0x210--; } + #if PLATFORM_WII + if (mTimer == 0 || cAPICPad_A_TRIGGER(PAD_1) || cAPICPad_B_TRIGGER(PAD_1) || cAPICPad_START_TRIGGER(PAD_1)) + #else if (mTimer == 0 || mDoCPd_c::getTrig(PAD_1) & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_BUTTON_START | PAD_TRIGGER_Z | PAD_TRIGGER_L | PAD_TRIGGER_R | PAD_BUTTON_LEFT | PAD_BUTTON_RIGHT | PAD_BUTTON_DOWN | PAD_BUTTON_UP)) + #endif { mExecCommand = EXEC_WARNING_OUT; mTimer = 1; @@ -395,40 +577,208 @@ void dScnLogo_c::dolbyOutDraw2() { } } +#if PLATFORM_WII || PLATFORM_SHIELD +void dScnLogo_c::strapInDraw() { + dComIfGd_set2DOpa(mStrapImg); + if (mTimer == 0) { + mExecCommand = EXEC_STRAP_DISP; + + #if VERSION == VERSION_SHIELD_DEBUG + mTimer = 0; + #elif VERSION == VERSION_SHIELD + mTimer = 60; + #else + mTimer = 840; + #endif + } +} + +void dScnLogo_c::strapDispDraw() { + dComIfGd_set2DOpa(mStrapImg); + + #if VERSION == VERSION_SHIELD_DEBUG + if (mTimer == 0) + #elif VERSION == VERSION_SHIELD + if (mTimer == 0 || cAPICPad_ANY_BUTTON(PAD_1)) + #else + if (mTimer == 0 || mReCPd::getTrig(PAD_1) & ~WPAD_BUTTON_HOME) + #endif + { + mExecCommand = EXEC_DVD_WAIT; + } +} + +void dScnLogo_c::strapOutDraw() { + dComIfGd_set2DOpa(mStrapImg); + if (mTimer == 0) { + #if VERSION == VERSION_SHIELD + mExecCommand = EXEC_NVLOGO_IN; + #else + mExecCommand = EXEC_STRAP_OUT2; + #endif + + mTimer = 30; + mDoGph_gInf_c::startFadeIn(30); + } +} + +void dScnLogo_c::strapOut2Draw() { + if (mTimer == 0) { + mExecCommand = EXEC_SCENE_CHANGE; + } +} +#endif + +#if VERSION == VERSION_SHIELD +void dScnLogo_c::mocInDraw() { + dComIfGd_set2DOpa(mMocImg); + + if (mTimer == 0) { + mExecCommand = EXEC_MOC_DISP; + mTimer = 120; + } +} + +void dScnLogo_c::mocDispDraw() { + dComIfGd_set2DOpa(mMocImg); + + if (mTimer == 0 || cAPICPad_ANY_BUTTON(PAD_1)) { + mExecCommand = EXEC_MOC_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + } +} + +void dScnLogo_c::mocOutDraw() { + dComIfGd_set2DOpa(mMocImg); + + if (mTimer == 0) { + mExecCommand = EXEC_STRAP_IN; + mTimer = 90; + mDoGph_gInf_c::startFadeIn(30); + } +} + +void dScnLogo_c::nvLogoInDraw() { + dComIfGd_set2DOpa(mNvLogo); + + if (mTimer == 0) { + mExecCommand = EXEC_NVLOGO_DISP; + mTimer = 120; + } +} + +void dScnLogo_c::nvLogoDispDraw() { + dComIfGd_set2DOpa(mNvLogo); + + if (mTimer == 0 || cAPICPad_ANY_BUTTON(PAD_1)) { + mExecCommand = EXEC_NVLOGO_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + } +} + +void dScnLogo_c::nvLogoOutDraw() { + dComIfGd_set2DOpa(mNvLogo); + + if (mTimer == 0) { + mExecCommand = EXEC_STRAP_OUT2; + mTimer = 30; + mDoGph_gInf_c::startFadeIn(30); + } +} +#endif + void dScnLogo_c::dvdWaitDraw() { + #if PLATFORM_WII || PLATFORM_SHIELD + dComIfGd_set2DOpa(mStrapImg); + #endif + if (!dComIfG_syncAllObjectRes()) { - if (mpField0Command->sync() && mpAlAnmCommand->sync() && mpFmapResCommand->sync() && - mpDmapResCommand->sync() && mpCollectResCommand->sync() && mpItemIconCommand->sync() && - mpRingResCommand->sync() && mpPlayerNameCommand->sync() && - mpItemInfResCommand->sync() && mpButtonCommand->sync() && mpCardIconCommand->sync() && - mpBmgResCommand->sync() && mpMsgComCommand->sync() && mpMsgResCommand[0]->sync() && - mpMsgResCommand[1]->sync() && mpMsgResCommand[2]->sync() && - mpMsgResCommand[3]->sync() && mpMsgResCommand[4]->sync() && - mpMsgResCommand[5]->sync() && mpMsgResCommand[6]->sync() && mpFontResCommand->sync() && - mpMain2DCommand->sync() && mpRubyResCommand->sync() && mParticleCommand->sync() && - mItemTableCommand->sync() && mEnemyItemCommand->sync() && preLoad_dyl()) + if ( + #if PLATFORM_WII || VERSION == VERSION_SHIELD + mpHomeBtnCommand->sync() && + #endif + mpField0Command->sync() + && mpAlAnmCommand->sync() + && mpFmapResCommand->sync() + && mpDmapResCommand->sync() + && mpCollectResCommand->sync() + && mpItemIconCommand->sync() + && mpRingResCommand->sync() + && mpPlayerNameCommand->sync() + && mpItemInfResCommand->sync() + && mpButtonCommand->sync() + && mpCardIconCommand->sync() + && mpBmgResCommand->sync() + && mpMsgComCommand->sync() + && mpMsgResCommand[0]->sync() + && mpMsgResCommand[1]->sync() + && mpMsgResCommand[2]->sync() + && mpMsgResCommand[3]->sync() + && mpMsgResCommand[4]->sync() + && mpMsgResCommand[5]->sync() + && mpMsgResCommand[6]->sync() + && mpFontResCommand->sync() + && mpMain2DCommand->sync() + && mpRubyResCommand->sync() + && mParticleCommand->sync() + && mItemTableCommand->sync() + && mEnemyItemCommand->sync() + && preLoad_dyl()) { mDoRst::setLogoScnFlag(0); + + #if PLATFORM_WII || PLATFORM_SHIELD + mDoRst::setProgSeqFlag(0); + #endif + mDoRst::setProgChgFlag(0); + + #if PLATFORM_WII || PLATFORM_SHIELD + mExecCommand = EXEC_STRAP_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + #else mExecCommand = EXEC_SCENE_CHANGE; + #endif } } } void dScnLogo_c::nextSceneChange() { if (!mDoRst::isReset()) { - dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE); + if (!isOpeningCut()) + { + dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE); + } else { + #if DEBUG + fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 30); + dComIfGs_init(); + dComIfG_playerStatusD(); + return; + #endif + } } } dScnLogo_c::~dScnLogo_c() { if (mDoRst::isReset()) { - if (mDoAud_zelAudio_c::isInitFlag()) { + #if !(PLATFORM_WII || PLATFORM_SHIELD) + if (mDoAud_zelAudio_c::isInitFlag()) + #endif + { Z2AudioMgr::getInterface()->resetProcess(5, true); } + mDoRst_reset(0, 0x80000000, 0); } + #if PLATFORM_WII || PLATFORM_SHIELD + delete mStrapImg; + #endif + + #if !(PLATFORM_WII || PLATFORM_SHIELD) delete mNintendoLogo; delete mWarning; delete mWarningStart; @@ -443,14 +793,41 @@ dScnLogo_c::~dScnLogo_c() { mpPalLogoResCommand->getArchive()->unmount(); mpPalLogoResCommand->destroy(); #endif + #endif + + #if VERSION == VERSION_SHIELD + delete mNvLogo; + delete mMocImg; + #endif preLoad_dyl_remove(); - dComIfG_deleteObjectResMain(LOGO_ARC); - field_0x1d4->destroy(); - field_0x1d0->destroy(); + #if PLATFORM_WII || PLATFORM_SHIELD + switch (getPalLanguage()) { + case 2: + dComIfG_deleteObjectResMain("LogoFrWii"); + break; + case 3: + dComIfG_deleteObjectResMain("LogoSpWii"); + break; + case 0: + default: + dComIfG_deleteObjectResMain("LogoUsWii"); + break; + } + #else + dComIfG_deleteObjectResMain(LOGO_ARC); + #endif + + mLogo01Heap->destroy(); + mLogoHeap->destroy(); JKRFree(dummyGameAlloc); + #if PLATFORM_WII || VERSION == VERSION_SHIELD + dHomeButton_c::create(mHomeBtnRegion, mpHomeBtnCommand->getMemAddress()); + mpHomeBtnCommand->destroy(); + #endif + dComIfGp_particle_createCommon(mParticleCommand->getMemAddress()); dComIfGp_setFieldMapArchive2(mpField0Command->getArchive()); dComIfGp_setAnmArchive(mpAlAnmCommand->getArchive()); @@ -462,7 +839,17 @@ dScnLogo_c::~dScnLogo_c() { dComIfGp_setRingResArchive(mpRingResCommand->getArchive()); dComIfGp_setNameResArchive(mpPlayerNameCommand->getArchive()); dComIfGp_setDemoMsgArchive(mpItemInfResCommand->getArchive()); + dComIfGp_setMeterButtonArchive(mpButtonCommand->getArchive()); + #if DEBUG + JKRArchive* button = mpButtonCommand->getArchive(); + if (button != NULL) { + OS_REPORT("button not nullptr\n"); + } else { + OS_REPORT("button nullptr\n"); + } + #endif + dComIfGp_setErrorResArchive(NULL); dComIfGp_setCardIconResArchive(mpCardIconCommand->getArchive()); dComIfGp_setMsgDtArchive(0, mpBmgResCommand->getArchive()); @@ -493,7 +880,12 @@ dScnLogo_c::~dScnLogo_c() { mpFontResCommand->destroy(); mpMain2DCommand->destroy(); mpRubyResCommand->destroy(); + + #if !PLATFORM_SHIELD mParticleCommand->destroy(); + #else + delete mParticleCommand; + #endif JKRAramHeap* aram_heap = JKRAram::getAramHeap(); u32 free_size = aram_heap->getTotalFreeSize(); @@ -510,15 +902,30 @@ dScnLogo_c::~dScnLogo_c() { #endif dComIfGp_setItemTable(mItemTableCommand->getMemAddress()); + #if !PLATFORM_SHIELD mItemTableCommand->destroy(); + #else + delete mItemTableCommand; + #endif dEnemyItem_c::setItemData((u8*)mEnemyItemCommand->getMemAddress()); + #if !PLATFORM_SHIELD mEnemyItemCommand->destroy(); + #else + delete mEnemyItemCommand; + #endif dDlst_shadowControl_c::setSimpleTex((ResTIMG*)dComIfG_getObjectRes("Always", 0x4A)); + + #if PLATFORM_WII || PLATFORM_SHIELD + dComIfG_inf_c::createBaseCsr(); + #endif + dTres_c::createWork(); dMpath_c::createWork(); + OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1479, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); + #if PLATFORM_WII data_8053a730 = 0; #endif @@ -528,10 +935,18 @@ static int phase_0(dScnLogo_c* i_this) { mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); dComIfGp_particle_create(); - i_this->dummyGameAlloc = mDoExt_getGameHeap()->alloc(0x340000, -0x10); + OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1497, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); + u32 var_r29 = 0x340000; + u32 var_r28 = 0x130000; + + i_this->dummyGameAlloc = mDoExt_getGameHeap()->alloc(var_r29, -0x10); JUT_ASSERT(1523, i_this->dummyGameAlloc != NULL); - i_this->field_0x1d0 = JKRExpHeap::create(i_this->dummyGameAlloc, 0x340000, NULL, false); - i_this->field_0x1d4 = JKRExpHeap::create(0x130000, i_this->field_0x1d0, false); + + i_this->mLogoHeap = JKRExpHeap::create(i_this->dummyGameAlloc, var_r29, NULL, false); + JUT_ASSERT(1525, i_this->mLogoHeap != NULL); + + i_this->mLogo01Heap = JKRCreateExpHeap(var_r28, i_this->mLogoHeap, false); + JUT_ASSERT(1528, i_this->mLogo01Heap != NULL); #if VERSION == VERSION_GCN_PAL switch (i_this->getPalLanguage()) { @@ -554,6 +969,10 @@ static int phase_0(dScnLogo_c* i_this) { } #endif + #if PLATFORM_WII || PLATFORM_SHIELD + OSSetPowerCallback(mDoRst_shutdownCallBack); + #endif + return cPhs_NEXT_e; } @@ -562,9 +981,11 @@ static int phase_1(dScnLogo_c* i_this) { return cPhs_INIT_e; } + #if !(PLATFORM_WII || PLATFORM_SHIELD) if (!mDoAud_zelAudio_c::isInitFlag() || Z2AudioMgr::getInterface()->checkFirstWaves()) { return cPhs_INIT_e; } + #endif #if VERSION == VERSION_GCN_PAL if (!mDoDvdThd::SyncWidthSound) { @@ -576,8 +997,29 @@ static int phase_1(dScnLogo_c* i_this) { } #endif - dComIfG_setObjectRes(LOGO_ARC, (u8)0, i_this->field_0x1d0); + int rt; + #if PLATFORM_WII || PLATFORM_SHIELD + switch (i_this->getPalLanguage()) { + case 0: + default: + rt = dComIfG_setObjectRes("LogoUsWii", (u8)0, i_this->mLogoHeap); + break; + case 2: + rt = dComIfG_setObjectRes("LogoFrWii", (u8)0, i_this->mLogoHeap); + break; + case 3: + rt = dComIfG_setObjectRes("LogoSpWii", (u8)0, i_this->mLogoHeap); + break; + } + #else + rt = dComIfG_setObjectRes(LOGO_ARC, (u8)0, i_this->mLogoHeap); + #endif + + JUT_ASSERT(1652, rt == 1); + mDoRst::setLogoScnFlag(1); + + OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 1667, archiveHeap->getTotalFreeSize()); archiveHeap->dump_sort(); return cPhs_NEXT_e; } @@ -617,17 +1059,45 @@ int dScnLogo_c::create() { data_8053a730 = 1; #endif - mpHeap = mDoExt_setCurrentHeap(field_0x1d4); + mpHeap = mDoExt_setCurrentHeap(mLogo01Heap); + + #if PLATFORM_WII || PLATFORM_SHIELD + logoInitWii(); + #else logoInitGC(); - mpHeap->becomeCurrentHeap(); + #endif + + JKRSetCurrentHeap(mpHeap); + + OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1732, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); dvdDataLoad(); + + OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1738, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); + + #if !(PLATFORM_WII || PLATFORM_SHIELD) Z2AudioMgr::getInterface()->loadStaticWaves(); - mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 60); + #endif + + mDoGph_gInf_c::setTickRate(OS_TIMER_CLOCK / 60); mDoGph_gInf_c::waitBlanking(0); + field_0x20a = 0; + + #if VERSION == VERSION_SHIELD_DEBUG + mExecCommand = EXEC_STRAP_IN; + mTimer = 0; + #elif VERSION == VERSION_SHIELD + mExecCommand = EXEC_MOC_IN; + mTimer = 30; + #elif PLATFORM_WII + mExecCommand = EXEC_STRAP_IN; + mTimer = 90; + #endif + mDoGph_gInf_c::startFadeIn(1); + #if !(PLATFORM_WII || PLATFORM_SHIELD) checkProgSelect(); if (field_0x20a != 0) { mExecCommand = EXEC_PROG_IN; @@ -646,12 +1116,92 @@ int dScnLogo_c::create() { JUTGamePad::clearResetOccurred(); JUTGamePad::setResetCallback(mDoRst_resetCallBack, NULL); + #endif + mDoRst::offReset(); mDoRst::offResetPrepare(); + #if PLATFORM_WII || VERSION == VERSION_SHIELD + dHomeButton_c::lbl_8053A724 = 0; + #endif + return phase_state; } +#if PLATFORM_WII || PLATFORM_SHIELD +void dScnLogo_c::logoInitWii() { + u8 language = getPalLanguage(); + if (language > 5) { + language = 0; + } + + ResTIMG* timg; + s16 width; + s16 height; + if (mDoGph_gInf_c::isWide()) { + switch (language) { + case 0: + default: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", dRes_ID_LOGOUSWII_BTI_STRAP_16_9_832X456_US_e); + break; + case 2: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoFrWii", 3); + break; + case 3: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoSpWii", 3); + break; + } + + width = 832; + height = 456; + } else { + switch (language) { + case 0: + default: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", dRes_ID_LOGOUSWII_BTI_STRAP_608X456_US_e); + break; + case 2: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoFrWii", 4); + break; + case 3: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoSpWii", 4); + break; + } + + width = 608; + height = 456; + } + + JUT_ASSERT(2309, timg != NULL); + mStrapImg = new dDlst_2D_c(timg, 304 - (width / 2), 224 - (height / 2), width, height, 255); + + #if VERSION == VERSION_SHIELD + timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", 5); + mNvLogo = new dDlst_2D_c(timg, 304 - (width / 2), 224 - (height / 2), width, height, 255); + + timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", 4); + mMocImg = new dDlst_2D_c(timg, 304 - (width / 2), 224 - (height / 2), width, height, 255); + #endif + + OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2316, archiveHeap->getTotalFreeSize()); + + JUT_ASSERT(2319, mStrapImg != NULL); + + mNintendoLogo = NULL; + mDolbyLogo = NULL; + mWarning = NULL; + mWarningStart = NULL; + mProgressiveChoice = NULL; + mProgressiveYes = NULL; + mProgressiveNo = NULL; + mProgressivePro = NULL; + mProgressiveInter = NULL; + mProgressiveSel = NULL; + + OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2341, archiveHeap->getTotalFreeSize()); + OS_REPORT("%d mLogo01Heap->getTotalFreeSize %08x\n\x1b[m", 2344, mLogo01Heap->getTotalFreeSize()); +} +#else void dScnLogo_c::logoInitGC() { ResTIMG* nintendoImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 4); mNintendoLogo = new dDlst_2D_c(nintendoImg, 117, 154, 376, 104, 255); @@ -769,103 +1319,133 @@ void dScnLogo_c::logoInitGC() { mProgressiveSel = new dDlst_2D_c(mProgressivePro, 153, 309, 336, 88, 255); #endif } +#endif void dScnLogo_c::dvdDataLoad() { - dComIfG_setObjectRes("Always", (u8)0, NULL); + int rt; + + #if PLATFORM_WII || VERSION == VERSION_SHIELD + rt = dComIfG_setObjectRes("HomeBtn", (u8)0, NULL); + JUT_ASSERT(__LINE__, rt == 1); + + static const homeBtnData l_homeBtnData[] = { + {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, + {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, + {SC_LANG_FRENCH, "/res/HomeBtn/homeBtn_FRA.arc"}, + {SC_LANG_SPANISH, "/res/HomeBtn/homeBtn_SPA.arc"}, + {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, + {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, + {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, + }; + + u8 language = getPalLanguage(); + const homeBtnData* data = &l_homeBtnData[language]; + mpHomeBtnCommand = mDoDvdThd_toMainRam_c::create(data->path, 0, NULL); + mHomeBtnRegion = data->region; + #endif + + rt = dComIfG_setObjectRes("Always", (u8)0, NULL); + JUT_ASSERT(2420, rt == 1); + + OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2421, archiveHeap->getTotalFreeSize()); archiveHeap->dump_sort(); - dComIfG_setObjectRes("Alink", (u8)0, NULL); + rt = dComIfG_setObjectRes("Alink", (u8)0, NULL); + JUT_ASSERT(2429, rt == 1); - mpField0Command = mDoDvdThd_mountXArchive_c::create( - "/res/FieldMap/Field0.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpAlAnmCommand = - mDoDvdThd_mountXArchive_c::create("/res/Object/AlAnm.arc", 0, JKRArchive::MOUNT_ARAM, NULL); - mpFmapResCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/fmapres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpDmapResCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/dmapres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpCollectResCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/clctres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpItemIconCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/itemicon.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpRingResCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/ringres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpPlayerNameCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/playerName.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpItemInfResCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/itmInfRes.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpButtonCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/button.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpCardIconCommand = mDoDvdThd_mountXArchive_c::create( - "/res/CardIcon/cardicon.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + #if PLATFORM_WII || PLATFORM_SHIELD + rt = dComIfG_setObjectRes("NNGC", (u8)0, NULL); + JUT_ASSERT(2433, rt == 1); + #endif + + OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2436, archiveHeap->getTotalFreeSize()); + + mpField0Command = aramMount("/res/FieldMap/Field0.arc", mDoExt_getJ2dHeap()); + mpAlAnmCommand = aramMount("/res/Object/AlAnm.arc", NULL); + mpFmapResCommand = aramMount(FMAP_RES_PATH, mDoExt_getJ2dHeap()); + mpDmapResCommand = aramMount(DMAP_RES_PATH, mDoExt_getJ2dHeap()); + mpCollectResCommand = aramMount(COLLECT_RES_PATH, mDoExt_getJ2dHeap()); + mpItemIconCommand = aramMount("/res/Layout/itemicon.arc", mDoExt_getJ2dHeap()); + mpRingResCommand = aramMount(RING_RES_PATH, mDoExt_getJ2dHeap()); + mpPlayerNameCommand = aramMount("/res/Layout/playerName.arc", mDoExt_getJ2dHeap()); + mpItemInfResCommand = aramMount(ITEM_INF_RES_PATH, mDoExt_getJ2dHeap()); + mpButtonCommand = aramMount(BUTTON_RES_PATH, mDoExt_getJ2dHeap()); + mpCardIconCommand = aramMount(ICON_RES_PATH, mDoExt_getJ2dHeap()); #if VERSION == VERSION_GCN_PAL switch (getPalLanguage()) { case 1: - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgde/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount("/res/Msgde/bmgres.arc"); break; case 2: - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgfr/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount("/res/Msgfr/bmgres.arc"); break; case 3: - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgsp/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount("/res/Msgsp/bmgres.arc"); break; case 4: - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgit/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount("/res/Msgit/bmgres.arc"); break; case 0: default: - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msguk/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount("/res/Msguk/bmgres.arc"); + break; + } + #elif VERSION == VERSION_SHIELD_DEBUG + switch (getPalLanguage()) { + case 2: + mpBmgResCommand = onMemMount("/res/Msgfr/bmgres.arc"); + break; + case 3: + mpBmgResCommand = onMemMount("/res/Msgsp/bmgres.arc"); + break; + default: + mpBmgResCommand = onMemMount("/res/Msgus/bmgres.arc"); break; } #else - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create(MSG_PATH, 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount(MSG_PATH); #endif - mpMsgComCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgcom.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMsgResCommand[0] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres00.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMsgResCommand[1] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres01.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMsgResCommand[2] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres02.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMsgResCommand[3] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres03.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgComCommand = aramMount(MSG_COM_PATH, mDoExt_getJ2dHeap()); + mpMsgResCommand[0] = aramMount(MSG_RES0_PATH, mDoExt_getJ2dHeap()); + mpMsgResCommand[1] = aramMount(MSG_RES1_PATH, mDoExt_getJ2dHeap()); + mpMsgResCommand[2] = aramMount(MSG_RES2_PATH, mDoExt_getJ2dHeap()); + mpMsgResCommand[3] = aramMount(MSG_RES3_PATH, mDoExt_getJ2dHeap()); #if VERSION == VERSION_GCN_JPN - mpMsgResCommand[4] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres04.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[4] = aramMount("/res/Layout/msgres04.arc", mDoExt_getJ2dHeap()); #else - mpMsgResCommand[4] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres04F.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[4] = aramMount("/res/Layout/msgres04F.arc", mDoExt_getJ2dHeap()); #endif - mpMsgResCommand[5] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres05.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMsgResCommand[6] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres06.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMain2DCommand = - mDoDvdThd_mountXArchive_c::create("/res/Layout/main2D.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpMsgResCommand[5] = aramMount("/res/Layout/msgres05.arc", mDoExt_getJ2dHeap()); + mpMsgResCommand[6] = aramMount("/res/Layout/msgres06.arc", mDoExt_getJ2dHeap()); + + mpMain2DCommand = onMemMount(MAIN2D_PATH); #if VERSION == VERSION_GCN_JPN - mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontjp/fontres.arc", 1, - JKRArchive::MOUNT_MEM, NULL); - mpRubyResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontjp/rubyres.arc", 0, - JKRArchive::MOUNT_MEM, NULL); + mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontjp/fontres.arc", 1, JKRArchive::MOUNT_MEM, NULL); + mpRubyResCommand = onMemMount("/res/Fontjp/rubyres.arc"); #elif VERSION == VERSION_GCN_PAL - mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fonteu/fontres.arc", 0, - JKRArchive::MOUNT_MEM, NULL); - mpRubyResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fonteu/rubyres.arc", 0, - JKRArchive::MOUNT_MEM, NULL); + mpFontResCommand = onMemMount("/res/Fonteu/fontres.arc"); + mpRubyResCommand = onMemMount("/res/Fonteu/rubyres.arc"); +#elif VERSION == VERSION_SHIELD_DEBUG + mpFontResCommand = onMemMount("/res/Fonteu/fontres.arc"); + mpRubyResCommand = onMemMount("/res/Fontus/rubyres.arc"); +#elif VERSION == VERSION_SHIELD + mpFontResCommand = onMemMount("/res/Fontcn/fontres.arc"); + mpRubyResCommand = onMemMount("/res/Fontcn/rubyres.arc"); #else - mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontus/fontres.arc", 0, - JKRArchive::MOUNT_MEM, NULL); - mpRubyResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontus/rubyres.arc", 0, - JKRArchive::MOUNT_MEM, NULL); + mpFontResCommand = onMemMount("/res/Fontus/fontres.arc"); + mpRubyResCommand = onMemMount("/res/Fontus/rubyres.arc"); #endif - mParticleCommand = mDoDvdThd_toMainRam_c::create("/res/Particle/common.jpc", 0, - dComIfGp_particle_getResHeap()); + + mParticleCommand = mDoDvdThd_toMainRam_c::create(PARTICLE_COM_PATH, 0, dComIfGp_particle_getResHeap()); + mItemTableCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/item_table.bin", 0, NULL); + JUT_ASSERT(2620, mItemTableCommand != NULL); + mEnemyItemCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/enemy_table.bin", 0, NULL); + JUT_ASSERT(2624, mEnemyItemCommand != NULL); preLoad_dyl_create(); preLoad_dyl(); @@ -877,13 +1457,58 @@ static int dScnLogo_Create(scene_class* i_this) { } static int dScnLogo_Execute(dScnLogo_c* i_this) { + fpc_ProcID id = fpcM_GetID(i_this); + if (mDoRst::isReset()) { fopScnM_ChangeReq(i_this, PROC_LOGO_SCENE, 0, 5); } + return 1; } +#if DEBUG +static u8 lbl_8074CA49; +#endif + static int dScnLogo_Draw(dScnLogo_c* i_this) { + #if DEBUG + int x = 36; + int y = 40; + + y += 12; + JUTReport(x, y, "COPYDATE %s", mDoMain::COPYDATE_STRING); + + y += 12; + JUTReport(x, y, "Build by %s", "Authorized User"); + + y += 12; + JUTReport(x, y, "_DEBUG/Debug version"); + + if (!lbl_8074CA49) { + lbl_8074CA49 = 1; + JUTReportConsole_f("COPYDATE %s\n", mDoMain::COPYDATE_STRING); + JUTReportConsole_f("Build by %s\n", "Authorized User"); + JUTReportConsole_f("_DEBUG/Debug version\n"); + JUTReportConsole_f("SDKVersion %s\n", "11Dec2009Patch02"); + + #if PLATFORM_WII || PLATFORM_SHIELD + JUTReportConsole_f("ConsoleSimMem %08x\n", OSGetConsoleSimulatedMem1Size()); + JUTReportConsole_f("PhysicalMemory %08x\n", OSGetPhysicalMem1Size()); + JUTReportConsole_f("ConsoleType %08x\n", OSGetConsoleType()); + JUTReportConsole_f("Language(PAL) %1x\n", SCGetLanguage()); + JUTReportConsole_f("Progressive %1x\n", SCGetProgressiveMode()); + JUTReportConsole_f("SoundMode %1x\n", SCGetSoundMode()); + #else + JUTReportConsole_f("ConsoleSimMem %08x\n", OSGetConsoleSimulatedMemSize()); + JUTReportConsole_f("PhysicalMemory %08x\n", OSGetPhysicalMemSize()); + JUTReportConsole_f("ConsoleType %08x\n", OSGetConsoleType()); + JUTReportConsole_f("Language(PAL) %1x\n", OSGetLanguage()); + JUTReportConsole_f("Progressive %1x\n", OSGetProgressiveMode()); + JUTReportConsole_f("SoundMode %1x\n", OSGetSoundMode()); + #endif + } + #endif + i_this->draw(); return 1; } @@ -897,9 +1522,35 @@ static int dScnLogo_IsDelete(dScnLogo_c* i_this) { return 1; } -#if VERSION == VERSION_GCN_PAL +#if VERSION == VERSION_GCN_PAL || PLATFORM_WII || PLATFORM_SHIELD u8 dScnLogo_c::getPalLanguage() { u8 language; + + #if PLATFORM_WII || PLATFORM_SHIELD + switch (SCGetLanguage()) { + case SC_LANG_JAPANESE: + language = 6; + break; + case SC_LANG_ENGLISH: + language = 0; + break; + case SC_LANG_GERMAN: + language = 1; + break; + case SC_LANG_FRENCH: + language = 2; + break; + case SC_LANG_SPANISH: + language = 3; + break; + case SC_LANG_ITALIAN: + language = 4; + break; + case SC_LANG_DUTCH: + language = 5; + break; + } + #else switch (OSGetLanguage()) { case OS_LANGUAGE_ENGLISH: language = 0; @@ -920,13 +1571,20 @@ u8 dScnLogo_c::getPalLanguage() { language = 5; break; } + #endif return language; } #endif void dScnLogo_c::setProgressiveMode(u8 mode) { - #if VERSION == VERSION_GCN_PAL + #if VERSION == VERSION_SHIELD_DEBUG + return; + #endif + + #if PLATFORM_WII + SCSetProgressiveMode(mode); + #elif VERSION == VERSION_GCN_PAL OSSetEuRgb60Mode(mode); #else OSSetProgressiveMode(mode); @@ -934,6 +1592,10 @@ void dScnLogo_c::setProgressiveMode(u8 mode) { } u8 dScnLogo_c::getProgressiveMode() { + #if PLATFORM_WII || PLATFORM_SHIELD + return SCGetProgressiveMode(); + #endif + #if VERSION == VERSION_GCN_PAL return OSGetEuRgb60Mode(); #else @@ -953,8 +1615,6 @@ void dScnLogo_c::setRenderMode() { mDoMch_render_c::setProgressiveMode(); } -dLog_HIO_c::~dLog_HIO_c() {} - static scene_method_class l_dScnLogo_Method = { (process_method_func)dScnLogo_Create, (process_method_func)dScnLogo_Delete, diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 7260980b09..070d198824 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -26,6 +26,26 @@ #include "m_Do/m_Do_graphic.h" #include "d/actor/d_a_suspend.h" #include "d/actor/d_a_ykgr.h" +#include "JSystem/JHostIO/JORFile.h" +#include "JSystem/JHostIO/JORServer.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JFramework/JFWSystem.h" +#include "f_ap/f_ap_game.h" +#include "d/d_bg_parts.h" +#include "f_op/f_op_kankyo_mng.h" +#include "d/actor/d_a_alink.h" +#include "d/actor/d_a_midna.h" +#include "JSystem/JKernel/JKRAram.h" +#include "JSystem/JKernel/JKRAramArchive.h" + +#if DEBUG +#include "d/d_s_menu.h" +#include "d/d_debug_pad.h" +#include "d/d_jpreviewer.h" +#include "d/d_jcam_editor.h" +#include "d/d_a_obj.h" +#include "d/d_debug_viewer.h" +#endif #include #if PLATFORM_WII @@ -54,6 +74,10 @@ static request_of_phase_process_class resPhase[1]; static request_of_phase_process_class dylPhase[1]; +#if DEBUG +static OSTime dylPreLoadTime0; +#endif + static OSTime dylPreLoadTime1; static OSTime resPreLoadTime0; @@ -66,6 +90,47 @@ s8 dScnPly_c::pauseTimer; s8 dScnPly_c::nextPauseTimer; +#if DEBUG +u8 dScnPly_c::debugPause; +#endif + +static const s16 T_JOINT_dylKeyTbl[1] = { + PROC_COW, +}; + +static const char* T_JOINT_resName[1] = {"Always"}; + +struct PreLoadInfo { + const char* stageName; + const s16* profNameTbl; + const char** resNameTbl; + u8 dylKeyTblNum; + u8 resNameNum; +}; + +static PreLoadInfo const PreLoadInfoT[1] = { + { + "T_JOINT", + T_JOINT_dylKeyTbl, + T_JOINT_resName, + ARRAY_SIZE(T_JOINT_dylKeyTbl), + ARRAY_SIZE(T_JOINT_resName), + }, +}; + +static s8 preLoadNo = -1; + +static u8 doPreLoad = 1; + +#if DEBUG +void dScnPly_preLoad_HIO_c::genMessage(JORMContext* mctx) { + mctx->startComboBox("プリロード", &doPreLoad); + mctx->genComboBoxItem("しない", 0); + mctx->genComboBoxItem("する", 1); + mctx->endComboBox(); +} +#endif + s8 dScnPly_c::calcPauseTimer() { if (nextPauseTimer != 0) { pauseTimer = nextPauseTimer; @@ -76,19 +141,282 @@ s8 dScnPly_c::calcPauseTimer() { } } -static const s16 T_JOINT_dylKeyTbl[1] = { - 0x0106, -}; +#if DEBUG +dScnPly_reg_childHIO_c::dScnPly_reg_childHIO_c() { + for (int i = 0; i < 30; i++) { + mFloatReg[i] = 0.0f; + } + + for (int i = 0; i < 10; i++) { + mShortReg[i] = 0; + } +} + +void dScnPly_reg_childHIO_c::genMessage(JORMContext* mctx) { + char textbuf[8]; + + for (int i = 0; i < 20; i++) { + sprintf(textbuf, " F(%02d)", i); + mctx->genSlider(textbuf, &mFloatReg[i], -100000.0f, 100000.0f); + } + + for (int i = 20; i < 25; i++) { + sprintf(textbuf, " F(%02d)", i); + mctx->genSlider(textbuf, &mFloatReg[i], 0.0f, 1.0f); + } + + for (int i = 25; i < 30; i++) { + sprintf(textbuf, " F(%02d)", i); + mctx->genSlider(textbuf, &mFloatReg[i], -1.0f, 1.0f); + } + + for (int i = 0; i < 10; i++) { + sprintf(textbuf, " S(%02d)", i); + mctx->genSlider(textbuf, &mShortReg[i], -0x8000, 0x7FFF); + } +} + +void dScnPly_reg_HIO_c::genMessage(JORMContext* mctx) { + static const char l_nodeName[][20] = { + "森田(T)", + "まつたに(D)", + "イワワキ(I)", + "ささ(S)", + "うめみや(U)", + "おがわ(O)", + "坂口(Y)", + "さかい(K)", + "ハラ(B)", + "すみよし(M)", + "(空)-たけした(A)", + "吉田茂樹(P)", + "(空)-のま(N)", + "(空)-にしわき(W)", + "(空)-榊原政郎(J)", + "はやかわ(H)", + "(空)-定本(V)", + "(空)-西川(X)", + "(空)-鈴木（ゆ）(Z)", + "なかにし(n)", + "くわじま(k)", + "おかじま(o)", + "山崎(y)", + "芦田(a)", + "岡田(h)", + "高橋(t)", + }; + + // "Example usage" + mctx->genLabel("使い方例", 0); + mctx->genLabel("R_HS(00-09) ... はやかわレジスタ -32768 - +32767(short)", 0); + mctx->genLabel("R_HF(00-19) ... はやかわレジスタ -100000.0 - +100000.0", 0); + mctx->genLabel("R_HF(20-24) ... はやかわレジスタ 0.0f - 1.0f", 0); + mctx->genLabel("R_HF(25-29) ... はやかわレジスタ -1.0f - 1.0f", 0); + + for (int i = 0; i < 26; i++) { + mctx->genNode(l_nodeName[i], &mChildReg[i], 0, 0); + } +} + +dScnPly_preset_HIO_c::dScnPly_preset_HIO_c() { + field_0x5 = 0; + memset(mPresetData, 0, sizeof(mPresetData)); + memset(filename_buf, 0, sizeof(filename_buf)); + field_0x2716 = 0; + field_0x2717 = 0; +} + +void dScnPly_preset_HIO_c::exePreset() { + JORFile file; + + if (g_presetHIO.filename_buf[0] != 0) { + if (file.open((char*)filename_buf, 1, "", NULL, NULL, NULL)) { + memset(mPresetData, 0, sizeof(mPresetData)); + field_0x2716 = 0; + field_0x2717 = 1; + + file.readData(mPresetData, 0); + file.close(); + + if (dSm_read_stageset(mPresetData)) { + field_0x2717 = 2; + } + } else { + // "\nLoading error loop" + OS_REPORT("\n読み込みしっぱいのまきまき"); + } + + g_presetHIO.filename_buf[0] = 0; + } +} + +void dScnPly_preset_HIO_c::genMessage(JORMContext* mctx) { + // "Load situation file" + mctx->genLabel("【状況ファイルを読みこみ】", 0x80000001); + // "Items and Status can be set in a file" + mctx->genLabel("　アイテムやステータスの状態をファイルで指定することが出来ます。", 0x80000001); + mctx->genLabel("", 0x80000001); + + // "Click here to select a file to load!" + mctx->genButton("ここを押して読込ファイルを指定して下さい！", 0x40000001); + mctx->genLabel("", 0x80000001); + + // "- Loading during gameplay will automatically return you to the debug menu." + mctx->genLabel("・ゲーム中に読み込むと自動的にデバッグメニューへ戻ります。", 0x80000001); + // "- When loading a file from the debug menu," + mctx->genLabel("・デバッグメニューでファイルを読み込んだ際", 0x80000001); + // " if a stage command exists the game will temporarily load then return to the menu." + mctx->genLabel("　stage命令がある場合は一旦ゲームに入りメニューへと戻ります。", 0x80000001); + // " (To position the cursor)" + mctx->genLabel("　（カーソルを合わせる為）", 0x80000001); + mctx->genLabel("", 0x80000001); + + // "Reset state to before loading situation file" + mctx->genButton("状況ファイルを読み込んでいない状態に戻す", 0x40000003); + mctx->genLabel("", 0x80000001); + mctx->genLabel("", 0x80000001); + + // "Click here for the situation file location!" + mctx->genButton("状況ファイルの格納場所はコチラを押下！", 0x40000005); + mctx->genLabel("\\\\10.121.2.9\\zelda$\\JMAP_FOLDER\\situation", 0x80000001); + // "For details about the situation file contents, please refer to Nakamura-san's website" + mctx->genLabel("ファイルの内容については中村さんのＨＰをご参照ください", 0x80000001); + // "Click here to launch browser and view webpage." + mctx->genButton("ここを押すとブラウザが起動し表示されます。", 0x40000004); + mctx->genLabel("http://www-ead/~nakamuh/gc-zelda_2/misc/spec-situation_file.html", 0x80000001); +} + +void dScnPly_preset_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) { + JORReflexible::listenPropertyEvent(event); + JORFile file; + + switch ((int)event->id) { + case 0x40000001: + if (file.open(1, "すべてのファイル(*.*)\0*.*", NULL, NULL, NULL)) { + memset(mPresetData, 0, sizeof(mPresetData)); + field_0x2716 = 0; + field_0x2717 = 1; + + file.readData(mPresetData, 0); + file.close(); + + if (dSm_read_stageset(mPresetData)) { + field_0x2717 = 2; + } + } + break; + case 0x40000003: + memset(mPresetData, 0, sizeof(mPresetData)); + break; + case 0x40000004: + JORShellExecute(NULL, "http://www-ead/~nakamuh/gc-zelda_2/misc/spec-situation_file.html", NULL, NULL, 1); + break; + case 0x40000005: + JORShellExecute(NULL, "\\\\10.121.2.9\\zelda$\\ZELDA2_JMAP_FOLDER\\situation", NULL, NULL, 1); + break; + } +} +#endif dScnPly_env_otherHIO_c::dScnPly_env_otherHIO_c() { mShadowDensity = 255.0f; - mAdjustLODBias = 1; - mDisplayTransparentCyl = false; + mAdjustLODBias = TRUE; + mDisplayTransparentCyl = FALSE; + + #if DEBUG + mAdjustCullFar = FALSE; + mCullFarValue = 4000.0f; + mDisplayShadows = TRUE; + mDisplayShadowImage = FALSE; + mDisplayShadowPoly = FALSE; + mDisplayCullBox = FALSE; + mLoadAllRooms = FALSE; + mDepthOfField = TRUE; + + mRailSize = 5.0f; + mRailColorR = 0x50; + mRailColorG = 0x50; + mRailColorB = 0x50; + + field_0x1a = 0xFF; + mDisplayParticleInfo = 0; + field_0x4e = 0; + field_0x4f = 0; + + for (int i = 0; i < 20; i++) { + field_0x1c[i] = -1; + } + #endif } -void dScnPly_env_otherHIO_c::genMessage(JORMContext* ctx) { +void dScnPly_env_otherHIO_c::genMessage(JORMContext* mctx) { + #if DEBUG + mctx->genCheckBox("影表示", &mDisplayShadows, 1); + mctx->genSlider("影濃さ", &mShadowDensity, 0.0f, 255.0f); + mctx->genCheckBox("被写界深度", &mDepthOfField, 1); + mctx->genCheckBox("ＬＯＤバイアス変更", &mAdjustLODBias, 1); + mctx->genCheckBox("カリングＦａｒ変更", &mAdjustCullFar, 1); + mctx->genSlider("カリングＦａｒ値", &mCullFarValue, 0.0f, 50000.0f); + mctx->genCheckBox("影イメージ表示", &mDisplayShadowImage, 1); + mctx->genCheckBox("影ポリゴン表示", &mDisplayShadowPoly, 1); + mctx->genCheckBox("透明円柱表示", &mDisplayTransparentCyl, 1); + mctx->genCheckBox("カリングボックス表示", &mDisplayCullBox, 1); + mctx->genCheckBox("パーティクル情報表示", &mDisplayParticleInfo, 1); + mctx->genButton("パーティクル履歴", 0x4000003); + mctx->genCheckBox("全部屋読み込み", &mLoadAllRooms, 1); + mctx->genButton("部屋メモリ", 0x4000001); + mctx->genButton("草、花、低木本数", 0x4000002); + mctx->genSlider("レールサイズ", &mRailSize, 0.0f, 100.0f); + mctx->genSlider("レールカラー(R)", &mRailColorR, 0, 0xff); + mctx->genSlider("レールカラー(G)", &mRailColorG, 0, 0xff); + mctx->genSlider("レールカラー(B)", &mRailColorB, 0, 0xff); + #endif } +#if DEBUG +void dScnPly_env_otherHIO_c::listenPropertyEvent(const JORPropertyEvent* event) { + JORReflexible::listenPropertyEvent(event); + JORFile file; + + switch ((int)event->id) { + case 0x4000001: + OS_REPORT("#############################################\n"); + break; + case 0x4000002: + break; + case 0x4000003: + g_envHIO.mOther.field_0x4e = 1; + break; + } +} + +void dScnPly_env_otherHIO_c::printParticle() { + dDbVw_Report(20, 100, "Emitter Num <%d> X=<%d>", dComIfGp_particle_getEmitterNum(), dComIfGp_particle_getHeapSize()); + dDbVw_Report(20, 120, "Particle Num <%d> Y=<%d>", dComIfGp_particle_getParticleNum(), dComIfGp_particle_getSceneHeapSize() - 0x180000); + + int var_r26 = 0xA0; + int var_r28 = field_0x4f; + if (field_0x4e != 0) { + OS_REPORT("Particle Error !!\n"); + + for (int i = 0; i < 20; i++) { + var_r28--; + if (var_r28 < 0) { + var_r28= 19; + } + + if (field_0x1c[var_r28] != 0xFFFF) { + OS_REPORT(" \n", field_0x1c[var_r28], dPa_name::getName(field_0x1c[var_r28])); + } + + var_r26 += 20; + } + + field_0x4e = 0; + } +} +#endif + dScnPly_env_debugHIO_c::dScnPly_env_debugHIO_c() { mBoxCullMinSize.set(-100.0f, -100.0f, -100.0f); mBoxCullMaxSize.set(100.0f, 100.0f, 100.0f); @@ -96,31 +424,152 @@ dScnPly_env_debugHIO_c::dScnPly_env_debugHIO_c() { mSphereCullRadius = 100.0f; } -void dScnPly_env_debugHIO_c::genMessage(JORMContext* ctx) { +void dScnPly_env_debugHIO_c::genMessage(JORMContext* mctx) { + #if DEBUG + mctx->genLabel("【ボックスカリング(CULLSIZE_DEBUG)サイズ】", 0x80000001); + mctx->genSlider("最小Ｘ", &mBoxCullMinSize.x, -10000.0f, 10000.0f); + mctx->genSlider("最小Ｙ", &mBoxCullMinSize.y, -10000.0f, 10000.0f); + mctx->genSlider("最小Ｚ", &mBoxCullMinSize.z, -10000.0f, 10000.0f); + mctx->genSlider("最大Ｘ", &mBoxCullMaxSize.x, -10000.0f, 10000.0f); + mctx->genSlider("最大Ｙ", &mBoxCullMaxSize.y, -10000.0f, 10000.0f); + mctx->genSlider("最大Ｚ", &mBoxCullMaxSize.z, -10000.0f, 10000.0f); + + mctx->genLabel("【球カリング(CULLSIZE_Q_DEBUG)サイズ】", 0x80000001); + mctx->genSlider("中心Ｘ", &mSphereCullCenter.x, -10000.0f, 10000.0f); + mctx->genSlider("中心Ｙ", &mSphereCullCenter.y, -10000.0f, 10000.0f); + mctx->genSlider("中心Ｚ", &mSphereCullCenter.z, -10000.0f, 10000.0f); + mctx->genSlider("半径", &mSphereCullRadius, -10000.0f, 10000.0f); + #endif } +#if DEBUG +void dScnPly_env_debugHIO_c::listenPropertyEvent(const JORPropertyEvent* event) { + JORReflexible::listenPropertyEvent(event); + + l_cullSizeBox[fopAc_CULLBOX_14_e].min = mBoxCullMinSize; + l_cullSizeBox[fopAc_CULLBOX_14_e].max = mBoxCullMaxSize; + l_cullSizeSphere[fopAc_CULLSPHERE_8_e - fopAc_CULLSPHERE_0_e].center = mSphereCullCenter; + l_cullSizeSphere[fopAc_CULLSPHERE_8_e - fopAc_CULLSPHERE_0_e].radius = mSphereCullRadius; +} + +void dScnPly_env_HIO_c::genMessage(JORMContext* mctx) { + mctx->genNode("デバッグ用", &mDebug, 0, 0); + mctx->genNode("その他", &mOther, 0, 0); +} + +static u32 l_usedMemoryBlockSize = 0xFFFFFFFF; + +static int checkObjectSize(void* i_process, void* i_data) { + s16 profname = fpcM_GetProfName(i_process); + if (profname == PROC_BG) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_process; + *((u32*)i_data) += ((l_usedMemoryBlockSize != 0 && actor->heap == NULL) ? 0 : actor->heap->getHeapSize()) + actor->base.base.profile->process_size; + } else if (profname == PROC_PLAY_SCENE || profname == PROC_ROOM_SCENE) { + *((u32*)i_data) += ((base_process_class*)i_process)->profile->process_size; + } else if (fopKyM_IsKy(i_process)) { + *((u32*)i_data + 1) += ((base_process_class*)i_process)->profile->process_size; + } else if (fopAcM_IsActor(i_process)) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_process; + *((u32*)i_data + 1) += (actor->heap == NULL ? 0 : actor->heap->getHeapSize()) + actor->base.base.profile->process_size; + + if (profname == PROC_ALINK) { + daAlink_c* alink = (daAlink_c*)actor; + *((u32*)i_data + 1) += alink->getOtherHeapSize(); + } else if (profname == PROC_MIDNA) { + daMidna_c* midna = (daMidna_c*)actor; + *((u32*)i_data + 1) += midna->getOtherHeapSize(); + } + } + + return 1; +} + +static void initUsedHeapSize() { + l_usedMemoryBlockSize = 0; + for (int i = 0; i < 19; i++) { + JKRHeap* heap = dStage_roomControl_c::getMemoryBlockHeap(i); + if (heap != NULL) { + l_usedMemoryBlockSize += heap->getHeapSize(); + } + } +} + +static bool lbl_8074CADB; + +static void drawUsedHeapSize() { + if (mDoCPd_c::getHoldL(PAD_3) && mDoCPd_c::getHoldR(PAD_3) && mDoCPd_c::getTrigZ(PAD_3)) { + lbl_8074CADB = !lbl_8074CADB; + } + + if (lbl_8074CADB) { + int gameSize = mDoExt_getSafeGameHeapSize() - mDoExt_getGameHeap()->getTotalFreeSize(); + int zeldaSize = mDoExt_getSafeZeldaHeapSize() - mDoExt_getZeldaHeap()->getTotalFreeSize(); + int archiveSize = mDoExt_getSafeArchiveHeapSize() - mDoExt_getArchiveHeap()->getTotalFreeSize(); + int j2dSize = mDoExt_getSafeJ2dHeapSize() - mDoExt_getJ2dHeap()->getTotalFreeSize(); + + u32 sizes[2]; + sizes[0] = dComIfG_getStageAllSize(); + sizes[1] = dComIfG_getObjectAllSize() - (dComIfG_getObjectSize("CamParam") + + dComIfG_getObjectSize("Event") + + dComIfG_getObjectSize("Always") + + dComIfG_getObjectSize("Alink") + + dComIfG_getObjectSize("Midna")); + + fpcLyIt_All(checkObjectSize, sizes); + if (l_usedMemoryBlockSize != 0) { + sizes[0] = l_usedMemoryBlockSize + dComIfG_getStageSize("Stg_00") + dComIfG_getStageSize("Xtg_00"); + } + + int var_r25 = JKRGetAramFreeSize() / 1024; + JUTReport(380, 300, "Stage : %d(K)", (sizes[0] + 0x3FF) / 1024); + JUTReport(380, 316, "Obj : %d(K)", (sizes[1] + 0x3FF) / 1024); + JUTReport(380, 332, "C-ARAM : %d(K)", var_r25); + JUTReport(380, 348, ">Game : %d(K)", (gameSize + 0x3FF) / 1024); + JUTReport(380, 364, ">Zelda : %d(K)", (zeldaSize + 0x3FF) / 1024); + JUTReport(380, 380, ">Archive : %d(K)", (archiveSize + 0x3FF) / 1024); + JUTReport(380, 380, ">J2d : %d(K)", (j2dSize + 0x3FF) / 1024); + } +} +#endif + static int dScnPly_Draw(dScnPly_c* i_this) { static s16 l_wipeType[] = { - 0x0000, 0x0000, 0x0011, 0x0002, 0x0002, 0x0001, 0x0003, 0x0001, 0x0004, 0x0004, 0x0005, 0x0005, - 0x0006, 0x0007, 0x0000, 0x0000, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0008, 0x0008, + 0, 0, 17, 2, 2, 1, 3, 1, 4, 4, 5, 5, 6, 7, 0, 0, 2, 2, 2, 2, 2, 8, 8, }; + #if DEBUG + fapGm_HIO_c::startCpuTimer(); + fpc_ProcID id = fpcM_GetID(i_this); + drawUsedHeapSize(); + dStage_DebugDisp(); + #endif + dComIfG_Ccsp()->Move(); dComIfG_Bgsp().ClrMoveFlag(); - u8 useWhiteColor; if (!fopOvlpM_IsPeek() && !dComIfG_resetToOpening(i_this)) { - if (dComIfGp_isEnableNextStage()) { + if (dComIfGp_isEnableNextStage() + #if DEBUG + && !dScnMenu_c::isAutoSelect() + #endif + ) { + JUT_ASSERT(1019, dComIfGp_getNextStageWipe() < ARRAY_SIZEU(l_wipeType)); + u8 wipe = dComIfGp_getNextStageWipe(); - fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, l_wipeType[wipe], 5); + #if DEBUG + if (g_kankyoHIO.navy.wipe_test_ON != 0xFF) { + wipe = g_kankyoHIO.navy.wipe_test_ON; + } + #endif + + int rt = fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, l_wipeType[wipe], 5); int hour = dKy_getdaytime_hour(); - useWhiteColor = hour >= 6 && hour < 18 ? true : false; - BOOL tmp = useWhiteColor == 0 ? 1 : 0; + BOOL isDaytime = (hour >= 6 && hour < 18) ? FALSE : TRUE; if (wipe == 1 || wipe == 2 || wipe == 7 || wipe == 17 || wipe == 21 || - ((wipe == 8 || wipe == 10 || wipe == 18) && tmp) || - ((wipe == 9 || wipe == 11 || wipe == 19) && !tmp)) + ((wipe == 8 || wipe == 10 || wipe == 18) && isDaytime) || + ((wipe == 9 || wipe == 11 || wipe == 19) && !isDaytime)) { mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_saftyWhiteColor); } else if (wipe == 14 || wipe == 20) { @@ -136,42 +585,142 @@ static int dScnPly_Draw(dScnPly_c* i_this) { } } } + dMdl_mng_c::reset(); - if (!dComIfGp_isPauseFlag() && dScnPly_c::pauseTimer == 0) { + if (!dComIfGp_isPauseFlag() && !dScnPly_c::isPause() + #if DEBUG + && !fapGm_HIO_c::isCaptureScreen() + #endif + ) { if (fpcM_GetName(i_this) == PROC_PLAY_SCENE) { dComIfGp_getVibration().Run(); } daSus_c::execute(); dComIfG_Bgsp().Move(); + #if VERSION == VERSION_SHIELD_DEBUG + dPath_Move(); + #endif dComIfGp_particle_calc3D(); dComIfGp_particle_calc2D(); cCt_execCounter(); } else { dPa_control_c::onStatus(1); - if (dScnPly_c::pauseTimer == 0) { + + if (!dScnPly_c::isPause()) { dPa_control_c::onStatus(2); } + if (dScnPly_c::pauseTimer == 0) { dComIfGp_getVibration().Pause(); } } - for (create_tag_class* i = fopDwIt_Begin(); i != NULL; i = fopDwIt_Next(i)) { - fpcM_Draw(i->mpTagData); + #if DEBUG + if (fopOvlpM_IsDoingReq() != TRUE) { + if (dScnMenu_c::isAutoSelect() || dComIfG_isSceneResetButton() || g_presetHIO.field_0x2717 != 0) { + if (g_presetHIO.field_0x2717 != 0) { + dSm_read_stageset(g_presetHIO.mPresetData); + g_presetHIO.field_0x2717 = 0; + } + + s16 spA = 0; + if (dDemo_c::getMode() == 1) { + dDemo_c::end(); + spA = 7; + } + + fopScnM_ChangeReq(i_this, PROC_MENU_SCENE, spA, 5); + mDoAud_bgmStop(30); + + if (fpcM_GetName(i_this) != PROC_PLAY_SCENE) { + dComIfG_playerStatusD(); + } + } } + dDebugPad.Update(); + + fapGm_HIO_c::printCpuTimer(""); + fapGm_HIO_c::stopCpuTimer("ゲーム管理（計算処理２）"); + fapGm_HIO_c::printCpuTimer(""); + #endif + + for (create_tag_class* i = fopDwIt_Begin(); i != NULL; i = fopDwIt_Next(i)) { + void* process = i->mpTagData; + fpcM_Draw(process); + } + + #if DEBUG + fapGm_HIO_c::startCpuTimer(); + #endif + if (!dComIfGp_isPauseFlag()) { dEyeHL_mng_c::update(); + + #if VERSION == VERSION_SHIELD_DEBUG + dBgp_c::drawShare(); + #endif + #if DEBUG + daSus_c::draw(); + #endif + dComIfG_Ccsp()->Draw(); - dComIfGp_getAttention()->Draw(); + #if DEBUG + dComIfG_Bgsp().Draw(); + dPath_Draw(); + #endif + + dAttention_c* attention = dComIfGp_getAttention(); + attention->Draw(); } + #if DEBUG + if (g_envHIO.mOther.mDisplayParticleInfo) { + g_envHIO.mOther.printParticle(); + } + + fapGm_HIO_c::printCpuTimer(""); + fapGm_HIO_c::stopCpuTimer("ゲーム管理（描画処理）"); + #endif + return 1; } +#if DEBUG +static BOOL l_pause; +static f32 l_pauseFrame; +static u8 lbl_8074CAE4; +static u32 l_sceneChangeStartTick; +#endif + static int dScnPly_Execute(dScnPly_c* i_this) { + #if DEBUG + fapGm_HIO_c::startCpuTimer(); + #endif + i_this->offReset(); + + #if DEBUG + if (lbl_8074CAE4) { + u32 var_r27 = OSGetTick() - l_sceneChangeStartTick; + OS_REPORT("\x1b[33m"); + // "Scene transition time: %f seconds\n" + OS_REPORT("シーン切り替え時間　%f秒\n\x1B[m", (f32)OSTicksToMicroseconds(var_r27) / 1000000.0f); + lbl_8074CAE4 = 0; + + initUsedHeapSize(); + OS_REPORT("Game Heap <%d,%d,%d>\n", mDoExt_getGameHeap()->getTotalUsedSize(), mDoExt_getGameHeap()->getTotalFreeSize(), mDoExt_getGameHeap()->getFreeSize()); + OS_REPORT("Zelda Heap <%d,%d,%d>\n", mDoExt_getZeldaHeap()->getTotalUsedSize(), mDoExt_getZeldaHeap()->getTotalFreeSize(), mDoExt_getZeldaHeap()->getFreeSize()); + OS_REPORT("Archive Heap <%d,%d,%d>\n", mDoExt_getArchiveHeap()->getTotalUsedSize(), mDoExt_getArchiveHeap()->getTotalFreeSize(), mDoExt_getArchiveHeap()->getFreeSize()); + OS_REPORT("最終残り　%d(%fM)\n", JFWSystem::getRootHeap()->getTotalFreeSize(), (f32)JFWSystem::getRootHeap()->getTotalFreeSize() / (f32)0x100000); + OS_REPORT("拡張最終残り　%d(%fM)\n", JKRGetRootHeap2()->getTotalFreeSize(), (f32)JKRGetRootHeap2()->getTotalFreeSize() / (f32)0x100000); + OS_REPORT("\x1b[m"); + } + #endif + + BOOL comboTrig = FALSE; + dStage_roomControl_c::offNoChangeRoom(); dStage_roomControl_c::setRoomReadId(0xFF); @@ -188,11 +737,63 @@ static int dScnPly_Execute(dScnPly_c* i_this) { } dKy_itudemo_se(); + + #if DEBUG + if (mDoCPd_c::isConnect(PAD_3)) { + if (mDoCPd_c::getTrigStart(PAD_1) && !fapGmHIO_get2Ddraw()) { + comboTrig = TRUE; + } else if (mDoCPd_c::getHoldR(PAD_2) && mDoCPd_c::getTrigStart(PAD_2)) { + comboTrig = TRUE; + } + + if (comboTrig == TRUE) { + if (l_pause) { + l_pause = FALSE; + } else { + l_pause = TRUE; + l_pauseFrame = 0.0f; + } + } + + if (l_pause) { + l_pauseFrame += mDoCPd_c::getAnalogR(PAD_2); + if (!mDoCPd_c::getTrigZ(PAD_2) && l_pauseFrame < 1.0f) { + i_this->onDebugPause(); + return 1; + } + + l_pauseFrame -= 1.0f; + } + + i_this->offDebugPause(); + } + #endif + if (!dComIfGp_isPauseFlag()) { + #if DEBUG + dJprev_c::get()->update(); + #endif + dDemo_c::update(); + + #if DEBUG + dJcame_c::get()->update(); + #endif + + #if VERSION == VERSION_SHIELD_DEBUG + dBgp_c::executeShare(); + #endif + dComIfGp_getEvent()->Step(); dComIfGp_getAttention()->Run(); } + + #if DEBUG + fapGm_HIO_c::printCpuTimer(""); + fapGm_HIO_c::stopCpuTimer("ゲーム管理（計算処理１）"); + fapGm_HIO_c::printCpuTimer(""); + #endif + return 1; } @@ -201,40 +802,34 @@ static int dScnPly_IsDelete(dScnPly_c i_this) { return 1; } -struct PreLoadInfo { - const char* stageName; - const s16* profNameTbl; - const char** resNameTbl; - u8 dylKeyTblNum; - u8 resNameNum; -}; - -static const char* T_JOINT_resName[1] = {"Always"}; - -static PreLoadInfo const PreLoadInfoT[1] = { - { - "T_JOINT", - T_JOINT_dylKeyTbl, - T_JOINT_resName, - 1, - 1, - }, -}; - -static s8 preLoadNo = -1; - -static u8 doPreLoad = 1; - static int dScnPly_Delete(dScnPly_c* i_this) { + UNUSED(i_this); + + #if VERSION == VERSION_SHIELD_DEBUG + for (int i = 0; i < 32; i++) { + char* bank = dStage_roomControl_c::getArcBank(i); + if (strcmp(bank, "") != 0) { + int rt = dComIfG_syncObjectRes(bank); + if (rt > 0) { + return 0; + } + } + } + #endif + daSus_c::reset(); dMpath_c::remove(); dTres_c::remove(); - dComIfGp_getAttention()->~dAttention_c(); + dAttention_c* attention = dComIfGp_getAttention(); + attention->~dAttention_c(); dComIfGp_getVibration().Remove(); dComIfG_Bgsp().Dt(); dComIfG_Ccsp()->Dt(); + #if VERSION == VERSION_SHIELD_DEBUG + dPath_Dt(); + #endif dStage_Delete(); dComIfGp_event_remove(); @@ -244,6 +839,11 @@ static int dScnPly_Delete(dScnPly_c* i_this) { dComIfGp_getMsgDtArchive(1)->removeResourceAll(); JKRUnmountArchive(dComIfGp_getMsgDtArchive(1)); + #if DEBUG + dJcame_c::remove(); + dJprev_c::remove(); + #endif + dDemo_c::remove(); fopMsgM_destroyExpHeap(dComIfGp_getExpHeap2D()); @@ -256,11 +856,25 @@ static int dScnPly_Delete(dScnPly_c* i_this) { mDoGph_gInf_c::getBloom()->remove(); + #if VERSION == VERSION_SHIELD_DEBUG + dBgp_c::removeShare(); + #endif + dComIfGs_offPlayerFieldLastStayFieldDataExistFlag(); + + #if DEBUG + daObj::HioObj_c::clean(); + mDoHIO_deleteChild(g_envHIO.field_0x4); + mDoHIO_deleteChild(g_save_bit_HIO.field_0x4); + g_preLoadHIO.removeHIO(); + #endif + dComIfGp_setWindowNum(0); dComIfGd_setView(NULL); if (preLoadNo >= 0) { + OS_REPORT("\x1b[32mプリロード解放\n\x1b[m"); + const char** resname_table = PreLoadInfoT[preLoadNo].resNameTbl; int res_num = PreLoadInfoT[preLoadNo].resNameNum; if (resname_table != NULL && (*resname_table != NULL)) { @@ -288,6 +902,113 @@ static int dScnPly_Delete(dScnPly_c* i_this) { return 1; } +#if DEBUG +static u32 getArchiveHeapSize(JKRHeap* i_heap, dRes_info_c* i_resInfo) { + if (i_resInfo == NULL) { + return 0; + } + + u32 size = 0; + int var_r29; + JKRArchive* archive = i_resInfo->getArchive(); + if (archive != NULL) { + var_r29 = i_heap->getSize(archive); + if (var_r29 > 0) { + size += var_r29 + 0x10; + } + + var_r29 = i_heap->getSize(((JKRAramArchive*)archive)->mBlock); + if (var_r29 > 0) { + size += var_r29 + 0x10; + } + } + + JKRSolidHeap* dataHeap = i_resInfo->getDataHeap(); + if (dataHeap != NULL) { + int var_r26 = i_heap->getSize(dataHeap); + if (var_r26 > 0) { + size += var_r26 + 0x10; + } + } + + return size; +} + +static u32 getArchiveBankHeapSize(JKRHeap* i_heap) { + u32 size = 0; + for (int i = 0; i < 32; i++) { + char* bank = dStage_roomControl_c::getArcBank(i); + if (strcmp(bank, "") != 0) { + size += getArchiveHeapSize(i_heap, dComIfG_getObjectResInfo(bank)); + } + } + + return size; +} + +static u32 getStageHeapSize(JKRHeap* i_heap) { + u32 size = 0; + for (int i = 0; i < 19; i++) { + JKRHeap* heap = dStage_roomControl_c::getMemoryBlockHeap(i); + if (heap != NULL) { + int var_r26 = i_heap->getSize(heap); + if (var_r26 > 0) { + size += var_r26 + 0x10; + } + } + } + + if (size == 0) { + for (int i = 0; i < 64; i++) { + size += getArchiveHeapSize(i_heap, dComIfG_getStageResInfo(dComIfG_getRoomArcName(i))); + } + } + + size += getArchiveHeapSize(i_heap, dComIfG_getStageResInfo("Stg_00")) + getArchiveHeapSize(i_heap, dComIfG_getStageResInfo("Xtg_00")); + return size; +} + +static BOOL heapSizeCheck(const char* i_label, JKRExpHeap* i_heap, s32 i_base, BOOL param_3) { + s32 free = i_heap->getFreeSize(); + s32 total = i_heap->getTotalUsedSize(); + + if (param_3) { + total -= getArchiveBankHeapSize(i_heap); + total -= getStageHeapSize(i_heap); + } + + s32 archiveHeapSize = mDoExt_getSafeArchiveHeapSize(); + f32 totalRatio = (f32)total / (f32)archiveHeapSize; + f32 freeRatio = (f32)free / (f32)total; + OS_REPORT("%s Free<%d> Total<%d> Base<%d> TotalRatio<%f> FreeRatio<%f>\n", + i_label, + free, + total, + i_base, + totalRatio, + freeRatio + ); + + int var_r30 = std::abs(total - i_base); + if (var_r30 > 64) { + // "%d (0x%x) byte difference!\n" + OS_REPORT("%d (0x%x) バイトの差があります！\n", var_r30, var_r30); + i_heap->dump(); + return FALSE; + } + + return TRUE; +} + +static BOOL heapSizeCheck() { + return heapSizeCheck("ArchiveHeap", mDoExt_getArchiveHeap(), mDoExt_getSafeArchiveHeapSize(), TRUE) + && heapSizeCheck("J2dHeap", mDoExt_getJ2dHeap(), mDoExt_getSafeJ2dHeapSize(), FALSE) + && heapSizeCheck("GameHeap", mDoExt_getGameHeap(), mDoExt_getSafeGameHeapSize(), TRUE) + && heapSizeCheck("ZeldaHeap", mDoExt_getZeldaHeap(), mDoExt_getSafeZeldaHeapSize(), FALSE) + && heapSizeCheck("CommandHeap", mDoExt_getCommandHeap(), mDoExt_getSafeCommandHeapSize(), FALSE); +} +#endif + bool dScnPly_c::resetGame() { if (fpcM_GetName(this) == PROC_OPENING_SCENE) { if (!dStage_roomControl_c::resetArchiveBank(0)) { @@ -302,6 +1023,7 @@ bool dScnPly_c::resetGame() { field_0x1d4 = 1; } } else { + #if VERSION != VERSION_SHIELD_DEBUG if (dComIfGp_getNextStagePoint() == -4 || (dComIfGs_getLastSceneMode() & 0xF) == 0xC || !strcmp(dComIfGp_getNextStageName(), "F_SP109") || (!strcmp(dComIfGp_getNextStageName(), "F_SP116") && @@ -311,6 +1033,7 @@ bool dScnPly_c::resetGame() { return false; } } + #endif } dComIfG_setBrightness(255); @@ -323,8 +1046,10 @@ void dScnPly_c::offReset() { if (field_0x1d4 != 0 && !fopOvlpM_IsPeek()) { mDoRst::offReset(); mDoRst::offResetPrepare(); + #if VERSION != VERSION_SHIELD_DEBUG JUTGamePad::C3ButtonReset::sResetOccurred = false; JUTGamePad::setResetCallback(mDoRst_resetCallBack, NULL); + #endif field_0x1d4 = 0; } } @@ -332,14 +1057,35 @@ void dScnPly_c::offReset() { static int phase_00(dScnPly_c* i_this) { if (!i_this->resetGame()) { return cPhs_INIT_e; - } else { - #if PLATFORM_WII - data_8053a730 = 1; - #endif - - mDoGph_gInf_c::offBlure(); - return cPhs_NEXT_e; } + + #if PLATFORM_WII + data_8053a730 = 1; + #endif + + #if DEBUG + l_sceneChangeStartTick = OSGetTick(); + lbl_8074CAE4 = 1; + + mDoExt_setSafeGameHeapSize(); + mDoExt_setSafeZeldaHeapSize(); + mDoExt_setSafeCommandHeapSize(); + mDoExt_setSafeArchiveHeapSize(); + mDoExt_setSafeJ2dHeapSize(); + #endif + + mDoGph_gInf_c::offBlure(); + + #if DEBUG + if (!heapSizeCheck()) { + BOOL isDispWarning = mDoCPd_c::isConnect(PAD_3); + if (isDispWarning) { + JUT_WARN(2046, "%s", "Memory Danger !!"); + } + } + #endif + + return cPhs_NEXT_e; } static int phase_01(dScnPly_c* i_this) { @@ -353,6 +1099,7 @@ static int phase_01(dScnPly_c* i_this) { mDoAud_setInDarkness(false); } + mDoAud_setSceneName(dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo(), dComIfG_play_c::getLayerNo_common(dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo(), @@ -370,19 +1117,17 @@ static int phase_0(dScnPly_c* i_this) { } static int phase_1(dScnPly_c* i_this) { - u32 id = fopScnM_GetID(i_this); - dStage_roomControl_c::setProcID(id); + dStage_roomControl_c::setProcID(fopScnM_GetID(i_this)); dComIfGp_setStartStage(dComIfGp_getNextStartStage()); if (dComIfGp_getStartStageLayer() < 0 && daPy_py_c::checkRoomRestartStart()) { - const char* stage = dComIfGp_getStartStageName(); - s8 room = dComIfGp_getStartStageRoomNo(); - s8 layer = dComIfGp_getStartStageLayer(); - if (dComIfG_play_c::getLayerNo_common_common(stage, room, layer) < 0) { + int layer = dComIfG_play_c::getLayerNo_common_common(dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo(), dComIfGp_getStartStageLayer()); + if (layer < 0) { dComIfGp_setStartStageLayer(dComIfGp_getLayerOld()); } } + dComIfGp_offEnableNextStage(); // Stage: Faron Woods, Room: Faron Spring @@ -431,14 +1176,32 @@ static int phase_1(dScnPly_c* i_this) { dComIfGp_world_dark_set(0); } + #if DEBUG + if (dKy_darkworld_check()) { + if (dComIfGp_getStartStageLayer() != -1 && dComIfGp_getStartStageLayer() < 10 && dComIfG_play_c::getLayerNo(0) < 10) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN08") != 0) { + // "Twilight layer spec error! sasaki" + OSReport_Error("\nトワイライトのレイヤー指定異常です！ sasaki"); + // "(If loaded from the debug menu, you can directly specify layers, so I can't tell if it's invalid.)" + OSReport_Error("\n(デバグメニューからの場合はレイヤー直指定できるので危険なのかは予測つきません。）"); + + OSReport_Error("\nstage[%s]", dComIfGp_getStartStageName()); + OSReport_Error("\nroom[%d]", dComIfGp_getStartStageRoomNo()); + OSReport_Error("\nlayer[%d]", dComIfG_play_c::getLayerNo(0)); + OSReport_Error("\nTW1[%d]", dComIfGs_isDarkClearLV(0)); + OSReport_Error("\nTW2[%d]", dComIfGs_isDarkClearLV(1)); + OSReport_Error("\nTW3[%d]", dComIfGs_isDarkClearLV(2)); + OSReport_Error("\nTW4[%d]", dComIfGs_isDarkClearLV(3)); + } + } + } + #endif + // Stage: Lake Hylia, Room: Fountain if (!strcmp(dComIfGp_getStartStageName(), "F_SP115") && dComIfGp_getStartStageRoomNo() == 1 && dComIfGp_getStartStageLayer() < 0) { - const char* stage = dComIfGp_getStartStageName(); - s8 room = dComIfGp_getStartStageRoomNo(); - s8 layer = dComIfGp_getStartStageLayer(); - if (dComIfG_play_c::getLayerNo_common(stage, room, layer) == 9) { + if (dComIfG_play_c::getLayerNo_common(dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo(), dComIfGp_getStartStageLayer()) == 9) { dComIfGp_setStartStageLayer(9); } } @@ -467,6 +1230,14 @@ static int phase_1(dScnPly_c* i_this) { dComIfGs_onSaveDunSwitch(30); } + #if DEBUG + if (!strcmp(dComIfGp_getStartStageName(), "NPC_GND") && dComIfGp_getStartStageRoomNo() == 0 && + dComIfGp_getStartStageLayer() >= 12) + { + dComIfGp_world_dark_set(1); + } + #endif + dKy_darkworld_Area_set(dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo()); // Stage: Hyrule Castle Sewers, Room: Prison Cell @@ -507,21 +1278,36 @@ static int phase_1(dScnPly_c* i_this) { } dComIfGs_BossLife_public_Set(0xFF); + + #if DEBUG + if (g_env_light.light_mask_type & 0xF0) { + g_env_light.light_mask_type = g_env_light.light_mask_type & 0xF; + } else { + g_env_light.light_mask_type = 0; + } + #else g_env_light.light_mask_type = 0; + #endif JUTReportConsole_f("Start StageName:RoomNo [%s:%d]\n", dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo()); dComIfGp_setStatus(0); + if (dComIfG_syncStageRes("Stg_00") < 0) { - dComIfG_setStageRes("Stg_00", NULL); + int rt = dComIfG_setStageRes("Stg_00", NULL); + JUT_ASSERT(2442, rt == 1); } + return cPhs_NEXT_e; } static int phase_1_0(dScnPly_c* i_this) { static char camparamarc[10] = "CamParam"; - if (dComIfG_syncStageRes("Stg_00")) { + int rt = dComIfG_syncStageRes("Stg_00"); + JUT_ASSERT(2469, rt >= 0); + + if (rt != 0) { return cPhs_INIT_e; } else { dStage_infoCreate(); @@ -533,8 +1319,8 @@ static int phase_1_0(dScnPly_c* i_this) { } static int phase_2(dScnPly_c* i_this) { - int tmp = dComIfG_syncAllObjectRes(); - if (tmp >= 0 && tmp != 0) { + int rt = dComIfG_syncAllObjectRes(); + if (rt >= 0 && rt != 0) { return cPhs_INIT_e; } @@ -544,6 +1330,13 @@ static int phase_2(dScnPly_c* i_this) { particle_no = dStage_stagInfo_GetParticleNo(dComIfGp_getStage()->getStagInfo()); } + #if DEBUG + if (fapGm_HIO_c::mParticle254Fix) { + particle_no = 0xFE; + } + #endif + + OS_REPORT("============== sceneParticleNo=%d\n", particle_no); dComIfGp_particle_readScene(particle_no, &i_this->sceneCommand); dMsgObject_readMessageGroup(&i_this->field_0x1d0); return cPhs_NEXT_e; @@ -558,6 +1351,10 @@ static int phase_3(dScnPly_c* i_this) { return cPhs_INIT_e; } + #if VERSION == VERSION_SHIELD_DEBUG + dBgp_c::createShare(); + #endif + return cPhs_NEXT_e; } @@ -570,9 +1367,16 @@ dScnPly_preset_HIO_c g_presetHIO; #endif static int phase_4(dScnPly_c* i_this) { + #if VERSION == VERSION_SHIELD_DEBUG + if (!dBgp_c::executeShare()) { + return cPhs_INIT_e; + } + #endif + if (i_this->sceneCommand) { + JUT_ASSERT(2610, i_this->sceneCommand->getMemAddress() != NULL); dComIfGp_particle_createScene(i_this->sceneCommand->getMemAddress()); - i_this->sceneCommand->destroy(); + delete i_this->sceneCommand; } else { dComIfGp_particle_createScene(NULL); } @@ -583,13 +1387,25 @@ static int phase_4(dScnPly_c* i_this) { } dComIfGp_calcNowRegion(); + #if DEBUG + dComIfG_initStopwatch(); + #endif dComIfG_Bgsp().Ct(); fopAcM_lc_c::getLineCheck()->ClearPi(); fopAcM_gc_c::getGroundCheck()->ClearPi(); fopAcM_rc_c::getRoofCheck()->ClearPi(); fopAcM_wt_c::getWaterCheck()->ClearPi(); dComIfG_Ccsp()->Ct(); + #if VERSION == VERSION_SHIELD_DEBUG + dPath_Ct(); + #endif dDemo_c::create(); + dEyeHL_mng_c::create(); + + #if DEBUG + dJcame_c::create(dDemo_c::getSystem(), 0.03333334f, *mDoCPd_c::getGamePad(PAD_4)); + dJprev_c::create((JStudio::TControl*)dDemo_c::getControl(), *mDoCPd_c::getGamePad(PAD_4)); + #endif dComIfGp_setPlayerInfo(0, NULL, 0); for (int i = 0; i < 2; i++) { @@ -602,11 +1418,19 @@ static int phase_4(dScnPly_c* i_this) { dComIfGd_setViewport(NULL); dComIfGd_setView(NULL); - dComIfGp_setExpHeap2D(fopMsgM_createExpHeap(0xBB800, NULL)); - dComIfGp_setMsgExpHeap(fopMsgM_createExpHeap(0xA800, NULL)); + JKRExpHeap* heap = fopMsgM_createExpHeap(0xBB800, NULL); + JUT_ASSERT(2704, heap != NULL); + dComIfGp_setExpHeap2D(heap); + + JKRExpHeap* heap2 = fopMsgM_createExpHeap(0xA800, NULL); + JUT_ASSERT(2709, heap2 != NULL); + dComIfGp_setMsgExpHeap(heap2); if (fpcM_GetName(i_this) == PROC_OPENING_SCENE) { fopAcM_create(PROC_TITLE, 0, NULL, -1, NULL, NULL, -1); + #if DEBUG + g_playerKind = 0; + #endif dComIfGs_init(); dComIfGs_setOptPointer(0); dComIfGs_setLife(12); @@ -622,10 +1446,20 @@ static int phase_4(dScnPly_c* i_this) { dComIfGp_createSimpleModel(); dMdl_mng_c::create(); - mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 30); - g_envHIO.field_0x4 = -1; - g_save_bit_HIO.field_0x4 = -1; - new (dComIfGp_getAttention()) dAttention_c(dComIfGp_getPlayer(0), 0); + mDoGph_gInf_c::setTickRate(OS_TIMER_CLOCK / 30); + + #if DEBUG + g_preLoadHIO.entryHIO("プリロード制御"); + #endif + g_envHIO.field_0x4 = mDoHIO_CREATE_CHILD("描画設定", &g_envHIO); + g_save_bit_HIO.field_0x4 = mDoHIO_CREATE_CHILD("記録ビット", &g_save_bit_HIO); + + #if DEBUG + daObj::HioObj_c::init(); + #endif + + dAttention_c* attention = dComIfGp_getAttention(); + new (attention) dAttention_c(dComIfGp_getPlayer(0), 0); dComIfGp_getVibration().Init(); daYkgr_c::init(); @@ -650,6 +1484,7 @@ static int phase_4(dScnPly_c* i_this) { return cPhs_COMPLEATE_e; } + OS_REPORT("\x1b[32mプリロードやります\n\x1b[m"); resPreLoadTime0 = OSGetTime(); return cPhs_NEXT_e; } @@ -657,25 +1492,30 @@ static int phase_4(dScnPly_c* i_this) { static int phase_5(dScnPly_c* i_this) { if (preLoadNo >= 0) { int phase_state = cPhs_NEXT_e; + int goodLoads = 0; + int loadNum = 0; const char** resNames = PreLoadInfoT[preLoadNo].resNameTbl; s32 resNameNum = PreLoadInfoT[preLoadNo].resNameNum; if (resNames != NULL && *resNames != NULL) { JUT_ASSERT(2830, resNameNum <= ARRAY_SIZEU(resPhase)); - int goodLoads = 0; - int loadNum = 0; + for (int i = 0; i < resNameNum; i++) { - if (dComIfG_resLoad(&resPhase[i], resNames[i]) == 4) { - goodLoads++; - } else { + int load_phase = dComIfG_resLoad(&resPhase[i], resNames[i]); + if (load_phase != cPhs_COMPLEATE_e) { phase_state = cPhs_INIT_e; + } else { + goodLoads++; } loadNum++; } + + OS_REPORT("\x1b[32mリソースプリロード %d/%d\n\x1b[m", goodLoads, loadNum); } if (phase_state == cPhs_COMPLEATE_e) { resPreLoadTime1 = OSGetTime(); + OS_REPORT("\x1b[32mリソースプリロード %lld ms\n\x1b[m", OSTicksToMilliseconds(resPreLoadTime1 - resPreLoadTime0)); } return phase_state; @@ -687,25 +1527,30 @@ static int phase_5(dScnPly_c* i_this) { static int phase_6(dScnPly_c* i_this) { if (preLoadNo >= 0) { int phase_state = cPhs_NEXT_e; + int goodLoads = 0; + int loadNum = 0; const s16* dylKeyTbl = PreLoadInfoT[preLoadNo].profNameTbl; s32 dylKeyTblNum = PreLoadInfoT[preLoadNo].dylKeyTblNum; if (dylKeyTbl != NULL && *dylKeyTbl != 0) { JUT_ASSERT(2864, dylKeyTblNum <= ARRAY_SIZEU(dylPhase)); - int goodLoads = 0; - int loadNum = 0; + for (int i = 0; i < dylKeyTblNum; i++) { - if (cDylPhs::Link(&dylPhase[i], dylKeyTbl[i]) == cPhs_COMPLEATE_e) { - goodLoads++; - } else { + int load_phase = cDylPhs::Link(&dylPhase[i], dylKeyTbl[i]); + if (load_phase != cPhs_COMPLEATE_e) { phase_state = cPhs_INIT_e; + } else { + goodLoads++; } loadNum++; } + + OS_REPORT("\x1b[32mダイナミックリンクプリロード %d/%d\n\x1b[m", goodLoads, loadNum); } if (phase_state == cPhs_COMPLEATE_e) { dylPreLoadTime1 = OSGetTime(); + OS_REPORT("\x1b[32mダイナミックリンクプリロード %lld ms\n\x1b[m", OSTicksToMilliseconds(dylPreLoadTime1 - dylPreLoadTime0)); } return phase_state; @@ -720,15 +1565,22 @@ static int phase_compleate(void* i_this) { static int dScnPly_Create(scene_class* i_this) { static request_of_phase_process_fn l_method[] = { - (request_of_phase_process_fn)phase_00, (request_of_phase_process_fn)phase_1, - (request_of_phase_process_fn)phase_1_0, (request_of_phase_process_fn)phase_01, - (request_of_phase_process_fn)phase_0, (request_of_phase_process_fn)phase_2, - (request_of_phase_process_fn)phase_3, (request_of_phase_process_fn)phase_4, - (request_of_phase_process_fn)phase_5, (request_of_phase_process_fn)phase_6, + (request_of_phase_process_fn)phase_00, + (request_of_phase_process_fn)phase_1, + (request_of_phase_process_fn)phase_1_0, + (request_of_phase_process_fn)phase_01, + (request_of_phase_process_fn)phase_0, + (request_of_phase_process_fn)phase_2, + (request_of_phase_process_fn)phase_3, + (request_of_phase_process_fn)phase_4, + (request_of_phase_process_fn)phase_5, + (request_of_phase_process_fn)phase_6, (request_of_phase_process_fn)phase_compleate, }; - return dComLbG_PhaseHandler(&static_cast(i_this)->field_0x1c4, l_method, i_this); + dScnPly_c* a_this = (dScnPly_c*)i_this; + int phase_state = dComLbG_PhaseHandler(&a_this->field_0x1c4, l_method, a_this); + return phase_state; } static scene_method_class l_dScnPly_Method = { diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index f0438d1e2e..e60ca18a7e 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1552,7 +1552,7 @@ u8 data_8074C56A_debug; u8 data_8074C56B_debug; u8 data_8074C56C_debug; -u32 dStage_roomControl_c::mProcID; +fpc_ProcID dStage_roomControl_c::mProcID; s8 dStage_roomControl_c::mStayNo; @@ -2502,7 +2502,7 @@ static void dStage_dt_c_stageInitLoader(void* i_data, dStage_dt_c* i_stage) { } #if DEBUG -static void dStage_DebugDisp() { +void dStage_DebugDisp() { if (data_8074C569_debug) { JUTReport(30, 270, "envLayerSet: EnvRoom None"); } diff --git a/src/dolphin/os/OSContext.cpp b/src/dolphin/os/OSContext.cpp deleted file mode 100644 index 4f54b8b963..0000000000 --- a/src/dolphin/os/OSContext.cpp +++ /dev/null @@ -1,92 +0,0 @@ -// OSContext.cpp - PC implementation of GameCube OSContext API -// Replaces PowerPC assembly context switching with minimal PC stubs. -// On PC there is no register-level context save/restore; the OS handles -// thread contexts natively via std::thread. - -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -// --- Current context pointer (per-process, not per-thread) --- -static OSContext* sCurrentContext = nullptr; - -OSContext* OSGetCurrentContext(void) { - return sCurrentContext; -} - -void OSSetCurrentContext(OSContext* context) { - sCurrentContext = context; -} - -void OSClearContext(OSContext* context) { - if (!context) return; - context->mode = 0; - context->state = 0; -} - -void OSInitContext(OSContext* context, u32 pc, u32 newsp) { - if (!context) return; - memset(context, 0, sizeof(OSContext)); - context->srr0 = pc; - context->gpr[1] = newsp; -} - -u32 OSSaveContext(OSContext* context) { - // On PC we don't save PowerPC registers. - // Return 0 = "context was just saved" (as opposed to 1 = "restored from save"). - return 0; -} - -void OSLoadContext(OSContext* context) { - // No-op on PC (no PowerPC register restore) -} - -void OSDumpContext(OSContext* context) { - if (!context) { - OSReport("[PC] OSDumpContext: NULL context\n"); - return; - } - OSReport("[PC] OSDumpContext: context at %p (no register info on PC)\n", context); -} - -void OSFillFPUContext(OSContext* context) { - // No-op on PC (no PowerPC FPU state) -} - -void OSLoadFPUContext(OSContext* fpucontext) { - // No-op on PC -} - -void OSSaveFPUContext(OSContext* fpucontext) { - // No-op on PC -} - -u32 OSGetStackPointer(void) { - // Return approximate stack pointer - volatile u32 dummy; - return (u32)(uintptr_t)&dummy; -} - -u32 OSSwitchStack(u32 newsp) { - // Not meaningful on PC - return current sp - return OSGetStackPointer(); -} - -int OSSwitchFiber(u32 pc, u32 newsp) { - // Not meaningful on PC - OSReport("[PC] OSSwitchFiber: not supported on PC\n"); - return 0; -} - -void __OSContextInit(void) { - // On GC this installs the FPU exception handler. - // On PC nothing to do. -} - -#ifdef __cplusplus -} -#endif diff --git a/src/dolphin/os/OSMutex.cpp b/src/dolphin/os/OSMutex.cpp deleted file mode 100644 index 9ec3197cb1..0000000000 --- a/src/dolphin/os/OSMutex.cpp +++ /dev/null @@ -1,243 +0,0 @@ -// OSMutex.cpp - PC implementation of GameCube OSMutex/OSCond API -// Uses std::recursive_mutex and std::condition_variable_any behind the -// unchanged GameCube C API. The OSMutex struct layout is preserved so -// game code can read its fields. - -#include -#include - -#include -#include -#include -#include -#include - -// ============================================================================ -// Malloc-based allocator to bypass JKRHeap operator new/delete -// Without this, side-table allocations call operator new -> JKRHeap::alloc -// -> OSLockMutex -> GetMutexData -> operator new ... infinite recursion. -// ============================================================================ - -template -struct MallocAllocator { - using value_type = T; - MallocAllocator() = default; - template MallocAllocator(const MallocAllocator&) noexcept {} - T* allocate(std::size_t n) { - void* p = std::malloc(n * sizeof(T)); - if (!p) throw std::bad_alloc(); - return static_cast(p); - } - void deallocate(T* p, std::size_t) noexcept { std::free(p); } - template bool operator==(const MallocAllocator&) const noexcept { return true; } - template bool operator!=(const MallocAllocator&) const noexcept { return false; } -}; - -template -struct MallocDeleter { - void operator()(T* p) const { - p->~T(); - std::free(p); - } -}; - -template -std::unique_ptr> make_malloc_unique(Args&&... args) { - void* mem = std::malloc(sizeof(T)); - if (!mem) throw std::bad_alloc(); - T* obj = new (mem) T(std::forward(args)...); - return std::unique_ptr>(obj); -} - -// ============================================================================ -// Side-table: native mutex per OSMutex -// ============================================================================ - -struct PCMutexData { - std::recursive_mutex nativeMutex; -}; - -template -using MallocMap = std::unordered_map, std::equal_to, - MallocAllocator>>; - -// Lazy-initialized to avoid DLL static init crashes -static std::mutex& GetMutexMapMutex() { - static std::mutex mtx; - return mtx; -} -static MallocMap>>& GetMutexMap() { - static MallocMap>> map; - return map; -} - -static PCMutexData& GetMutexData(OSMutex* mutex) { - std::lock_guard lock(GetMutexMapMutex()); - auto& map = GetMutexMap(); - auto it = map.find(mutex); - if (it == map.end()) { - auto result = map.emplace(mutex, make_malloc_unique()); - return *result.first->second; - } - return *it->second; -} - -// ============================================================================ -// Side-table: native condition variable per OSCond -// ============================================================================ - -struct PCCondData { - std::condition_variable_any cv; -}; - -// Lazy-initialized to avoid DLL static init crashes -static std::mutex& GetCondMapMutex() { - static std::mutex mtx; - return mtx; -} -static MallocMap>>& GetCondMap() { - static MallocMap>> map; - return map; -} - -static PCCondData& GetCondData(OSCond* cond) { - std::lock_guard lock(GetCondMapMutex()); - auto& map = GetCondMap(); - auto it = map.find(cond); - if (it == map.end()) { - auto result = map.emplace(cond, make_malloc_unique()); - return *result.first->second; - } - return *it->second; -} - -// ============================================================================ -// C API functions -// ============================================================================ - -extern "C" { - -void OSInitMutex(OSMutex* mutex) { - if (!mutex) return; - OSInitThreadQueue(&mutex->queue); - mutex->thread = nullptr; - mutex->count = 0; - - // Create/reset side-table entry - GetMutexData(mutex); -} - -void OSLockMutex(OSMutex* mutex) { - if (!mutex) return; - - PCMutexData& data = GetMutexData(mutex); - data.nativeMutex.lock(); - - // Update GC-visible fields - OSThread* currentThread = OSGetCurrentThread(); - mutex->thread = currentThread; - mutex->count++; -} - -void OSUnlockMutex(OSMutex* mutex) { - if (!mutex) return; - - OSThread* currentThread = OSGetCurrentThread(); - if (mutex->thread != currentThread) return; - - mutex->count--; - if (mutex->count == 0) { - mutex->thread = nullptr; - } - - PCMutexData& data = GetMutexData(mutex); - data.nativeMutex.unlock(); -} - -BOOL OSTryLockMutex(OSMutex* mutex) { - if (!mutex) return FALSE; - - PCMutexData& data = GetMutexData(mutex); - if (data.nativeMutex.try_lock()) { - OSThread* currentThread = OSGetCurrentThread(); - mutex->thread = currentThread; - mutex->count++; - return TRUE; - } - return FALSE; -} - -// ============================================================================ -// Internal: unlock all mutexes held by a thread (called on thread exit) -// ============================================================================ - -void __OSUnlockAllMutex(OSThread* thread) { - // On GC this walks the thread's mutex queue. - // On PC the native mutexes are cleaned up when threads exit. - // Clear the GC-visible queue. - if (!thread) return; - thread->queueMutex.head = nullptr; - thread->queueMutex.tail = nullptr; -} - -int __OSCheckDeadLock(OSThread* thread) { - // Simplified: native OS handles deadlock detection. - return 0; -} - -int __OSCheckMutexes(OSThread* thread) { - return 1; -} - -// ============================================================================ -// Condition Variable API -// ============================================================================ - -void OSInitCond(OSCond* cond) { - if (!cond) return; - OSInitThreadQueue(&cond->queue); - GetCondData(cond); -} - -void OSWaitCond(OSCond* cond, OSMutex* mutex) { - if (!cond || !mutex) return; - - PCCondData& condData = GetCondData(cond); - PCMutexData& mutexData = GetMutexData(mutex); - - // Save and clear the GC mutex state - OSThread* currentThread = OSGetCurrentThread(); - s32 savedCount = mutex->count; - mutex->count = 0; - mutex->thread = nullptr; - - // Unlock the recursive mutex the same number of times it was locked - for (s32 i = 0; i < savedCount; i++) { - mutexData.nativeMutex.unlock(); - } - - // Wait on the condition variable - { - std::unique_lock lock(mutexData.nativeMutex); - condData.cv.wait(lock); - } - - // Re-lock the recursive mutex the same number of times - for (s32 i = 0; i < savedCount; i++) { - mutexData.nativeMutex.lock(); - } - - // Restore GC mutex state - mutex->thread = currentThread; - mutex->count = savedCount; -} - -void OSSignalCond(OSCond* cond) { - if (!cond) return; - PCCondData& condData = GetCondData(cond); - condData.cv.notify_all(); -} - -#ifdef __cplusplus -} -#endif diff --git a/src/dolphin/os/OSThread.cpp b/src/dolphin/os/OSThread.cpp deleted file mode 100644 index 96ef2bcfff..0000000000 --- a/src/dolphin/os/OSThread.cpp +++ /dev/null @@ -1,747 +0,0 @@ -// OSThread.cpp - PC implementation of GameCube OSThread API -// Maps GameCube cooperative threading to native OS threads via std::thread. -// The OSThread struct layout is preserved so game code can read its fields. -// A side-table stores the native std::thread and synchronization primitives. - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// ============================================================================ -// Malloc-based allocator to bypass JKRHeap operator new/delete -// ============================================================================ - -template -struct MallocAllocator { - using value_type = T; - MallocAllocator() = default; - template MallocAllocator(const MallocAllocator&) noexcept {} - T* allocate(std::size_t n) { - void* p = std::malloc(n * sizeof(T)); - if (!p) throw std::bad_alloc(); - return static_cast(p); - } - void deallocate(T* p, std::size_t) noexcept { std::free(p); } - template bool operator==(const MallocAllocator&) const noexcept { return true; } - template bool operator!=(const MallocAllocator&) const noexcept { return false; } -}; - -template -struct MallocDeleter { - void operator()(T* p) const { - p->~T(); - std::free(p); - } -}; - -template -std::unique_ptr> make_malloc_unique(Args&&... args) { - void* mem = std::malloc(sizeof(T)); - if (!mem) throw std::bad_alloc(); - T* obj = new (mem) T(std::forward(args)...); - return std::unique_ptr>(obj); -} - -template -using MallocMap = std::unordered_map, std::equal_to, - MallocAllocator>>; - -// ============================================================================ -// Side-table: native thread data per OSThread -// ============================================================================ - -struct PCThreadData { - std::thread nativeThread; - std::mutex mtx; - std::condition_variable cv; - void* (*func)(void*); - void* param; - bool started = false; - bool suspended = false; -}; - -// Lazy-initialized to avoid DLL static init crashes (used before DllMain completes) -static std::mutex& GetThreadDataMutex() { - static std::mutex mtx; - return mtx; -} -static MallocMap>>& GetThreadDataMap() { - static MallocMap>> map; - return map; -} - -// Side-table for OSThreadQueue -> condition_variable (for OSSleepThread/OSWakeupThread) -static std::mutex& GetQueueCvMutex() { - static std::mutex mtx; - return mtx; -} -static MallocMap>>& GetQueueCvMap() { - static MallocMap>> map; - return map; -} - -static std::condition_variable& GetQueueCV(OSThreadQueue* queue) { - std::lock_guard lock(GetQueueCvMutex()); - auto& map = GetQueueCvMap(); - auto it = map.find(queue); - if (it == map.end()) { - auto result = map.emplace(queue, make_malloc_unique()); - return *result.first->second; - } - return *it->second; -} - -// ============================================================================ -// Thread-local current thread pointer -// ============================================================================ - -static thread_local OSThread* tls_currentThread = nullptr; - -// ============================================================================ -// Global state -// ============================================================================ - -static OSThread sDefaultThread; -static u8 sDefaultStack[64 * 1024]; -static u32 sDefaultStackEnd = OS_THREAD_STACK_MAGIC; - -OSThreadQueue __OSActiveThreadQueue; - -// Global interrupt mutex (coarse-grained lock replacing interrupt disable) -// Lazy-initialized to avoid DLL static init crashes -static std::recursive_mutex& GetInterruptMutex() { - static std::recursive_mutex mtx; - return mtx; -} -static thread_local int sInterruptLockCount = 0; - -// Scheduler suspend count -static std::atomic sSchedulerSuspendCount{0}; - -// Active thread count -static std::atomic sActiveThreadCount{0}; - -// Switch thread callback -static OSSwitchThreadCallback sSwitchThreadCallback = nullptr; - -// ============================================================================ -// Internal helpers -// ============================================================================ - -// Linked list macros for the active thread queue -static void EnqueueActive(OSThread* thread) { - OSThread* prev = __OSActiveThreadQueue.tail; - if (prev == nullptr) { - __OSActiveThreadQueue.head = thread; - } else { - prev->linkActive.next = thread; - } - thread->linkActive.prev = prev; - thread->linkActive.next = nullptr; - __OSActiveThreadQueue.tail = thread; -} - -static void DequeueActive(OSThread* thread) { - OSThread* next = thread->linkActive.next; - OSThread* prev = thread->linkActive.prev; - if (next == nullptr) { - __OSActiveThreadQueue.tail = prev; - } else { - next->linkActive.prev = prev; - } - if (prev == nullptr) { - __OSActiveThreadQueue.head = next; - } else { - prev->linkActive.next = next; - } - thread->linkActive.next = nullptr; - thread->linkActive.prev = nullptr; -} - -// Thread entry wrapper - runs on the new std::thread -static void ThreadEntryWrapper(OSThread* thread, PCThreadData* data) { - // Set thread-local pointer - tls_currentThread = thread; - - // Set context pointers for this thread - OSClearContext(&thread->context); - OSSetCurrentContext(&thread->context); - - thread->state = OS_THREAD_STATE_RUNNING; - - // Call the actual thread function - void* result = data->func(data->param); - - // Thread returned - equivalent to OSExitThread - thread->val = result; - thread->state = OS_THREAD_STATE_MORIBUND; -} - -// ============================================================================ -// C API functions -// ============================================================================ - -extern "C" { - -void __OSThreadInit(void) { - memset(&sDefaultThread, 0, sizeof(OSThread)); - - sDefaultThread.state = OS_THREAD_STATE_RUNNING; - sDefaultThread.attr = OS_THREAD_ATTR_DETACH; - sDefaultThread.priority = 16; - sDefaultThread.base = 16; - sDefaultThread.suspend = 0; - sDefaultThread.val = (void*)(intptr_t)-1; - sDefaultThread.mutex = nullptr; - sDefaultThread.queue = nullptr; - - OSInitThreadQueue(&sDefaultThread.queueJoin); - sDefaultThread.queueMutex.head = sDefaultThread.queueMutex.tail = nullptr; - sDefaultThread.link.next = sDefaultThread.link.prev = nullptr; - sDefaultThread.linkActive.next = sDefaultThread.linkActive.prev = nullptr; - - // Stack pointers (JKRThread reads these) - sDefaultThread.stackBase = sDefaultStack + sizeof(sDefaultStack); - sDefaultThread.stackEnd = &sDefaultStackEnd; - sDefaultStackEnd = OS_THREAD_STACK_MAGIC; - - OSClearContext(&sDefaultThread.context); - - sDefaultThread.error = 0; - sDefaultThread.specific[0] = nullptr; - sDefaultThread.specific[1] = nullptr; - - // Set as current thread for main thread - tls_currentThread = &sDefaultThread; - - // Active queue - OSInitThreadQueue(&__OSActiveThreadQueue); - EnqueueActive(&sDefaultThread); - sActiveThreadCount = 1; - - OSReport("[PC-OSThread] Thread system initialized (multi-threaded mode)\n"); -} - -// ============================================================================ -// Thread Queue -// ============================================================================ - -void OSInitThreadQueue(OSThreadQueue* queue) { - if (queue) { - queue->head = queue->tail = nullptr; - } -} - -// ============================================================================ -// Current Thread -// ============================================================================ - -OSThread* OSGetCurrentThread(void) { - // Lazy-init for main thread if __OSThreadInit hasn't been called yet - if (tls_currentThread == nullptr) { - __OSThreadInit(); - } - return tls_currentThread; -} - -// ============================================================================ -// Thread Creation -// ============================================================================ - -int OSCreateThread(OSThread* thread, void* (*func)(void*), void* param, - void* stack, u32 stackSize, OSPriority priority, u16 attr) { - if (!thread) return 0; - if (priority < OS_PRIORITY_MIN || priority > OS_PRIORITY_MAX) return 0; - - // Ensure thread system is initialized - OSGetCurrentThread(); - - memset(thread, 0, sizeof(OSThread)); - - thread->state = OS_THREAD_STATE_READY; - thread->attr = attr & 1u; - thread->base = priority; - thread->priority = priority; - thread->suspend = 1; // Created suspended (GC behavior) - thread->val = (void*)(intptr_t)-1; - thread->mutex = nullptr; - - OSInitThreadQueue(&thread->queueJoin); - thread->queueMutex.head = thread->queueMutex.tail = nullptr; - thread->link.next = thread->link.prev = nullptr; - thread->linkActive.next = thread->linkActive.prev = nullptr; - - // Stack (stack points to TOP on GameCube) - thread->stackBase = (u8*)stack; - thread->stackEnd = (u32*)((uintptr_t)stack - stackSize); - *thread->stackEnd = OS_THREAD_STACK_MAGIC; - - OSClearContext(&thread->context); - - thread->error = 0; - thread->specific[0] = nullptr; - thread->specific[1] = nullptr; - - // Create side-table entry (but don't start the thread yet) - { - auto data = make_malloc_unique(); - data->func = func; - data->param = param; - - std::lock_guard lock(GetThreadDataMutex()); - GetThreadDataMap()[thread] = std::move(data); - } - - // Add to active queue - EnqueueActive(thread); - sActiveThreadCount++; - - OSReport("[PC-OSThread] Created thread %p (priority=%d, stackSize=%u)\n", - thread, priority, stackSize); - return 1; -} - -// ============================================================================ -// Resume / Suspend -// ============================================================================ -/* -s32 OSResumeThread(OSThread* thread) { - if (!thread) return 0; - - s32 prevSuspend = thread->suspend; - if (thread->suspend > 0) { - thread->suspend--; - } - - if (thread->suspend == 0) { - std::lock_guard lock(GetThreadDataMutex()); - auto it = GetThreadDataMap().find(thread); - if (it != GetThreadDataMap().end()) { - PCThreadData* data = it->second.get(); - if (!data->started) { - // First resume: launch the native thread - data->started = true; - data->suspended = false; - data->nativeThread = std::thread(ThreadEntryWrapper, thread, data); - data->nativeThread.detach(); - OSReport("[PC-OSThread] Started thread %p\n", thread); - } else if (data->suspended) { - // Resume from suspension: signal the CV - data->suspended = false; - data->cv.notify_one(); - } - } - } - - return prevSuspend; -} - -s32 OSSuspendThread(OSThread* thread) { - if (!thread) return 0; - - s32 prevSuspend = thread->suspend; - thread->suspend++; - - if (prevSuspend == 0) { - std::lock_guard lock(GetThreadDataMutex()); - auto it = GetThreadDataMap().find(thread); - if (it != GetThreadDataMap().end()) { - PCThreadData* data = it->second.get(); - if (data->started) { - data->suspended = true; - // The thread must check its suspended flag and wait - } - } - } - - return prevSuspend; -} -*/ - -// ============================================================================ -// Resume / Suspend -// ============================================================================ - -s32 OSResumeThread(OSThread* thread) { - if (!thread) - return 0; - - s32 prevSuspend = thread->suspend; - if (thread->suspend > 0) { - thread->suspend--; - } - - // Only wake up if suspend count drops to 0 - if (thread->suspend == 0) { - PCThreadData* data = nullptr; - - // Lock the global map to safely retrieve our thread data pointer - { - std::lock_guard mapLock(GetThreadDataMutex()); - auto it = GetThreadDataMap().find(thread); - if (it != GetThreadDataMap().end()) { - data = it->second.get(); - } - } - - if (data) { - // Lock the specific thread mutex to safely modify state and notify - std::unique_lock threadLock(data->mtx); - - if (!data->started) { - // First resume: launch the native thread - data->started = true; - data->suspended = false; - - // Unlock before launching to avoid potential deadlocks in thread initialization - threadLock.unlock(); - - data->nativeThread = std::thread(ThreadEntryWrapper, thread, data); - data->nativeThread.detach(); - OSReport("[PC-OSThread] Started thread %p\n", thread); - } else { - // Resume from suspension: signal the condition variable - // IMPORTANT: Set suspended to false BEFORE notifying to pass the wait predicate - data->suspended = false; - data->cv.notify_all(); - } - } - } - - return prevSuspend; -} - -s32 OSSuspendThread(OSThread* thread) { - if (!thread) - return 0; - - s32 prevSuspend = thread->suspend; - thread->suspend++; - - // If transitioning from running (0) to suspended (1) - if (prevSuspend == 0) { - PCThreadData* data = nullptr; - - // Lock the global map to find our thread data - { - std::lock_guard mapLock(GetThreadDataMutex()); - auto it = GetThreadDataMap().find(thread); - if (it != GetThreadDataMap().end()) { - data = it->second.get(); - } - } - - if (data && data->started) { - std::unique_lock threadLock(data->mtx); - data->suspended = true; - - // FIX: If the thread is suspending ITSELF, we must block execution here. - // This replicates the GameCube behavior where OSSuspendThread yields the CPU - // immediately. - if (thread == OSGetCurrentThread()) { - // Block until 'suspended' becomes false (set by OSResumeThread) - // The predicate protects against spurious wakeups. - data->cv.wait(threadLock, [data] { return !data->suspended; }); - } else { - // NOTE: Suspending *other* threads is difficult in C++ std::thread - // without cooperative checkpoints or platform-specific hacks. - // For now, we only set the flag. The target thread would need to check 'suspended' - // periodically. - } - } - } - - return prevSuspend; -} - -// ============================================================================ -// Sleep / Wakeup (thread queue based) -// ============================================================================ - -void OSSleepThread(OSThreadQueue* queue) { - if (!queue) return; - - OSThread* currentThread = OSGetCurrentThread(); - if (!currentThread) return; - - currentThread->state = OS_THREAD_STATE_WAITING; - currentThread->queue = queue; - - // Enqueue into the thread queue - OSThread* prev = queue->tail; - if (prev == nullptr) { - queue->head = currentThread; - } else { - prev->link.next = currentThread; - } - currentThread->link.prev = prev; - currentThread->link.next = nullptr; - queue->tail = currentThread; - - // Wait on the condition variable for this queue - std::condition_variable& cv = GetQueueCV(queue); - std::unique_lock lock(GetQueueCvMutex()); - cv.wait(lock, [currentThread]() { - return currentThread->state != OS_THREAD_STATE_WAITING; - }); -} - -void OSWakeupThread(OSThreadQueue* queue) { - if (!queue) return; - - // Wake all threads in the queue - OSThread* thread = queue->head; - while (thread) { - OSThread* next = thread->link.next; - thread->state = OS_THREAD_STATE_READY; - thread->link.next = nullptr; - thread->link.prev = nullptr; - thread->queue = nullptr; - thread = next; - } - queue->head = queue->tail = nullptr; - - // Notify all waiters - std::condition_variable& cv = GetQueueCV(queue); - cv.notify_all(); -} - -// ============================================================================ -// Exit / Cancel / Detach / Join -// ============================================================================ - -void OSExitThread(void* val) { - OSThread* currentThread = OSGetCurrentThread(); - if (!currentThread) return; - - currentThread->val = val; - - if (currentThread->attr & OS_THREAD_ATTR_DETACH) { - DequeueActive(currentThread); - currentThread->state = 0; - } else { - currentThread->state = OS_THREAD_STATE_MORIBUND; - } - - // Wake anyone waiting to join - OSWakeupThread(¤tThread->queueJoin); - sActiveThreadCount--; -} - -void OSCancelThread(OSThread* thread) { - if (!thread) return; - - if (thread->attr & OS_THREAD_ATTR_DETACH) { - DequeueActive(thread); - thread->state = 0; - } else { - thread->state = OS_THREAD_STATE_MORIBUND; - } - - OSWakeupThread(&thread->queueJoin); - sActiveThreadCount--; -} - -void OSDetachThread(OSThread* thread) { - if (!thread) return; - thread->attr |= OS_THREAD_ATTR_DETACH; - - if (thread->state == OS_THREAD_STATE_MORIBUND) { - DequeueActive(thread); - thread->state = 0; - } - OSWakeupThread(&thread->queueJoin); -} - -int OSJoinThread(OSThread* thread, void* val) { - if (!thread) return 0; - - if (!(thread->attr & OS_THREAD_ATTR_DETACH) && - thread->state != OS_THREAD_STATE_MORIBUND && - thread->queueJoin.head == nullptr) { - OSSleepThread(&thread->queueJoin); - } - - if (thread->state == OS_THREAD_STATE_MORIBUND) { - if (val) { - *(s32*)val = (s32)(intptr_t)thread->val; - } - DequeueActive(thread); - thread->state = 0; - return 1; - } - return 0; -} - -// ============================================================================ -// Yield / Terminated / Active -// ============================================================================ - -void OSYieldThread(void) { - std::this_thread::yield(); -} - -BOOL OSIsThreadSuspended(OSThread* thread) { - return (thread && thread->suspend > 0) ? TRUE : FALSE; -} - -BOOL OSIsThreadTerminated(OSThread* thread) { - if (!thread) return TRUE; - return (thread->state == OS_THREAD_STATE_MORIBUND || thread->state == 0) ? TRUE : FALSE; -} - -s32 OSCheckActiveThreads(void) { - return sActiveThreadCount.load(); -} - -// ============================================================================ -// Priority -// ============================================================================ - -int OSSetThreadPriority(OSThread* thread, OSPriority priority) { - if (!thread) return 0; - if (priority < OS_PRIORITY_MIN || priority > OS_PRIORITY_MAX) return 0; - thread->base = priority; - thread->priority = priority; - return 1; -} - -s32 OSGetThreadPriority(OSThread* thread) { - if (!thread) return 16; - return thread->base; -} - -// ============================================================================ -// Switch Thread Callback -// ============================================================================ - -OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback callback) { - OSSwitchThreadCallback prev = sSwitchThreadCallback; - sSwitchThreadCallback = callback; - return prev; -} - -// ============================================================================ -// Scheduler (atomic counter, no real effect with native OS threads) -// ============================================================================ - -s32 OSDisableScheduler(void) { - return sSchedulerSuspendCount.fetch_add(1); -} - -s32 OSEnableScheduler(void) { - return sSchedulerSuspendCount.fetch_sub(1); -} - -// ============================================================================ -// Interrupts (global recursive mutex for mutual exclusion) -// ============================================================================ - -BOOL OSDisableInterrupts(void) { - GetInterruptMutex().lock(); - sInterruptLockCount++; - return (BOOL)(sInterruptLockCount > 1); // TRUE if was already locked -} - -BOOL OSRestoreInterrupts(BOOL level) { - if (sInterruptLockCount > 0) { - sInterruptLockCount--; - GetInterruptMutex().unlock(); - } - return level; -} - -BOOL OSEnableInterrupts(void) { - if (sInterruptLockCount > 0) { - sInterruptLockCount--; - GetInterruptMutex().unlock(); - } - return FALSE; -} - -// ============================================================================ -// Idle function (stub on PC) -// ============================================================================ - -OSThread* OSSetIdleFunction(OSIdleFunction idleFunction, void* param, void* stack, u32 stackSize) { - return nullptr; -} - -OSThread* OSGetIdleFunction(void) { - return nullptr; -} - -// ============================================================================ -// Thread-specific storage -// ============================================================================ - -void OSSetThreadSpecific(s32 index, void* ptr) { - OSThread* thread = OSGetCurrentThread(); - if (thread && index >= 0 && index < OS_THREAD_SPECIFIC_MAX) { - thread->specific[index] = ptr; - } -} - -void* OSGetThreadSpecific(s32 index) { - OSThread* thread = OSGetCurrentThread(); - if (thread && index >= 0 && index < OS_THREAD_SPECIFIC_MAX) { - return thread->specific[index]; - } - return nullptr; -} - -// ============================================================================ -// Clear stack (minimal implementation) -// ============================================================================ - -void OSClearStack(u8 val) { - // On PC we don't clear the stack - it's managed by the OS -} - -// ============================================================================ -// Internal functions used by OSMutex -// ============================================================================ - -s32 __OSGetEffectivePriority(OSThread* thread) { - // On PC with native threads, priority inversion handling is simplified. - // Just return the base priority. - return thread ? thread->base : 16; -} - -void __OSPromoteThread(OSThread* thread, s32 priority) { - // Simplified: no real priority inheritance on PC - if (thread && priority < thread->priority) { - thread->priority = priority; - } -} - -void __OSReschedule(void) { - // With native OS threads, rescheduling is handled by the OS. - // Nothing to do here. -} - -// ============================================================================ -// Interrupt handler registration (stub) -// ============================================================================ - -__OSInterruptHandler __OSSetInterruptHandler(__OSInterrupt interrupt, - __OSInterruptHandler handler) { - return nullptr; -} - -OSInterruptMask __OSUnmaskInterrupts(OSInterruptMask mask) { - return 0; -} - -#ifdef __cplusplus -} -#endif diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index eddc63aaa0..f2e2d839c2 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -912,7 +912,7 @@ bool fopAcM_checkCullingBox(Mtx m, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z return false; } -static cull_box l_cullSizeBox[] = { +cull_box l_cullSizeBox[fopAc_CULLBOX_MAX_e] = { { {-40.0f, 0.0f, -40.0f}, {40.0f, 125.0f, 40.0f}, @@ -977,7 +977,7 @@ static cull_box l_cullSizeBox[] = { #endif }; -static cull_sphere l_cullSizeSphere[] = { +cull_sphere l_cullSizeSphere[fopAc_CULLSPHERE_MAX_e] = { { {0.0f, 0.0f, 0.0f}, 80.0f, diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index c65007622a..2e0563f2c9 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -12,8 +12,8 @@ static int fopKy_KANKYO_TYPE; -void fopKy_IsKankyo(void* i_this) { - fpcM_IsJustType(fopKy_KANKYO_TYPE, ((kankyo_class*)i_this)->type); +BOOL fopKy_IsKankyo(void* i_this) { + return fpcM_IsJustType(fopKy_KANKYO_TYPE, ((kankyo_class*)i_this)->type); } static int fopKy_Draw(void* i_this) { diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index 0093173817..fe71a828c2 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -11,8 +11,8 @@ void dummy(fpcLyIt_JudgeFunc i_createFunc, void* i_this) { fpcM_Search(i_createFunc, i_this); } -void fopKyM_IsKy(void* i_this) { - fopKy_IsKankyo((fopKyM_prm_class*)i_this); +BOOL fopKyM_IsKy(void* i_this) { + return fopKy_IsKankyo((fopKyM_prm_class*)i_this); } fopKyM_prm_class* fopKyM_CreateAppend() { diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index 8cc55fdcad..6d5ffd151c 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -9,7 +9,11 @@ #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_debug_sv.h" #include "SSystem/SComponent/c_phase.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include typedef struct standard_create_request_class { diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp index 0706d0a851..4984ea22c7 100644 --- a/src/m_Do/m_Do_DVDError.cpp +++ b/src/m_Do/m_Do_DVDError.cpp @@ -4,11 +4,11 @@ */ #include "m_Do/m_Do_DVDError.h" -#include #include "JSystem/JKernel/JKRAssertHeap.h" -#include "m_Do/m_Do_Reset.h" +#include #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" +#include "m_Do/m_Do_Reset.h" // Added for the sleep workaround #include diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index 29c72ac187..7832906589 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -3,7 +3,7 @@ * Memory Card Control */ -#include +#include #include "m_Do/m_Do_MemCard.h" #include "JSystem/JKernel/JKRAssertHeap.h" #include "m_Do/m_Do_ext.h" diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index e2a062d204..88f840bbcd 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -8,7 +8,7 @@ #include "JSystem/JUtility/JUTGamePad.h" #include "JSystem/JUtility/JUTXfb.h" #include "SSystem/SComponent/c_API_controller_pad.h" -#include +#include #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_DVDError.h" #include "m_Do/m_Do_ext.h" diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 5b5094cd58..fc386bda88 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -22,7 +22,7 @@ u8 mDoAud_zelAudio_c::mInitFlag; u8 mDoAud_zelAudio_c::mResetFlag; -bool mDoAud_zelAudio_c::mBgmSet; +u8 mDoAud_zelAudio_c::mBgmSet; void mDoAud_zelAudio_c::reset() { mBgmSet = false; diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index f94bcb5ba9..d7ace2cca1 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -5,8 +5,8 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include -#include +#include +#include #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 6f7cb1b714..778b937c9e 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -22,7 +22,7 @@ #include "d/d_menu_collect.h" #include "d/d_jcam_editor.h" #include "d/d_jpreviewer.h" -#include +#include #include "f_ap/f_ap_game.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_controller_pad.h" diff --git a/src/m_Do/m_Do_hostIO.cpp b/src/m_Do/m_Do_hostIO.cpp index 286a942110..6a3347efb5 100644 --- a/src/m_Do/m_Do_hostIO.cpp +++ b/src/m_Do/m_Do_hostIO.cpp @@ -1,6 +1,10 @@ #include "m_Do/m_Do_hostIO.h" #include "JSystem/JHostIO/JORServer.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #if DEBUG diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp index 3b8e5accdd..261a7db1f5 100644 --- a/src/m_Do/m_Do_lib.cpp +++ b/src/m_Do/m_Do_lib.cpp @@ -8,7 +8,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include +#include u32 mDoLib_setResTimgObj(ResTIMG const* i_img, GXTexObj* o_texObj, u32 tlut_name, GXTlutObj* o_tlutObj) { diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 05f9afcc0b..f4aa7d0562 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -5,7 +5,7 @@ #include "m_Do/m_Do_printf.h" #include -#include +#include #include "m_Do/m_Do_ext.h" u8 __OSReport_disable; diff --git a/src/odemuexi2/DebuggerDriver.c b/src/odemuexi2/DebuggerDriver.c index 2102bb8e16..d8821f5ce3 100644 --- a/src/odemuexi2/DebuggerDriver.c +++ b/src/odemuexi2/DebuggerDriver.c @@ -1,7 +1,7 @@ #include "odemuexi2/DebuggerDriver.h" -#include -#include +#include +#include static MTRCallbackType MTRCallback; diff --git a/src/odenotstub/odenotstub.c b/src/odenotstub/odenotstub.c index 48e09dbd05..282962e911 100644 --- a/src/odenotstub/odenotstub.c +++ b/src/odenotstub/odenotstub.c @@ -1,4 +1,8 @@ -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif u8 Hu_IsStub() { return 0; diff --git a/tools/project.py b/tools/project.py index b1417ae69a..f51482d98e 100644 --- a/tools/project.py +++ b/tools/project.py @@ -68,6 +68,7 @@ class Object: "shift_jis": None, "source": name, "src_dir": None, + "strip_prefix": None, } self.options.update(options) @@ -115,10 +116,13 @@ class Object: # Resolve paths build_dir = config.out_path() - obj.src_path = Path(obj.options["src_dir"]) / obj.options["source"] + source = obj.options["source"] + if obj.options["strip_prefix"]: + source = source.removeprefix(obj.options["strip_prefix"]) + obj.src_path = Path(obj.options["src_dir"]) / source if obj.options["asm_dir"] is not None: obj.asm_path = ( - Path(obj.options["asm_dir"]) / obj.options["source"] + Path(obj.options["asm_dir"]) / source ).with_suffix(".s") base_name = Path(self.name).with_suffix("") obj.src_obj_path = build_dir / "src" / f"{base_name}.o" @@ -356,14 +360,13 @@ def make_flags_str(flags: Optional[List[str]]) -> str: return " ".join(flags) -def get_pch_out_name(config: ProjectConfig, pch: PrecompiledHeader) -> str: - pch_rel_path = Path(pch["source"]) - pch_out_name = pch_rel_path.with_suffix(".mch") +def get_pch_out_path(config: ProjectConfig, pch: PrecompiledHeader) -> str: + pch_rel_path = Path(pch["output"]) # Use absolute path as a workaround to allow this target to be matched with absolute paths in depfiles. # # Without this any object which includes the PCH would depend on the .mch filesystem entry but not the # corresponding Ninja task, so the MCH would not be implicitly rebuilt when the PCH is modified. - return os.path.abspath(config.out_path() / "include" / pch_out_name) + return os.path.abspath(config.out_path() / "include" / pch_rel_path) # Unit configuration @@ -863,7 +866,7 @@ def generate_build_ninja( # Add all build steps needed before we compile (e.g. processing assets) pch_out_names = [ - get_pch_out_name(config, pch) for pch in config.precompiled_headers or [] + get_pch_out_path(config, pch) for pch in config.precompiled_headers or [] ] write_custom_step("pre-compile", extra_inputs=pch_out_names) @@ -967,14 +970,12 @@ def generate_build_ninja( if config.precompiled_headers: for pch in config.precompiled_headers: - src_path_rel_str = Path(pch["source"]) - src_path_rel = Path(src_path_rel_str) - pch_out_name = src_path_rel.with_suffix(".mch") - pch_out_abs_path = Path(get_pch_out_name(config, pch)) + src_path = Path(pch["source"]) + pch_out_abs_path = Path(get_pch_out_path(config, pch)) # Add appropriate language flag if it doesn't exist already cflags = pch["cflags"] if not any(flag.startswith("-lang") for flag in cflags): - if file_is_cpp(src_path_rel): + if file_is_cpp(src_path): cflags.insert(0, "-lang=c++") else: cflags.insert(0, "-lang=c") @@ -982,11 +983,11 @@ def generate_build_ninja( cflags_str = make_flags_str(cflags) shift_jis = pch.get("shift_jis", config.shift_jis) - n.comment(f"Precompiled header {pch_out_name}") + n.comment(f"Precompiled header {pch['output']}") n.build( outputs=pch_out_abs_path, rule="mwcc_pch_sjis" if shift_jis else "mwcc_pch", - inputs=f"include/{src_path_rel_str}", + inputs=src_path, variables={ "mw_version": Path(pch["mw_version"]), "cflags": cflags_str,