Merge branch '26-02-27-pjb-dev-2'

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "extern/aurora"]
 	path = extern/aurora
-	url = git@github.com:encounter/aurora.git
+	url = https://github.com/encounter/aurora.git

.vscode/launch.json

@@ -8,7 +8,8 @@
             "program": "${command:cmake.launchTargetPath}",
             "MIMode": "gdb",
             "miDebuggerPath": "gdb",
-            "symbolSearchPath": "${command:cmake.launchTargetPath}"
+            "symbolSearchPath": "${command:cmake.launchTargetPath}",
+            "console": "integratedTerminal"
         }
     ]
 }

CMakeLists.txt

@@ -59,8 +59,15 @@ add_library(game_debug STATIC ${JSYSTEM_DEBUG_FILES} ${SSYSTEM_FILES})
 target_compile_definitions(game_debug PRIVATE TARGET_PC VERSION=0 $<$<CONFIG:Debug>:DEBUG=1>)
 
 # Make these properties PUBLIC so that the regular game target also sees them.
-target_include_directories(game_debug PUBLIC include src assets/${DUSK_TP_VERSION} ${CMAKE_SOURCE_DIR}/build/${DUSK_TP_VERSION}/include)
-target_link_libraries(game_debug PUBLIC aurora::core aurora::gx aurora::si aurora::vi aurora::pad aurora::mtx)
+target_include_directories(game_debug PUBLIC
+        include
+        src
+        assets/${DUSK_TP_VERSION}
+        libs/JSystem/include
+        extern/aurora/include/dolphin
+        ${CMAKE_SOURCE_DIR}/build/${DUSK_TP_VERSION}/include
+        build/${DUSK_TP_VERSION}/include)
+target_link_libraries(game_debug PUBLIC aurora::core aurora::gx aurora::si aurora::vi aurora::pad aurora::mtx aurora::os)
 
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 add_library(game SHARED ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${SSYSTEM_FILES} ${JSYSTEM_FILES} ${REL_FILES} ${DUSK_FILES})

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",
             ),
         ],
     },

files.cmake

@@ -315,243 +315,243 @@ set(SSYSTEM_FILES
 )
 
 set(JSYSTEM_DEBUG_FILES
-        src/JSystem/JParticle/JPAResourceManager.cpp
-        src/JSystem/JParticle/JPAResource.cpp
-        src/JSystem/JParticle/JPABaseShape.cpp
-        src/JSystem/JParticle/JPAExtraShape.cpp
-        src/JSystem/JParticle/JPAChildShape.cpp
-        src/JSystem/JParticle/JPAExTexShape.cpp
-        src/JSystem/JParticle/JPADynamicsBlock.cpp
-        src/JSystem/JParticle/JPAFieldBlock.cpp
-        src/JSystem/JParticle/JPAKeyBlock.cpp
-        src/JSystem/JParticle/JPATexture.cpp
-        src/JSystem/JParticle/JPAResourceLoader.cpp
-        src/JSystem/JParticle/JPAEmitterManager.cpp
-        src/JSystem/JParticle/JPAEmitter.cpp
-        src/JSystem/JParticle/JPAParticle.cpp
-        src/JSystem/JParticle/JPAMath.cpp
-        src/JSystem/JFramework/JFWSystem.cpp
-        src/JSystem/JFramework/JFWDisplay.cpp
-        src/JSystem/J3DU/J3DUClipper.cpp
-        src/JSystem/J3DU/J3DUDL.cpp
-        src/JSystem/JKernel/JKRHeap.cpp
-        src/JSystem/JKernel/JKRExpHeap.cpp
-        src/JSystem/JKernel/JKRSolidHeap.cpp
-        src/JSystem/JKernel/JKRAssertHeap.cpp
-        src/JSystem/JKernel/JKRDisposer.cpp
-        src/JSystem/JKernel/JKRThread.cpp
-        src/JSystem/JKernel/JKRAram.cpp
-        src/JSystem/JKernel/JKRAramHeap.cpp
-        src/JSystem/JKernel/JKRAramBlock.cpp
-        src/JSystem/JKernel/JKRAramPiece.cpp
-        src/JSystem/JKernel/JKRAramStream.cpp
-        src/JSystem/JKernel/JKRFileLoader.cpp
-        src/JSystem/JKernel/JKRFileFinder.cpp
-        src/JSystem/JKernel/JKRFileCache.cpp
-        src/JSystem/JKernel/JKRArchivePub.cpp
-        src/JSystem/JKernel/JKRArchivePri.cpp
-        src/JSystem/JKernel/JKRMemArchive.cpp
-        src/JSystem/JKernel/JKRAramArchive.cpp
-        src/JSystem/JKernel/JKRDvdArchive.cpp
-        src/JSystem/JKernel/JKRCompArchive.cpp
-        src/JSystem/JKernel/JKRFile.cpp
-        src/JSystem/JKernel/JKRDvdFile.cpp
-        src/JSystem/JKernel/JKRDvdRipper.cpp
-        src/JSystem/JKernel/JKRDvdAramRipper.cpp
-        src/JSystem/JKernel/JKRDecomp.cpp
-        src/JSystem/JMath/JMath.cpp
-        src/JSystem/JMath/random.cpp
-        src/JSystem/JMath/JMATrigonometric.cpp
-        src/JSystem/JSupport/JSUList.cpp
-        src/JSystem/JSupport/JSUInputStream.cpp
-        src/JSystem/JSupport/JSUOutputStream.cpp
-        src/JSystem/JSupport/JSUMemoryStream.cpp
-        src/JSystem/JSupport/JSUFileStream.cpp
-        src/JSystem/JUtility/JUTCacheFont.cpp
-        src/JSystem/JUtility/JUTResource.cpp
-        src/JSystem/JUtility/JUTTexture.cpp
-        src/JSystem/JUtility/JUTPalette.cpp
-        src/JSystem/JUtility/JUTNameTab.cpp
-        src/JSystem/JUtility/JUTGraphFifo.cpp
-        src/JSystem/JUtility/JUTFont.cpp
-        src/JSystem/JUtility/JUTResFont.cpp
-        src/JSystem/JUtility/JUTDbPrint.cpp
-        src/JSystem/JUtility/JUTGamePad.cpp
-        src/JSystem/JUtility/JUTException.cpp
-        src/JSystem/JUtility/JUTDirectPrint.cpp
-        src/JSystem/JUtility/JUTAssert.cpp
-        src/JSystem/JUtility/JUTVideo.cpp
-        src/JSystem/JUtility/JUTXfb.cpp
-        src/JSystem/JUtility/JUTFader.cpp
-        src/JSystem/JUtility/JUTProcBar.cpp
-        src/JSystem/JUtility/JUTConsole.cpp
-        src/JSystem/JUtility/JUTDirectFile.cpp
-        src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp
-        src/JSystem/JStage/JSGActor.cpp
-        src/JSystem/JStage/JSGAmbientLight.cpp
-        src/JSystem/JStage/JSGCamera.cpp
-        src/JSystem/JStage/JSGFog.cpp
-        src/JSystem/JStage/JSGLight.cpp
-        src/JSystem/JStage/JSGObject.cpp
-        src/JSystem/JStage/JSGSystem.cpp
-        src/JSystem/J2DGraph/J2DGrafContext.cpp
-        src/JSystem/J2DGraph/J2DOrthoGraph.cpp
-        src/JSystem/J2DGraph/J2DTevs.cpp
-        src/JSystem/J2DGraph/J2DMaterial.cpp
-        src/JSystem/J2DGraph/J2DMatBlock.cpp
-        src/JSystem/J2DGraph/J2DMaterialFactory.cpp
-        src/JSystem/J2DGraph/J2DPrint.cpp
-        src/JSystem/J2DGraph/J2DPane.cpp
-        src/JSystem/J2DGraph/J2DScreen.cpp
-        src/JSystem/J2DGraph/J2DWindow.cpp
-        src/JSystem/J2DGraph/J2DPicture.cpp
-        src/JSystem/J2DGraph/J2DTextBox.cpp
-        src/JSystem/J2DGraph/J2DWindowEx.cpp
-        src/JSystem/J2DGraph/J2DPictureEx.cpp
-        src/JSystem/J2DGraph/J2DTextBoxEx.cpp
-        src/JSystem/J2DGraph/J2DAnmLoader.cpp
-        src/JSystem/J2DGraph/J2DAnimation.cpp
-        src/JSystem/J2DGraph/J2DManage.cpp
-        src/JSystem/J3DGraphBase/J3DGD.cpp
-        src/JSystem/J3DGraphBase/J3DSys.cpp
-        src/JSystem/J3DGraphBase/J3DVertex.cpp
-        src/JSystem/J3DGraphBase/J3DTransform.cpp
-        src/JSystem/J3DGraphBase/J3DTexture.cpp
-        src/JSystem/J3DGraphBase/J3DPacket.cpp
-        src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
-        src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
-        src/JSystem/J3DGraphBase/J3DShape.cpp
-        src/JSystem/J3DGraphBase/J3DMaterial.cpp
-        src/JSystem/J3DGraphBase/J3DMatBlock.cpp
-        src/JSystem/J3DGraphBase/J3DTevs.cpp
-        src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
-        src/JSystem/J3DGraphBase/J3DStruct.cpp
-        src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp
-        src/JSystem/J3DGraphAnimator/J3DJointTree.cpp
-        src/JSystem/J3DGraphAnimator/J3DModelData.cpp
-        src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
-        src/JSystem/J3DGraphAnimator/J3DModel.cpp
-        src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
-        src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp
-        src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
-        src/JSystem/J3DGraphAnimator/J3DCluster.cpp
-        src/JSystem/J3DGraphAnimator/J3DJoint.cpp
-        src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
-        src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
-        src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
-        src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
-        src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
-        src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
-        src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
-        src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
-        src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
-        src/JSystem/JStudio/JStudio/ctb.cpp
-        src/JSystem/JStudio/JStudio/ctb-data.cpp
-        src/JSystem/JStudio/JStudio/functionvalue.cpp
-        src/JSystem/JStudio/JStudio/fvb.cpp
-        src/JSystem/JStudio/JStudio/fvb-data.cpp
-        src/JSystem/JStudio/JStudio/fvb-data-parse.cpp
-        src/JSystem/JStudio/JStudio/jstudio-control.cpp
-        src/JSystem/JStudio/JStudio/jstudio-data.cpp
-        src/JSystem/JStudio/JStudio/jstudio-math.cpp
-        src/JSystem/JStudio/JStudio/jstudio-object.cpp
-        src/JSystem/JStudio/JStudio/object-id.cpp
-        src/JSystem/JStudio/JStudio/stb.cpp
-        src/JSystem/JStudio/JStudio/stb-data-parse.cpp
-        src/JSystem/JStudio/JStudio/stb-data.cpp
-        src/JSystem/JStudio/JStudio_JStage/control.cpp
-        src/JSystem/JStudio/JStudio_JStage/object.cpp
-        src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
-        src/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp
-        src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
-        src/JSystem/JStudio/JStudio_JStage/object-fog.cpp
-        src/JSystem/JStudio/JStudio_JStage/object-light.cpp
-        src/JSystem/JStudio/JStudio_JAudio2/control.cpp
-        src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
-        src/JSystem/JStudio/JStudio_JParticle/control.cpp
-        src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
-        src/JSystem/JAudio2/JASCalc.cpp
-        src/JSystem/JAudio2/JASTaskThread.cpp
-        src/JSystem/JAudio2/JASDvdThread.cpp
-        src/JSystem/JAudio2/JASCallback.cpp
-        src/JSystem/JAudio2/JASHeapCtrl.cpp
-        src/JSystem/JAudio2/JASResArcLoader.cpp
-        src/JSystem/JAudio2/JASProbe.cpp
-        src/JSystem/JAudio2/JASReport.cpp
-        src/JSystem/JAudio2/JASCmdStack.cpp
-        src/JSystem/JAudio2/JASTrack.cpp
-        src/JSystem/JAudio2/JASTrackPort.cpp
-        src/JSystem/JAudio2/JASRegisterParam.cpp
-        src/JSystem/JAudio2/JASSeqCtrl.cpp
-        src/JSystem/JAudio2/JASSeqParser.cpp
-        src/JSystem/JAudio2/JASSeqReader.cpp
-        src/JSystem/JAudio2/JASAramStream.cpp
-        src/JSystem/JAudio2/JASBank.cpp
-        src/JSystem/JAudio2/JASBasicBank.cpp
-        src/JSystem/JAudio2/JASVoiceBank.cpp
-        src/JSystem/JAudio2/JASBasicInst.cpp
-        src/JSystem/JAudio2/JASDrumSet.cpp
-        src/JSystem/JAudio2/JASBasicWaveBank.cpp
-        src/JSystem/JAudio2/JASSimpleWaveBank.cpp
-        src/JSystem/JAudio2/JASWSParser.cpp
-        src/JSystem/JAudio2/JASBNKParser.cpp
-        src/JSystem/JAudio2/JASWaveArcLoader.cpp
-        src/JSystem/JAudio2/JASChannel.cpp
-        src/JSystem/JAudio2/JASLfo.cpp
-        src/JSystem/JAudio2/JASOscillator.cpp
-        src/JSystem/JAudio2/JASAiCtrl.cpp
-        src/JSystem/JAudio2/JASAudioThread.cpp
-        src/JSystem/JAudio2/JASAudioReseter.cpp
-        src/JSystem/JAudio2/JASDSPChannel.cpp
-        src/JSystem/JAudio2/JASDSPInterface.cpp
-        src/JSystem/JAudio2/JASDriverIF.cpp
-        src/JSystem/JAudio2/JASSoundParams.cpp
-        src/JSystem/JAudio2/dspproc.cpp
-        src/JSystem/JAudio2/dsptask.cpp
-        src/JSystem/JAudio2/osdsp.cpp
-        src/JSystem/JAudio2/osdsp_task.cpp
-        src/JSystem/JAudio2/JAIAudible.cpp
-        src/JSystem/JAudio2/JAIAudience.cpp
-        src/JSystem/JAudio2/JAISe.cpp
-        src/JSystem/JAudio2/JAISeMgr.cpp
-        src/JSystem/JAudio2/JAISeq.cpp
-        src/JSystem/JAudio2/JAISeqDataMgr.cpp
-        src/JSystem/JAudio2/JAISeqMgr.cpp
-        src/JSystem/JAudio2/JAISound.cpp
-        src/JSystem/JAudio2/JAISoundChild.cpp
-        src/JSystem/JAudio2/JAISoundHandles.cpp
-        src/JSystem/JAudio2/JAISoundInfo.cpp
-        src/JSystem/JAudio2/JAISoundParams.cpp
-        src/JSystem/JAudio2/JAISoundStarter.cpp
-        src/JSystem/JAudio2/JAIStream.cpp
-        src/JSystem/JAudio2/JAIStreamDataMgr.cpp
-        src/JSystem/JAudio2/JAIStreamMgr.cpp
-        src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp
-        src/JSystem/JAudio2/JAUAudioArcLoader.cpp
-        src/JSystem/JAudio2/JAUAudioMgr.cpp
-        src/JSystem/JAudio2/JAUBankTable.cpp
-        src/JSystem/JAudio2/JAUClusterSound.cpp
-        src/JSystem/JAudio2/JAUInitializer.cpp
-        src/JSystem/JAudio2/JAUSectionHeap.cpp
-        src/JSystem/JAudio2/JAUSeqCollection.cpp
-        src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
-        src/JSystem/JAudio2/JAUSoundAnimator.cpp
-        src/JSystem/JAudio2/JAUSoundTable.cpp
-        src/JSystem/JAudio2/JAUStreamFileTable.cpp
-        src/JSystem/JMessage/control.cpp
-        src/JSystem/JMessage/data.cpp
-        src/JSystem/JMessage/processor.cpp
-        src/JSystem/JMessage/resource.cpp
-        src/JSystem/JMessage/locale.cpp
-        src/JSystem/JGadget/binary.cpp
-        src/JSystem/JGadget/define.cpp
-        src/JSystem/JGadget/linklist.cpp
-        src/JSystem/JGadget/std-vector.cpp
-        src/JSystem/JHostIO/JORHostInfo.cpp
-        src/JSystem/JHostIO/JORServer.cpp
-        src/JSystem/JHostIO/JHIhioASync.cpp
-        src/JSystem/JHostIO/JHIRMcc.cpp
-        src/JSystem/JHostIO/JHIMccBuf.cpp
+        libs/JSystem/src/JParticle/JPAResourceManager.cpp
+        libs/JSystem/src/JParticle/JPAResource.cpp
+        libs/JSystem/src/JParticle/JPABaseShape.cpp
+        libs/JSystem/src/JParticle/JPAExtraShape.cpp
+        libs/JSystem/src/JParticle/JPAChildShape.cpp
+        libs/JSystem/src/JParticle/JPAExTexShape.cpp
+        libs/JSystem/src/JParticle/JPADynamicsBlock.cpp
+        libs/JSystem/src/JParticle/JPAFieldBlock.cpp
+        libs/JSystem/src/JParticle/JPAKeyBlock.cpp
+        libs/JSystem/src/JParticle/JPATexture.cpp
+        libs/JSystem/src/JParticle/JPAResourceLoader.cpp
+        libs/JSystem/src/JParticle/JPAEmitterManager.cpp
+        libs/JSystem/src/JParticle/JPAEmitter.cpp
+        libs/JSystem/src/JParticle/JPAParticle.cpp
+        libs/JSystem/src/JParticle/JPAMath.cpp
+        libs/JSystem/src/JFramework/JFWSystem.cpp
+        libs/JSystem/src/JFramework/JFWDisplay.cpp
+        libs/JSystem/src/J3DU/J3DUClipper.cpp
+        libs/JSystem/src/J3DU/J3DUDL.cpp
+        libs/JSystem/src/JKernel/JKRHeap.cpp
+        libs/JSystem/src/JKernel/JKRExpHeap.cpp
+        libs/JSystem/src/JKernel/JKRSolidHeap.cpp
+        libs/JSystem/src/JKernel/JKRAssertHeap.cpp
+        libs/JSystem/src/JKernel/JKRDisposer.cpp
+        libs/JSystem/src/JKernel/JKRThread.cpp
+        libs/JSystem/src/JKernel/JKRAram.cpp
+        libs/JSystem/src/JKernel/JKRAramHeap.cpp
+        libs/JSystem/src/JKernel/JKRAramBlock.cpp
+        libs/JSystem/src/JKernel/JKRAramPiece.cpp
+        libs/JSystem/src/JKernel/JKRAramStream.cpp
+        libs/JSystem/src/JKernel/JKRFileLoader.cpp
+        libs/JSystem/src/JKernel/JKRFileFinder.cpp
+        libs/JSystem/src/JKernel/JKRFileCache.cpp
+        libs/JSystem/src/JKernel/JKRArchivePub.cpp
+        libs/JSystem/src/JKernel/JKRArchivePri.cpp
+        libs/JSystem/src/JKernel/JKRMemArchive.cpp
+        libs/JSystem/src/JKernel/JKRAramArchive.cpp
+        libs/JSystem/src/JKernel/JKRDvdArchive.cpp
+        libs/JSystem/src/JKernel/JKRCompArchive.cpp
+        libs/JSystem/src/JKernel/JKRFile.cpp
+        libs/JSystem/src/JKernel/JKRDvdFile.cpp
+        libs/JSystem/src/JKernel/JKRDvdRipper.cpp
+        libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp
+        libs/JSystem/src/JKernel/JKRDecomp.cpp
+        libs/JSystem/src/JMath/JMath.cpp
+        libs/JSystem/src/JMath/random.cpp
+        libs/JSystem/src/JMath/JMATrigonometric.cpp
+        libs/JSystem/src/JSupport/JSUList.cpp
+        libs/JSystem/src/JSupport/JSUInputStream.cpp
+        libs/JSystem/src/JSupport/JSUOutputStream.cpp
+        libs/JSystem/src/JSupport/JSUMemoryStream.cpp
+        libs/JSystem/src/JSupport/JSUFileStream.cpp
+        libs/JSystem/src/JUtility/JUTCacheFont.cpp
+        libs/JSystem/src/JUtility/JUTResource.cpp
+        libs/JSystem/src/JUtility/JUTTexture.cpp
+        libs/JSystem/src/JUtility/JUTPalette.cpp
+        libs/JSystem/src/JUtility/JUTNameTab.cpp
+        libs/JSystem/src/JUtility/JUTGraphFifo.cpp
+        libs/JSystem/src/JUtility/JUTFont.cpp
+        libs/JSystem/src/JUtility/JUTResFont.cpp
+        libs/JSystem/src/JUtility/JUTDbPrint.cpp
+        libs/JSystem/src/JUtility/JUTGamePad.cpp
+        libs/JSystem/src/JUtility/JUTException.cpp
+        libs/JSystem/src/JUtility/JUTDirectPrint.cpp
+        libs/JSystem/src/JUtility/JUTAssert.cpp
+        libs/JSystem/src/JUtility/JUTVideo.cpp
+        libs/JSystem/src/JUtility/JUTXfb.cpp
+        libs/JSystem/src/JUtility/JUTFader.cpp
+        libs/JSystem/src/JUtility/JUTProcBar.cpp
+        libs/JSystem/src/JUtility/JUTConsole.cpp
+        libs/JSystem/src/JUtility/JUTDirectFile.cpp
+        libs/JSystem/src/JUtility/JUTFontData_Ascfont_fix12.cpp
+        libs/JSystem/src/JStage/JSGActor.cpp
+        libs/JSystem/src/JStage/JSGAmbientLight.cpp
+        libs/JSystem/src/JStage/JSGCamera.cpp
+        libs/JSystem/src/JStage/JSGFog.cpp
+        libs/JSystem/src/JStage/JSGLight.cpp
+        libs/JSystem/src/JStage/JSGObject.cpp
+        libs/JSystem/src/JStage/JSGSystem.cpp
+        libs/JSystem/src/J2DGraph/J2DGrafContext.cpp
+        libs/JSystem/src/J2DGraph/J2DOrthoGraph.cpp
+        libs/JSystem/src/J2DGraph/J2DTevs.cpp
+        libs/JSystem/src/J2DGraph/J2DMaterial.cpp
+        libs/JSystem/src/J2DGraph/J2DMatBlock.cpp
+        libs/JSystem/src/J2DGraph/J2DMaterialFactory.cpp
+        libs/JSystem/src/J2DGraph/J2DPrint.cpp
+        libs/JSystem/src/J2DGraph/J2DPane.cpp
+        libs/JSystem/src/J2DGraph/J2DScreen.cpp
+        libs/JSystem/src/J2DGraph/J2DWindow.cpp
+        libs/JSystem/src/J2DGraph/J2DPicture.cpp
+        libs/JSystem/src/J2DGraph/J2DTextBox.cpp
+        libs/JSystem/src/J2DGraph/J2DWindowEx.cpp
+        libs/JSystem/src/J2DGraph/J2DPictureEx.cpp
+        libs/JSystem/src/J2DGraph/J2DTextBoxEx.cpp
+        libs/JSystem/src/J2DGraph/J2DAnmLoader.cpp
+        libs/JSystem/src/J2DGraph/J2DAnimation.cpp
+        libs/JSystem/src/J2DGraph/J2DManage.cpp
+        libs/JSystem/src/J3DGraphBase/J3DGD.cpp
+        libs/JSystem/src/J3DGraphBase/J3DSys.cpp
+        libs/JSystem/src/J3DGraphBase/J3DVertex.cpp
+        libs/JSystem/src/J3DGraphBase/J3DTransform.cpp
+        libs/JSystem/src/J3DGraphBase/J3DTexture.cpp
+        libs/JSystem/src/J3DGraphBase/J3DPacket.cpp
+        libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp
+        libs/JSystem/src/J3DGraphBase/J3DShapeDraw.cpp
+        libs/JSystem/src/J3DGraphBase/J3DShape.cpp
+        libs/JSystem/src/J3DGraphBase/J3DMaterial.cpp
+        libs/JSystem/src/J3DGraphBase/J3DMatBlock.cpp
+        libs/JSystem/src/J3DGraphBase/J3DTevs.cpp
+        libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp
+        libs/JSystem/src/J3DGraphBase/J3DStruct.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DShapeTable.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DJointTree.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DModelData.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DMtxBuffer.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DModel.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DAnimation.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DMaterialAnm.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DSkinDeform.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DCluster.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DJoint.cpp
+        libs/JSystem/src/J3DGraphAnimator/J3DMaterialAttach.cpp
+        libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory.cpp
+        libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory_v21.cpp
+        libs/JSystem/src/J3DGraphLoader/J3DClusterLoader.cpp
+        libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp
+        libs/JSystem/src/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+        libs/JSystem/src/J3DGraphLoader/J3DJointFactory.cpp
+        libs/JSystem/src/J3DGraphLoader/J3DShapeFactory.cpp
+        libs/JSystem/src/J3DGraphLoader/J3DAnmLoader.cpp
+        libs/JSystem/src/JStudio/JStudio/ctb.cpp
+        libs/JSystem/src/JStudio/JStudio/ctb-data.cpp
+        libs/JSystem/src/JStudio/JStudio/functionvalue.cpp
+        libs/JSystem/src/JStudio/JStudio/fvb.cpp
+        libs/JSystem/src/JStudio/JStudio/fvb-data.cpp
+        libs/JSystem/src/JStudio/JStudio/fvb-data-parse.cpp
+        libs/JSystem/src/JStudio/JStudio/jstudio-control.cpp
+        libs/JSystem/src/JStudio/JStudio/jstudio-data.cpp
+        libs/JSystem/src/JStudio/JStudio/jstudio-math.cpp
+        libs/JSystem/src/JStudio/JStudio/jstudio-object.cpp
+        libs/JSystem/src/JStudio/JStudio/object-id.cpp
+        libs/JSystem/src/JStudio/JStudio/stb.cpp
+        libs/JSystem/src/JStudio/JStudio/stb-data-parse.cpp
+        libs/JSystem/src/JStudio/JStudio/stb-data.cpp
+        libs/JSystem/src/JStudio/JStudio_JStage/control.cpp
+        libs/JSystem/src/JStudio/JStudio_JStage/object.cpp
+        libs/JSystem/src/JStudio/JStudio_JStage/object-actor.cpp
+        libs/JSystem/src/JStudio/JStudio_JStage/object-ambientlight.cpp
+        libs/JSystem/src/JStudio/JStudio_JStage/object-camera.cpp
+        libs/JSystem/src/JStudio/JStudio_JStage/object-fog.cpp
+        libs/JSystem/src/JStudio/JStudio_JStage/object-light.cpp
+        libs/JSystem/src/JStudio/JStudio_JAudio2/control.cpp
+        libs/JSystem/src/JStudio/JStudio_JAudio2/object-sound.cpp
+        libs/JSystem/src/JStudio/JStudio_JParticle/control.cpp
+        libs/JSystem/src/JStudio/JStudio_JParticle/object-particle.cpp
+        libs/JSystem/src/JAudio2/JASCalc.cpp
+        libs/JSystem/src/JAudio2/JASTaskThread.cpp
+        libs/JSystem/src/JAudio2/JASDvdThread.cpp
+        libs/JSystem/src/JAudio2/JASCallback.cpp
+        libs/JSystem/src/JAudio2/JASHeapCtrl.cpp
+        libs/JSystem/src/JAudio2/JASResArcLoader.cpp
+        libs/JSystem/src/JAudio2/JASProbe.cpp
+        libs/JSystem/src/JAudio2/JASReport.cpp
+        libs/JSystem/src/JAudio2/JASCmdStack.cpp
+        libs/JSystem/src/JAudio2/JASTrack.cpp
+        libs/JSystem/src/JAudio2/JASTrackPort.cpp
+        libs/JSystem/src/JAudio2/JASRegisterParam.cpp
+        libs/JSystem/src/JAudio2/JASSeqCtrl.cpp
+        libs/JSystem/src/JAudio2/JASSeqParser.cpp
+        libs/JSystem/src/JAudio2/JASSeqReader.cpp
+        libs/JSystem/src/JAudio2/JASAramStream.cpp
+        libs/JSystem/src/JAudio2/JASBank.cpp
+        libs/JSystem/src/JAudio2/JASBasicBank.cpp
+        libs/JSystem/src/JAudio2/JASVoiceBank.cpp
+        libs/JSystem/src/JAudio2/JASBasicInst.cpp
+        libs/JSystem/src/JAudio2/JASDrumSet.cpp
+        libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp
+        libs/JSystem/src/JAudio2/JASSimpleWaveBank.cpp
+        libs/JSystem/src/JAudio2/JASWSParser.cpp
+        libs/JSystem/src/JAudio2/JASBNKParser.cpp
+        libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp
+        libs/JSystem/src/JAudio2/JASChannel.cpp
+        libs/JSystem/src/JAudio2/JASLfo.cpp
+        libs/JSystem/src/JAudio2/JASOscillator.cpp
+        libs/JSystem/src/JAudio2/JASAiCtrl.cpp
+        libs/JSystem/src/JAudio2/JASAudioThread.cpp
+        libs/JSystem/src/JAudio2/JASAudioReseter.cpp
+        libs/JSystem/src/JAudio2/JASDSPChannel.cpp
+        libs/JSystem/src/JAudio2/JASDSPInterface.cpp
+        libs/JSystem/src/JAudio2/JASDriverIF.cpp
+        libs/JSystem/src/JAudio2/JASSoundParams.cpp
+        libs/JSystem/src/JAudio2/dspproc.cpp
+        libs/JSystem/src/JAudio2/dsptask.cpp
+        libs/JSystem/src/JAudio2/osdsp.cpp
+        libs/JSystem/src/JAudio2/osdsp_task.cpp
+        libs/JSystem/src/JAudio2/JAIAudible.cpp
+        libs/JSystem/src/JAudio2/JAIAudience.cpp
+        libs/JSystem/src/JAudio2/JAISe.cpp
+        libs/JSystem/src/JAudio2/JAISeMgr.cpp
+        libs/JSystem/src/JAudio2/JAISeq.cpp
+        libs/JSystem/src/JAudio2/JAISeqDataMgr.cpp
+        libs/JSystem/src/JAudio2/JAISeqMgr.cpp
+        libs/JSystem/src/JAudio2/JAISound.cpp
+        libs/JSystem/src/JAudio2/JAISoundChild.cpp
+        libs/JSystem/src/JAudio2/JAISoundHandles.cpp
+        libs/JSystem/src/JAudio2/JAISoundInfo.cpp
+        libs/JSystem/src/JAudio2/JAISoundParams.cpp
+        libs/JSystem/src/JAudio2/JAISoundStarter.cpp
+        libs/JSystem/src/JAudio2/JAIStream.cpp
+        libs/JSystem/src/JAudio2/JAIStreamDataMgr.cpp
+        libs/JSystem/src/JAudio2/JAIStreamMgr.cpp
+        libs/JSystem/src/JAudio2/JAUAudioArcInterpreter.cpp
+        libs/JSystem/src/JAudio2/JAUAudioArcLoader.cpp
+        libs/JSystem/src/JAudio2/JAUAudioMgr.cpp
+        libs/JSystem/src/JAudio2/JAUBankTable.cpp
+        libs/JSystem/src/JAudio2/JAUClusterSound.cpp
+        libs/JSystem/src/JAudio2/JAUInitializer.cpp
+        libs/JSystem/src/JAudio2/JAUSectionHeap.cpp
+        libs/JSystem/src/JAudio2/JAUSeqCollection.cpp
+        libs/JSystem/src/JAudio2/JAUSeqDataBlockMgr.cpp
+        libs/JSystem/src/JAudio2/JAUSoundAnimator.cpp
+        libs/JSystem/src/JAudio2/JAUSoundTable.cpp
+        libs/JSystem/src/JAudio2/JAUStreamFileTable.cpp
+        libs/JSystem/src/JMessage/control.cpp
+        libs/JSystem/src/JMessage/data.cpp
+        libs/JSystem/src/JMessage/processor.cpp
+        libs/JSystem/src/JMessage/resource.cpp
+        libs/JSystem/src/JMessage/locale.cpp
+        libs/JSystem/src/JGadget/binary.cpp
+        libs/JSystem/src/JGadget/define.cpp
+        libs/JSystem/src/JGadget/linklist.cpp
+        libs/JSystem/src/JGadget/std-vector.cpp
+        libs/JSystem/src/JHostIO/JORHostInfo.cpp
+        libs/JSystem/src/JHostIO/JORServer.cpp
+        libs/JSystem/src/JHostIO/JHIhioASync.cpp
+        libs/JSystem/src/JHostIO/JHIRMcc.cpp
+        libs/JSystem/src/JHostIO/JHIMccBuf.cpp
 )
 
 set(JSYSTEM_FILES
@@ -1328,7 +1328,12 @@ set(DUSK_FILES
         src/dusk/globals.cpp
         #src/dusk/m_Do_ext_dusk.cpp
         src/dusk/dvd_emu.cpp
-        src/dolphin/os/OSContext.cpp
-        src/dolphin/os/OSThread.cpp
-        src/dolphin/os/OSMutex.cpp
+        src/dusk/imgui/imgui.hpp
+        src/dusk/imgui/processes.cpp
+        src/dusk/imgui/debug_overlay.cpp
+        src/dusk/imgui/heaps.cpp
+        src/dusk/offset_ptr.cpp
+        src/dusk/OSContext.cpp
+        src/dusk/OSThread.cpp
+        src/dusk/OSMutex.cpp
 )

include/DynamicLink.h

@@ -1,7 +1,7 @@
 #ifndef DYNAMICLINK_H
 #define DYNAMICLINK_H
 
-#include <dolphin/os.h>
+#include <os.h>
 #include "JSystem/JKernel/JKRHeap.h"
 #include "global.h"
 

include/NdevExi2A/DebuggerDriver.h

@@ -1,7 +1,7 @@
 #ifndef NDEVEXI2A_DEBUGGERDRIVER_H
 #define NDEVEXI2A_DEBUGGERDRIVER_H
 
-#include <dolphin/os.h>
+#include <os.h>
 #include "types.h"
 
 typedef void (*MtrCallback)(s32, OSContext*);

include/SSystem/SComponent/c_API_controller_pad.h

@@ -1,7 +1,7 @@
 #ifndef C_API_CONTROLLER_PAD_
 #define C_API_CONTROLLER_PAD_
 
-#include <dolphin/types.h>
+#include <types.h>
 
 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

include/SSystem/SComponent/c_bg_s_chk.h

@@ -1,12 +1,17 @@
 #ifndef C_BG_S_CHK_H
 #define C_BG_S_CHK_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 #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"
+#include "dusk/endian.h"
 
+#if TARGET_LITTLE_ENDIAN
+struct cBgD_Vtx_t : public BE(Vec) {};
+#else
 struct cBgD_Vtx_t : public Vec {};
+#endif
 
 class cBgS_Chk {
 public:

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 <dolphin/types.h>
+#include <types.h>
 #include "f_pc/f_pc_manager.h"
 
 class cBgS_PolyInfo {

include/SSystem/SComponent/c_bg_w.h

@@ -1,7 +1,7 @@
 #ifndef C_BG_W_H
 #define C_BG_W_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class cBgW_BgId {
 private:

include/SSystem/SComponent/c_cc_d.h

@@ -8,8 +8,8 @@
 #include "SSystem/SComponent/c_m3d_g_tri.h"
 #include "SSystem/SComponent/c_m3d_g_vtx.h"
 #include "f_pc/f_pc_manager.h"
+#include <dolphin/gx/GXStruct.h>
 
-typedef struct _GXColor GXColor;
 class fopAc_ac_c;
 
 enum CcG_Tg_HitMark {
@@ -447,7 +447,7 @@ public:
     virtual cCcD_GObjInf* GetGObjInf() { return NULL; }
     virtual cCcD_ShapeAttr const* GetShapeAttr() const { return NULL; }
     virtual cCcD_ShapeAttr* GetShapeAttr() { return NULL; }
-    virtual void Draw(_GXColor const&) {}
+    virtual void Draw(GXColor const&) {}
     void ct();
     void Set(cCcD_SrcObj const&);
     fopAc_ac_c* GetAc();

include/SSystem/SComponent/c_counter.h

@@ -1,7 +1,7 @@
 #ifndef C_COUNTER_H
 #define C_COUNTER_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct counter_class {
     u32 mCounter0;

include/SSystem/SComponent/c_lib.h

@@ -2,7 +2,7 @@
 #define C_LIB_H_
 
 #include "SSystem/SComponent/c_xyz.h"
-#include <dolphin/mtx.h>
+#include <mtx.h>
 #include "SSystem/SComponent/c_math.h"
 
 inline bool cLib_IsZero(f32 value) {

include/SSystem/SComponent/c_m3d.h

@@ -2,7 +2,7 @@
 #define C_M3D_H_
 
 #include <cmath>
-#include <dolphin/mtx.h>
+#include <mtx.h>
 
 class cM3dGAab;
 class cM3dGCps;

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 <dolphin/types.h>
+#include <types.h>
 
 class cM2dGCir {
 public:

include/SSystem/SComponent/c_m3d_g_tri.h

@@ -2,6 +2,7 @@
 #define C_M3D_G_TRI_H_
 
 #include "SSystem/SComponent/c_m3d_g_pla.h"
+#include "dusk/endian.h"
 
 class cM3dGCyl;
 
@@ -23,7 +24,7 @@ public:
     virtual ~cM3dGTri() {}
     bool cross(const cM3dGCyl*, Vec*) const;
     void setPos(const Vec*, const Vec*, const Vec*);
-    void setBg(const Vec*, const Vec*, const Vec*, const cM3dGPla*);
+    void setBg(const BE(Vec)*, const BE(Vec)*, const BE(Vec)*, const cM3dGPla*);
     void set(const Vec*, const Vec*, const Vec*, const Vec*);
     bool Cross(cM3dGCps const& cps, cXyz* xyz) const { return cM3d_Cross_CpsTri(cps, *this, xyz); }
     bool Cross(cM3dGCyl const& cyl, cXyz* xyz) const { return this->cross(&cyl, xyz); }

include/SSystem/SComponent/c_malloc.h

@@ -1,7 +1,7 @@
 #ifndef C_MALLOC_H
 #define C_MALLOC_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class JKRHeap;
 

include/SSystem/SComponent/c_phase.h

@@ -1,7 +1,7 @@
 #ifndef C_PHASE_H
 #define C_PHASE_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef int (*cPhs__Handler)(void*);
 

include/SSystem/SComponent/c_request.h

@@ -1,7 +1,7 @@
 #ifndef C_REQUEST_H
 #define C_REQUEST_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct request_base_class {
     u8 flag0 : 1;

include/SSystem/SComponent/c_sxyz.h

@@ -1,7 +1,7 @@
 #ifndef C_SXYZ_H
 #define C_SXYZ_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 
 struct SVec {
     s16 x, y, z;

include/SSystem/SComponent/c_tag.h

@@ -2,7 +2,7 @@
 #define C_TAG_H
 
 #include "SSystem/SComponent/c_node.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef struct node_list_class node_list_class;
 typedef struct node_lists_tree_class node_lists_tree_class;

include/SSystem/SComponent/c_xyz.h

@@ -1,13 +1,18 @@
 #ifndef C_XYZ_H
 #define C_XYZ_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 #include <cmath>
 
 #ifdef _MSVC_LANG
 #define M_PI 3.14159265358979323846f
 #endif
 
+struct cXy {
+    f32 x;
+    f32 y;
+};
+
 struct cXyz : Vec {
     static const cXyz Zero;
     static const cXyz BaseX;

include/SSystem/SStandard/s_basic.h

@@ -1,7 +1,7 @@
 #ifndef S_BASIC_H
 #define S_BASIC_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue);
 void sBs_ClearArea(void* pPtr, u32 pNumBytes);

include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.h

@@ -1,7 +1,7 @@
 #ifndef METROTRK_PORTABLE_DISPATCH_H
 #define METROTRK_PORTABLE_DISPATCH_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {

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 <dolphin/types.h>
+#include <types.h>
 
 void* TRK_memset(void* dest, int val, size_t count);
 void* TRK_memcpy(void* dest, const void* src, size_t count);

include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h

@@ -1,7 +1,7 @@
 #ifndef METROTRK_PORTABLE_MSG_H
 #define METROTRK_PORTABLE_MSG_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 typedef struct _TRK_Msg {
 	u8 _00[8];

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 <revolution/types.h>
+#include <types.h>
 
 u8 TRKReleaseMutex();
 u8 TRKAcquireMutex();

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 <dolphin/amc/AmcExi2Comm.h>
+#include <amc/AmcExi2Comm.h>
 
 #ifdef __cplusplus
 extern "C" {

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 <dolphin/amc/AmcExi2Comm.h>
+#include <amc/AmcExi2Comm.h>
 
 #ifdef __cplusplus
 extern "C" {

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 <dolphin/os.h>
+#include <os.h>
 
 #ifdef __cplusplus
 extern "C" {

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 <dolphin/os.h>
+#include <os.h>
 #include "trk.h"
 
 #ifdef __cplusplus

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 <dolphin/types.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {

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 <dolphin/types.h>
+#include <types.h>
 
 #endif /* OS_DOLPHIN_USR_PUT_H */

include/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h

@@ -1,7 +1,7 @@
 #ifndef PPC_EXPORT_TARGSUPP_H
 #define PPC_EXPORT_TARGSUPP_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h

@@ -1,7 +1,7 @@
 #ifndef UTILS_COMMON_CIRCLEBUFFER_H
 #define UTILS_COMMON_CIRCLEBUFFER_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h

@@ -1,7 +1,7 @@
 #ifndef UTILS_COMMON_MWTRACE_H
 #define UTILS_COMMON_MWTRACE_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 void MWTRACE(u8, char*, ...);
 

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 <dolphin/types.h>
+#include <types.h>
 
 #ifdef __cplusplus
 extern "C" {

include/Z2AudioCS/Z2AudioCS.h

@@ -3,7 +3,7 @@
 
 #include "Z2AudioCS/SpkTable.h"
 #include "Z2AudioCS/SpkSound.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 class JKRHeap;
 class JKRArchive;

include/Z2AudioLib/Z2Calc.h

@@ -1,7 +1,7 @@
 #ifndef Z2CALC_H
 #define Z2CALC_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "m_Do/m_Do_lib.h"
 
 namespace Z2Calc {

include/Z2AudioLib/Z2Param.h

@@ -1,7 +1,7 @@
 #ifndef Z2PARAM_H
 #define Z2PARAM_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct Z2Param {
     static f32 DISTANCE_MAX;

include/Z2AudioLib/Z2StatusMgr.h

@@ -3,7 +3,7 @@
 
 #include <global.h>
 #include "JSystem/JAudio2/JASGadget.h"
-#include <dolphin/mtx.h>
+#include <mtx.h>
 
 struct Z2StatusMgr : public JASGlobalInstance<Z2StatusMgr> {
     Z2StatusMgr();

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 <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_drawlist.h"

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 <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "d/d_bg_w.h"
 #include "d/d_bg_s_acch.h"

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 <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_w.h"

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 <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_w.h"

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 <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_w.h"

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 <dolphin/types.h>
+#include <types.h>
 
 /**
  * @ingroup actors-enemies

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 <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "d/d_bg_s_acch.h"
 #include "Z2AudioLib/Z2Creature.h"

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 <dolphin/types.h>
+#include <types.h>
 #include "SSystem/SComponent/c_phase.h"
 #include "f_op/f_op_actor_mng.h"
 

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 {

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;
 };
 

include/d/actor/d_a_kytag12.h

@@ -1,7 +1,7 @@
 #ifndef D_A_KYTAG12_H
 #define D_A_KYTAG12_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor_mng.h"
 
 /**

include/d/actor/d_a_kytag13.h

@@ -1,7 +1,7 @@
 #ifndef D_A_KYTAG13_H
 #define D_A_KYTAG13_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor_mng.h"
 
 /**

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 <dolphin/thp.h>
+#include <thp.h>
 #include "f_op/f_op_actor.h"
 #include "d/d_drawlist.h"
 

include/d/actor/d_a_npc.h

@@ -657,7 +657,7 @@ public:
     int loadRes(s8 const*, char const**);
     void deleteRes(s8 const*, char const**);
     int execute();
-    int draw(BOOL, BOOL, f32, _GXColorS10*, f32, BOOL, BOOL, BOOL);
+    int draw(BOOL, BOOL, f32, GXColorS10*, f32, BOOL, BOOL, BOOL);
     void setEnvTevColor();
     void setRoomNo();
     int checkEndAnm(f32);

include/d/actor/d_a_npc4.h

@@ -304,7 +304,7 @@ public:
         initialize();
     }
     BOOL execute();
-    int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
+    int draw(BOOL, BOOL, f32, GXColorS10*, BOOL);
     static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*,
                                              dCcD_GObjInf*);
     static void* srchAttnActor1(void*, void*);

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 <dolphin/types.h>
+#include <types.h>
 
 enum {
     MdlMANa_e = 0,

include/d/actor/d_a_npc_chat.h

@@ -60,7 +60,7 @@ public:
     int Delete();
     int Execute();
     int Draw();
-    int draw(int, int, f32, _GXColorS10*, int);
+    int draw(int, int, f32, GXColorS10*, int);
     int ctrlJoint(J3DJoint*, J3DModel*);
     static int createHeapCallBack(fopAc_ac_c*);
     static int ctrlJointCallBack(J3DJoint*, int);

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 <dolphin/types.h>
+#include <types.h>
 #include "d/actor/d_a_npc.h"
 
 struct daNpc_Toby_HIOParam {

include/d/actor/d_a_npc_zrz.h

@@ -62,7 +62,7 @@ public:
     int Delete();
     int Execute();
     int Draw();
-    int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
+    int draw(BOOL, BOOL, f32, GXColorS10*, BOOL);
     int ctrlJoint(J3DJoint*, J3DModel*);
     static int createHeapCallBack(fopAc_ac_c*);
     static int ctrlJointCallBack(J3DJoint*, int);

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 <dolphin/types.h>
+#include <types.h>
 #include "d/d_bg_s_movebg_actor.h"
 #include "f_op/f_op_actor_mng.h"
 

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 <dolphin/types.h>
+#include <types.h>
 
 class dBgW;
 

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 <dolphin/types.h>
+#include <types.h>
 #include "d/d_bg_s_movebg_actor.h"
 #include "d/d_cc_d.h"
 #include "f_op/f_op_actor_mng.h"

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 <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 
 /**

include/d/actor/d_a_obj_kamakiri.h

@@ -47,7 +47,7 @@ public:
             mpBrkAnm->entry(model->getModelData());
             mpMorfSO->entryDL();
             if (field_0x9c0 == 0) {
-                _GXTexObj* texObj = dDlst_shadowControl_c::getSimpleTex();
+                GXTexObj* texObj = dDlst_shadowControl_c::getSimpleTex();
                 dComIfGd_setSimpleShadow(&current.pos, mObjAcch.GetGroundH(), 15.0f, mObjAcch.m_gnd, 0, -0.6f, texObj);
             }
         }

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 <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor_mng.h"
 
 /**

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 <dolphin/types.h>
+#include <types.h>
 
 #endif /* D_A_PATH_LINE_H */

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 <dolphin/types.h>
+#include <types.h>
 #include "d/actor/d_a_npc.h"
 #include "SSystem/SComponent/c_counter.h"
 

include/d/actor/d_a_ppolamp.h

@@ -1,7 +1,7 @@
 #ifndef D_A_PPOLAMP_H
 #define D_A_PPOLAMP_H
 
-#include <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor_mng.h"
 
 /**

include/d/actor/d_a_spinner.h

@@ -35,7 +35,7 @@ public:
     void setWallHit(s16, u32);
     void setAnm();
     int setNextPathNum();
-    Vec* getPathNextPos();
+    BE(Vec)* getPathNextPos();
     int checkLineWallHit(cXyz*, cXyz*);
     int checkPathMove();
     void setSpreadEffect();

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 <dolphin/types.h>
+#include <types.h>
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_msg_flow.h"

include/d/d_bg_pc.h

@@ -1,14 +1,14 @@
 #ifndef D_BG_D_BG_PC_H
 #define D_BG_D_BG_PC_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct sBgPc {
-    /* 0x00 */ u32 code0;
-    /* 0x04 */ u32 code1;
-    /* 0x08 */ u32 code2;
-    /* 0x0C */ u32 code3;
-    /* 0x10 */ u32 code4;
+    /* 0x00 */ BE(u32) code0;
+    /* 0x04 */ BE(u32) code1;
+    /* 0x08 */ BE(u32) code2;
+    /* 0x0C */ BE(u32) code3;
+    /* 0x10 */ BE(u32) code4;
 };  // Size: 0x14
 
 #define BGPC_GET_BITS(code, shift, bits) \

include/d/d_bg_plc.h

@@ -4,9 +4,9 @@
 #include "d/d_bg_pc.h"
 
 struct sBgPlc {
-    /* 0x0 */ u32 magic;        // "SPLC"
-    /* 0x4 */ u16 m_code_size;  // Should normally always be 0x14
-    /* 0x6 */ u16 m_num;        // Number of sBgPc entries to follow
+    /* 0x0 */ BE(u32) magic;        // "SPLC"
+    /* 0x4 */ BE(u16) m_code_size;  // Should normally always be 0x14
+    /* 0x6 */ BE(u16) m_num;        // Number of sBgPc entries to follow
     /* 0x8 */ sBgPc m_code[0];  // m_num size array
 };
 

include/d/d_bg_s.h

@@ -3,7 +3,7 @@
 
 #include "d/d_bg_w_base.h"
 #include "JSystem/JHostIO/JORReflexible.h"
-#include <dolphin/os.h>
+#include <os.h>
 #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;

include/d/d_bg_s_cap_poly.h

@@ -4,7 +4,7 @@
 #include "d/d_bg_s_chk.h"
 #include "SSystem/SComponent/c_m3d_g_aab.h"
 
-class dBgS_CaptPoly;
+struct dBgS_CaptPoly;
 
 typedef void (*CaptPolyCallback)(dBgS_CaptPoly&, cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*);
 

include/d/d_bg_w.h

@@ -4,14 +4,17 @@
 #include "SSystem/SComponent/c_m3d_g_aab.h"
 #include "SSystem/SComponent/c_sxyz.h"
 #include "d/d_bg_w_base.h"
-#include <dolphin/mtx.h>
-#include <dolphin/types.h>
+#include <mtx.h>
+#include <types.h>
+#include "dusk/offset_ptr.h"
+#include "dusk/endian.h"
+#include "dusk/endian_ssystem.h"
 
 class cBgS_GrpPassChk;
 class cBgS_PolyPassChk;
 class fopAc_ac_c;
 struct cBgD_Vtx_t;
-class dBgS_CaptPoly;
+struct dBgS_CaptPoly;
 
 class cBgW_TriElm {
 public:
@@ -54,58 +57,58 @@ struct cBgW_BlkElm {
 };  // Size: 0x6
 
 struct cBgD_Tri_t {
-    /* 0x0 */ u16 m_vtx_idx0;
-    /* 0x2 */ u16 m_vtx_idx1;
-    /* 0x4 */ u16 m_vtx_idx2;
-    /* 0x6 */ u16 m_id;
-    /* 0x8 */ u16 m_grp;
+    /* 0x0 */ BE(u16) m_vtx_idx0;
+    /* 0x2 */ BE(u16) m_vtx_idx1;
+    /* 0x4 */ BE(u16) m_vtx_idx2;
+    /* 0x6 */ BE(u16) m_id;
+    /* 0x8 */ BE(u16) m_grp;
 };  // Size: 0xA
 
 struct cBgD_Ti_t {
-    /* 0x0 */ u32 m_info0;
-    /* 0x4 */ u32 m_info1;
-    /* 0x8 */ u32 m_info2;
-    /* 0xC */ u32 m_passFlag;
+    /* 0x0 */ BE(u32) m_info0;
+    /* 0x4 */ BE(u32) m_info1;
+    /* 0x8 */ BE(u32) m_info2;
+    /* 0xC */ BE(u32) m_passFlag;
 };
 
 struct cBgD_Blk_t {
-    /* 0x0 */ u16 field_0x0;
+    /* 0x0 */ BE(u16) field_0x0;
 };
 
 struct cBgD_Tree_t {
-    /* 0x0 */ u16 m_flag;
-    /* 0x2 */ u16 m_parent_id;
-    /* 0x4 */ u16 m_id[8];
+    /* 0x0 */ BE(u16) m_flag;
+    /* 0x2 */ BE(u16) m_parent_id;
+    /* 0x4 */ BE(u16) m_id[8];
 };  // Size: 0x14
 
 struct cBgD_Grp_t {
-    /* 0x00 */ char* m_name;
-    /* 0x04 */ cXyz m_scale;
-    /* 0x10 */ csXyz m_rotation;
-    /* 0x18 */ cXyz m_translation;
-    /* 0x24 */ u16 m_parent;
-    /* 0x26 */ u16 m_next_sibling;
-    /* 0x28 */ u16 m_first_child;
-    /* 0x2A */ u16 m_room_id;
-    /* 0x2C */ u16 m_first_vtx_idx;
-    /* 0x2E */ u16 m_tree_idx;
-    /* 0x30 */ u32 m_info;
+    /* 0x00 */ OFFSET_PTR(char) m_name;
+    /* 0x04 */ BE(cXyz) m_scale;
+    /* 0x10 */ BE(csXyz) m_rotation;
+    /* 0x18 */ BE(cXyz) m_translation;
+    /* 0x24 */ BE(u16) m_parent;
+    /* 0x26 */ BE(u16) m_next_sibling;
+    /* 0x28 */ BE(u16) m_first_child;
+    /* 0x2A */ BE(u16) m_room_id;
+    /* 0x2C */ BE(u16) m_first_vtx_idx;
+    /* 0x2E */ BE(u16) m_tree_idx;
+    /* 0x30 */ BE(u32) m_info;
 }; // Size: 0x34
 
 struct cBgD_t {
-    /* 0x00 */ int m_v_num;                // vertex num
-    /* 0x04 */ cBgD_Vtx_t* m_v_tbl;        // vertex table
-    /* 0x08 */ int m_t_num;                // triangle num
-    /* 0x0C */ cBgD_Tri_t* m_t_tbl;        // triangle table
-    /* 0x10 */ int m_b_num;
-    /* 0x14 */ cBgD_Blk_t* m_b_tbl;
-    /* 0x18 */ int m_tree_num;
-    /* 0x1C */ cBgD_Tree_t* m_tree_tbl;
-    /* 0x20 */ int m_g_num;
-    /* 0x24 */ cBgD_Grp_t* m_g_tbl;
-    /* 0x28 */ int m_ti_num;
-    /* 0x2C */ cBgD_Ti_t* m_ti_tbl;
-    /* 0x30 */ int mFlags;
+    /* 0x00 */ BE(int) m_v_num;                // vertex num
+    /* 0x04 */ OFFSET_PTR(cBgD_Vtx_t) m_v_tbl; // vertex table
+    /* 0x08 */ BE(int) m_t_num;                // triangle num
+    /* 0x0C */ OFFSET_PTR(cBgD_Tri_t) m_t_tbl; // triangle table
+    /* 0x10 */ BE(int) m_b_num;
+    /* 0x14 */ OFFSET_PTR(cBgD_Blk_t) m_b_tbl;
+    /* 0x18 */ BE(int) m_tree_num;
+    /* 0x1C */ OFFSET_PTR(cBgD_Tree_t) m_tree_tbl;
+    /* 0x20 */ BE(int) m_g_num;
+    /* 0x24 */ OFFSET_PTR(cBgD_Grp_t) m_g_tbl;
+    /* 0x28 */ BE(int) m_ti_num;
+    /* 0x2C */ OFFSET_PTR(cBgD_Ti_t) m_ti_tbl;
+    /* 0x30 */ BE(int) mFlags;
 };
 
 class cBgW : public dBgW_Base {

include/d/d_bg_w_base.h

@@ -4,14 +4,14 @@
 #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 <dolphin/gx.h>
+#include <gx.h>
 #include "f_pc/f_pc_base.h"
 
 class cBgS_GndChk;
 class cBgS_LinChk;
 class cBgS_ShdwDraw;
 class dBgS_Acch;
-class dBgS_CaptPoly;
+struct dBgS_CaptPoly;
 class dBgS_RoofChk;
 class dBgS_SphChk;
 class dBgS_SplGrpChk;

include/d/d_bg_w_kcol.h

@@ -6,27 +6,28 @@
 #include "d/d_bg_plc.h"
 #include "d/d_bg_s_sph_chk.h"
 #include "d/d_bg_w_base.h"
+#include "dusk/offset_ptr.h"
 
 class cBgS_GrpPassChk;
 class cBgS_PolyPassChk;
 class dBgPc;
-class dBgS_CaptPoly;
+struct dBgS_CaptPoly;
 
 struct KC_PrismData {
-    /* 0x0 */ f32 height;
-    /* 0x4 */ u16 pos_i;
-    /* 0x6 */ u16 fnrm_i;
-    /* 0x8 */ u16 enrm1_i;
-    /* 0xA */ u16 enrm2_i;
-    /* 0xC */ u16 enrm3_i;
-    /* 0xE */ u16 attribute;
+    /* 0x0 */ BE(f32) height;
+    /* 0x4 */ BE(u16) pos_i;
+    /* 0x6 */ BE(u16) fnrm_i;
+    /* 0x8 */ BE(u16) enrm1_i;
+    /* 0xA */ BE(u16) enrm2_i;
+    /* 0xC */ BE(u16) enrm3_i;
+    /* 0xE */ BE(u16) attribute;
 };  // Size: 0x10
 
 struct KC_Header {
-    /* 0x00 */ Vec* m_pos_data;
-    /* 0x04 */ Vec* m_nrm_data;
-    /* 0x08 */ KC_PrismData* m_prism_data;
-    /* 0x0C */ KC_PrismData* m_block_data;
+    /* 0x00 */ OFFSET_PTR(Vec) m_pos_data;
+    /* 0x04 */ OFFSET_PTR(Vec) m_nrm_data;
+    /* 0x08 */ OFFSET_PTR(KC_PrismData) m_prism_data;
+    /* 0x0C */ OFFSET_PTR(BE(u32)) m_block_data;
     /* 0x10 */ f32 m_prism_thickness;
     /* 0x14 */ Vec m_area_min_pos;
     /* 0x20 */ u32 m_area_x_width_mask;

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();

include/d/d_cc_uty.h

@@ -2,7 +2,7 @@
 #define D_CC_D_CC_UTY_H
 
 #include "SSystem/SComponent/c_sxyz.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 class cCcD_Obj;
 class fopAc_ac_c;

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,12 +1237,13 @@ 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);
+                             f32 param_5, GXTexObj* i_tex);
 int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4,
                        f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8,
-                       dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12);
+                       dKy_tevstr_c* param_9, s16 param_10, f32 param_11, GXTexObj* param_12);
 
 inline dSv_info_c* dComIfGs_getSaveInfo() {
     return &g_dComIfG_gameInfo.info;
@@ -3192,8 +3195,8 @@ inline JPABaseEmitter* dComIfGp_particle_setPolyColor(u16 param_1, cBgS_PolyInfo
         param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9, param_10);
 }
 
-inline void dComIfGp_particle_setSimple(u16 param_0, cXyz* i_pos, u8 param_2, _GXColor& param_3,
-                                        _GXColor& param_4, int param_5, float param_6) {
+inline void dComIfGp_particle_setSimple(u16 param_0, cXyz* i_pos, u8 param_2, GXColor& param_3,
+                                        GXColor& param_4, int param_5, float param_6) {
     g_dComIfG_gameInfo.play.getParticle()->setSimple(param_0, i_pos, 0, param_2, param_3, param_4,
                                                      param_5, param_6);
 }
@@ -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,
@@ -4437,7 +4478,7 @@ inline int dComIfGd_setRealShadow(u32 param_0, s8 param_1, J3DModel* param_2, cX
 }
 
 inline int dComIfGd_setSimpleShadow(cXyz* pos, f32 param_1, f32 param_2, cXyz* param_3, s16 angle,
-                                    f32 param_5, _GXTexObj* tex) {
+                                    f32 param_5, GXTexObj* tex) {
     return g_dComIfG_gameInfo.drawlist.setSimpleShadow(pos, param_1, param_2, param_3, angle,
                                                        param_5, tex);
 }

include/d/d_debug_viewer.h

@@ -1,7 +1,7 @@
 #ifndef D_DEBUG_VIEWER_H
 #define D_DEBUG_VIEWER_H
 
-#include <dolphin/gx.h>
+#include <gx.h>
 #include "SSystem/SComponent/c_xyz.h"
 #include "SSystem/SComponent/c_sxyz.h"
 

include/d/d_demo.h

@@ -28,13 +28,17 @@ public:
     JStage::TObject* appendActor(fopAc_ac_c*);
     dDemo_actor_c* getActor(u8);
     dDemo_camera_c* createCamera();
+#if DEBUG
     dDemo_camera_c* createEditorCamera();
+#endif
     dDemo_camera_c* getActiveCamera();
     JStage::TObject* createAmbient();
     JStage::TObject* appendLight();
     JStage::TObject* createFog();
     void remove();
+#if DEBUG
     void removeEditorCamera();
+#endif
 
     dDemo_camera_c* getCamera() { return mpCamera; }
 
@@ -387,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;

include/d/d_door_param2.h

@@ -1,7 +1,7 @@
 #ifndef D_D_DOOR_PARAM2_H
 #define D_D_DOOR_PARAM2_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class fopAc_ac_c;
 

include/d/d_drawlist.h

@@ -95,7 +95,7 @@ public:
 class dDlst_effectLine_c : public dDlst_base_c {
 public:
     virtual void draw();
-    void update(cXyz&, _GXColor&, u16, u16, u16, u16, f32, f32, f32, f32);
+    void update(cXyz&, GXColor&, u16, u16, u16, u16, f32, f32, f32, f32);
 
     f32 getRndValue(f32 param_0, f32 param_1) { return mRnd.getValue(param_0, param_1); }
     f32 getRndFX(f32 param_0) { return mRnd.getFX(param_0); }
@@ -199,11 +199,11 @@ public:
 class dDlst_shadowSimple_c {
 public:
     void draw();
-    void set(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
+    void set(cXyz*, f32, f32, cXyz*, s16, f32, GXTexObj*);
     dDlst_shadowSimple_c();
 
     /* 0x00 */ u8 mAlpha;
-    /* 0x04 */ _GXTexObj* mpTexObj;
+    /* 0x04 */ GXTexObj* mpTexObj;
     /* 0x08 */ Mtx mVolumeMtx;
     /* 0x38 */ Mtx mMtx;
 };  // Size: 0x68
@@ -289,7 +289,7 @@ public:
     void draw(f32 (*)[4]);
     int setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*);
     bool addReal(u32, J3DModel*);
-    int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
+    int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, GXTexObj*);
     static void setSimpleTex(ResTIMG const*);
 
     static GXTexObj* getSimpleTex() { return &mSimpleTexObj; }
@@ -305,7 +305,7 @@ private:
     /* 0x0000C */ dDlst_shadowSimple_c mSimple[128];
     /* 0x0340C */ int mNextID;
     /* 0x03410 */ dDlst_shadowReal_c mReal[8];
-    /* 0x15EB0 */ _GXTexObj field_0x15eb0[2];
+    /* 0x15EB0 */ GXTexObj field_0x15eb0[2];
     /* 0x15EF0 */ void* field_0x15ef0[2];
 };
 
@@ -442,7 +442,7 @@ public:
     }
 
     int setSimpleShadow(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3, s16 param_4,
-                        f32 param_5, _GXTexObj* param_6) {
+                        f32 param_5, GXTexObj* param_6) {
         return mShadowControl.setSimple(param_0, param_1, param_2, param_3, param_4, param_5,
                                         param_6);
     }

include/d/d_event_data.h

@@ -3,24 +3,25 @@
 
 #include "global.h"
 #include "f_pc/f_pc_base.h"
+#include "dusk/endian.h"
 
 struct msg_class;
 
 struct event_binary_data_header {
-    /* 0x00 */ u32 eventTop;  // offset to Event chunk
-    /* 0x04 */ s32 eventNum;
-    /* 0x08 */ u32 staffTop;  // offset to Staff chunk
-    /* 0x0C */ s32 staffNum;
-    /* 0x10 */ u32 cutTop;  // offset to Cut chunk
-    /* 0x14 */ s32 cutNum;
-    /* 0x18 */ u32 dataTop;  // offset to Data chunk
-    /* 0x1C */ s32 dataNum;
-    /* 0x20 */ u32 fDataTop;  // offset to FData chunk
-    /* 0x24 */ s32 fDataNum;
-    /* 0x28 */ u32 iDataTop;  // offset to IData chunk
-    /* 0x2C */ s32 iDataNum;
-    /* 0x30 */ u32 sDataTop;  // offset to SData chunk
-    /* 0x34 */ s32 sDataNum;
+    /* 0x00 */ BE(u32) eventTop;  // offset to Event chunk
+    /* 0x04 */ BE(s32) eventNum;
+    /* 0x08 */ BE(u32) staffTop;  // offset to Staff chunk
+    /* 0x0C */ BE(s32) staffNum;
+    /* 0x10 */ BE(u32) cutTop;  // offset to Cut chunk
+    /* 0x14 */ BE(s32) cutNum;
+    /* 0x18 */ BE(u32) dataTop;  // offset to Data chunk
+    /* 0x1C */ BE(s32) dataNum;
+    /* 0x20 */ BE(u32) fDataTop;  // offset to FData chunk
+    /* 0x24 */ BE(s32) fDataNum;
+    /* 0x28 */ BE(u32) iDataTop;  // offset to IData chunk
+    /* 0x2C */ BE(s32) iDataNum;
+    /* 0x30 */ BE(u32) sDataTop;  // offset to SData chunk
+    /* 0x34 */ BE(s32) sDataNum;
     /* 0x38 */ u8 unk[8];
 };  // Size: 0x40
 
@@ -45,11 +46,11 @@ public:
     char* getName() { return mName; }
 
     /* 0x00 */ char mName[32];
-    /* 0x20 */ u32 mIndex;
-    /* 0x24 */ int mType;
-    /* 0x28 */ int mDataIndex;
-    /* 0x2C */ int mNumber;
-    /* 0x30 */ int mNext;
+    /* 0x20 */ BE(u32) mIndex;
+    /* 0x24 */ BE(int) mType;
+    /* 0x28 */ BE(int) mDataIndex;
+    /* 0x2C */ BE(int) mNumber;
+    /* 0x30 */ BE(int) mNext;
     /* 0x34 */ u8 field_0x34[12];
 };  // Size: 0x40
 
@@ -79,12 +80,12 @@ public:
     u32 getTagId() { return mTagID; }
 
     /* 0x00 */ char mName[32];
-    /* 0x20 */ u32 mTagID;
-    /* 0x24 */ u32 mIndex;
-    /* 0x28 */ int mFlags[3];
-    /* 0x34 */ u32 mFlagId;
-    /* 0x38 */ int mDataTop;
-    /* 0x3C */ int mNext;
+    /* 0x20 */ BE(u32) mTagID;
+    /* 0x24 */ BE(u32) mIndex;
+    /* 0x28 */ BE(int) mFlags[3];
+    /* 0x34 */ BE(u32) mFlagId;
+    /* 0x38 */ BE(int) mDataTop;
+    /* 0x3C */ BE(int) mNext;
     /* 0x40 */ u8 field_0x40[0x10];
 };  // Size: 0x50
 
@@ -136,26 +137,26 @@ public:
     };
 
     struct MessageData {
-        s16 unk;
+        BE(s16) unk;
     };
 
     struct SoundData {
-        s16 unk;
-        s16 timer;
+        BE(s16) unk;
+        BE(s16) timer;
     };
 
     struct TimerKeeperData {
-        s32 timer;
+        BE(s32) timer;
     };
 
     struct DirectorData {
-        s16 unk;
-        s16 unk2;
+        BE(s16) unk;
+        BE(s16) unk2;
     };
 
     struct EffectData {
         u8 pad[8];
-        s32 unk;
+        BE(s32) unk;
     };
 
     void specialProc_WaitStart(int index);
@@ -180,16 +181,16 @@ public:
 
     // private:
     /* 0x00 */ char mName[8];
-    /* 0x08 */ u8 mWork[0x18];
-    /* 0x20 */ s32 mTagID;
-    /* 0x24 */ u32 mIndex;
-    /* 0x28 */ u32 mFlagID;
-    /* 0x2C */ int mType;
-    /* 0x30 */ int mStartCut;
-    /* 0x34 */ s16 field_0x34;
-    /* 0x36 */ s16 mWaitTimer;
-    /* 0x38 */ int mCurrentCut;
-    /* 0x3C */ s32 field_0x3c;
+    /* 0x08 */ u8 mWork[0x18]; // PROBLEM: this buffer is now too small for StaffWork to fit in
+    /* 0x20 */ BE(s32) mTagID;
+    /* 0x24 */ BE(u32) mIndex;
+    /* 0x28 */ BE(u32) mFlagID;
+    /* 0x2C */ BE(int) mType;
+    /* 0x30 */ BE(int) mStartCut;
+    /* 0x34 */ BE(s16) field_0x34;
+    /* 0x36 */ BE(s16) mWaitTimer;
+    /* 0x38 */ BE(int) mCurrentCut;
+    /* 0x3C */ BE(s32) field_0x3c;
     /* 0x40 */ bool field_0x40;
     /* 0x41 */ bool field_0x41;
     /* 0x42 */ u8 mData[0x50 - 0x42];
@@ -223,21 +224,21 @@ public:
     int getPriority() { return mPriority; }
 
     /* 0x00 */ char mName[32];
-    /* 0x20 */ u32 mIndex;
-    /* 0x24 */ int field_0x24;
-    /* 0x28 */ int mPriority;
-    /* 0x2C */ int mStaff[20];
-    /* 0x7C */ int mNStaff;
-    /* 0x80 */ int field_0x80;
-    /* 0x84 */ int field_0x84;
-    /* 0x88 */ int mFlags[3];
+    /* 0x20 */ BE(u32) mIndex;
+    /* 0x24 */ BE(int) field_0x24;
+    /* 0x28 */ BE(int) mPriority;
+    /* 0x2C */ BE(int) mStaff[20];
+    /* 0x7C */ BE(int) mNStaff;
+    /* 0x80 */ BE(int) field_0x80;
+    /* 0x84 */ BE(int) field_0x84;
+    /* 0x88 */ BE(int) mFlags[3];
     /* 0x94 */ bool mPlaySound;
-    /* 0x96 */ s16 field_0x96;
-    /* 0x98 */ f32 field_0x98;
-    /* 0x9C */ f32 field_0x9c;
-    /* 0xA0 */ f32 field_0xa0;
-    /* 0xA4 */ int mEventState;
-    /* 0xA8 */ int field_0xa8;
+    /* 0x96 */ BE(s16) field_0x96;
+    /* 0x98 */ BE(f32) field_0x98;
+    /* 0x9C */ BE(f32) field_0x9c;
+    /* 0xA0 */ BE(f32) field_0xa0;
+    /* 0xA4 */ BE(int) mEventState;
+    /* 0xA8 */ BE(int) field_0xa8;
     /* 0xAC */ u8 field_0xac[4];
 };  // Size: 0xB0
 

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 <dolphin/types.h>
+#include <types.h>
 
 class fopAc_ac_c;
 

include/d/d_eye_hl.h

@@ -1,7 +1,7 @@
 #ifndef D_D_EYE_HL_H
 #define D_D_EYE_HL_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 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;
 };
 

include/d/d_item.h

@@ -1,7 +1,7 @@
 #ifndef D_D_ITEM_H
 #define D_D_ITEM_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 class dEnemyItem_c {
 public:

include/d/d_item_data.h

@@ -1,7 +1,7 @@
 #ifndef D_D_ITEM_DATA_H
 #define D_D_ITEM_DATA_H
 
-#include <dolphin/types.h>
+#include <types.h>
 
 struct dItem_itemInfo {
     /* 0x0 */ u8 mShadowSize;

include/d/d_jpreviewer.h

@@ -1,7 +1,7 @@
 #ifndef D_JPREVIEWER_H
 #define D_JPREVIEWER_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 #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; }

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 <dolphin/types.h>
+#include <types.h>
 
 struct color_RGB_class {
     /* 0x0 */ u8 r;

include/d/d_kankyo_rain.h

@@ -1,20 +1,19 @@
 #ifndef D_KANKYO_D_KANKYO_RAIN_H
 #define D_KANKYO_D_KANKYO_RAIN_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 
 struct cXyz;
-struct _GXColor;
 
-void dKyr_drawSun(Mtx param_0, cXyz* param_1, _GXColor& param_2, u8** param_3);
-void dKyr_drawLenzflare(Mtx param_0, cXyz* param_1, _GXColor& param_2, u8** param_3);
+void dKyr_drawSun(Mtx param_0, cXyz* param_1, GXColor& param_2, u8** param_3);
+void dKyr_drawLenzflare(Mtx param_0, cXyz* param_1, GXColor& param_2, u8** param_3);
 void dKyr_drawSibuki(Mtx param_0, u8** param_1);
 void dKyr_drawRain(Mtx param_0, u8** param_1);
 void dKyr_drawSnow(Mtx param_0, u8** param_1);
 void dKyr_drawStar(Mtx param_0, u8** param_1);
 void drawCloudShadow(Mtx param_0, u8** param_1);
 void dKyr_drawHousi(Mtx param_0, u8** param_1);
-void drawVrkumo(Mtx param_0, _GXColor& param_1, u8** param_2);
+void drawVrkumo(Mtx param_0, GXColor& param_1, u8** param_2);
 void dKyr_odour_draw(Mtx param_0, u8** param_1);
 void dKyr_mud_draw(Mtx param_0, u8** param_1);
 void dKyr_evil_draw(Mtx param_0, u8** param_1);

include/d/d_kankyo_tev_str.h

@@ -3,7 +3,7 @@
 
 #include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "SSystem/SComponent/c_xyz.h"
-#include <dolphin/types.h>
+#include <types.h>
 
 class dKy_tevstr_c {
 public:

include/d/d_lib.h

@@ -2,8 +2,8 @@
 #define D_D_LIB_H
 
 #include "SSystem/SComponent/c_xyz.h"
-#include <dolphin/mtx.h>
-#include <dolphin/os.h>
+#include <mtx.h>
+#include <os.h>
 
 class fopAc_ac_c;
 

include/d/d_map.h

@@ -170,7 +170,7 @@ public:
     virtual int getRoomNoSingle();
     virtual bool isDrawRoom(int, int) const;
     virtual bool isDrawRoomIcon(int, int) const;
-    virtual const Vec* getIconPosition(dTres_c::typeGroupData_c*) const;
+    virtual const BE(Vec)* getIconPosition(dTres_c::typeGroupData_c*) const;
     virtual dTres_c::typeGroupData_c* getFirstData(u8);
     virtual dTres_c::typeGroupData_c* getNextData(dTres_c::typeGroupData_c*);
     virtual void setAmapPaletteColor(int, u8, u8, u8, u8);

include/d/d_map_path.h

@@ -9,7 +9,7 @@ struct dMpath_RGB5A3_s {
 };
 
 namespace dMpath_ColorCnv_n {
-    void convertRGB5A3_To_GXColor(_GXColor&, const dMpath_RGB5A3_s&);
+    void convertRGB5A3_To_GXColor(GXColor&, const dMpath_RGB5A3_s&);
 }
 
 struct dMpath_RGB5A3_palDt_s {
@@ -115,13 +115,13 @@ public:
         /* 0x01 */ u8 field_0x1;
         /* 0x02 */ u8 mDataNum;
         /* 0x03 */ u8 field_0x3;
-        /* 0x04 */ u16* mpData;
+        /* 0x04 */ OFFSET_PTR(BE(u16)) mpData;
     };  // Size: 0x8
 
     struct poly_class {
         /* 0x00 */ u8 field_0x0;
         /* 0x01 */ u8 mDataNum;
-        /* 0x04 */ u16* mpData;
+        /* 0x04 */ OFFSET_PTR(BE(u16)) mpData;
     };  // Size: 0x8
 
     struct group_class {
@@ -130,21 +130,21 @@ public:
         /* 0x02 */ u8 mLineNum;
         /* 0x03 */ u8 field_0x3;
         /* 0x04 */ u8 mPolyNum;
-        /* 0x08 */ dDrawPath_c::line_class* mpLine;
+        /* 0x08 */ OFFSET_PTR(dDrawPath_c::line_class) mpLine;
         /* 0x0C */ u8 field_0xc[4];
-        /* 0x10 */ dDrawPath_c::poly_class* mpPoly;
+        /* 0x10 */ OFFSET_PTR(dDrawPath_c::poly_class) mpPoly;
     };  // Size: 0x14
 
     struct floor_class {
         /* 0x0 */ s8 mFloorNo;
         /* 0x1 */ u8 mGroupNum;
-        /* 0x4 */ dDrawPath_c::group_class* mpGroup;
+        /* 0x4 */ OFFSET_PTR(dDrawPath_c::group_class) mpGroup;
     };  // Size: 0x8
 
     struct room_class {
         /* 0x0 */ u8 mFloorNum;
-        /* 0x4 */ dDrawPath_c::floor_class* mpFloor;
-        /* 0x8 */ f32* mpFloatData;  // might be Vec or cXyz instead
+        /* 0x4 */ OFFSET_PTR(dDrawPath_c::floor_class) mpFloor;
+        /* 0x8 */ OFFSET_PTR(BE(f32)) mpFloatData;  // might be Vec or cXyz instead
     };
 
     struct layer_data {

include/d/d_map_path_dmap.h

@@ -50,9 +50,9 @@ struct dMapInfo_n {
     static bool chkGetCompass();
     static bool chkGetMap();
     static bool isVisitedRoom(int);
-    static void correctionOriginPos(s8, Vec*);
-    static void offsetPlus(dStage_FileList2_dt_c const*, Vec*);
-    static void rotAngle(dStage_FileList2_dt_c const*, Vec*);
+    static void correctionOriginPos(s8, BE(Vec)*);
+    static void offsetPlus(dStage_FileList2_dt_c const*, BE(Vec)*);
+    static void rotAngle(dStage_FileList2_dt_c const*, BE(Vec)*);
     static Vec getMapPlayerPos();
     static s16 getMapPlayerAngleY();
     static const dTres_c::typeGroupData_c* getConstRestartIconPointer();
@@ -127,7 +127,7 @@ public:
     virtual int getNextDrawLayerNo(int);
 
     virtual bool isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool,
-                                                 Vec const*) const;
+                                                 BE(Vec) const*) const;
     virtual int getIconGroupNumber(u8) const;
     virtual bool hasMap() const = 0;
     virtual bool isRendAllRoom() const = 0;
@@ -177,7 +177,7 @@ public:
     virtual ~renderingPlusDoorAndCursor_c() {}
     virtual void afterDrawPath();
     virtual f32 getIconSize(u8) const = 0;
-    virtual const Vec* getIconPosition(dTres_c::typeGroupData_c*) const;
+    virtual const BE(Vec)* getIconPosition(dTres_c::typeGroupData_c*) const;
     virtual dTres_c::typeGroupData_c* getFirstData(u8);
     virtual dTres_c::typeGroupData_c* getNextData(dTres_c::typeGroupData_c*);
     virtual f32 getPlayerCursorSize() = 0;