Merge remote-tracking branch 'decomp/main' into 26-02-27-pjb-dev-2

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

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,7 +1,7 @@
 #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/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_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_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,7 +1,7 @@
 #ifndef C_XYZ_H
 #define C_XYZ_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 #include <cmath>
 
 #ifdef _MSVC_LANG

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_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_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_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_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_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,7 +1,7 @@
 #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;

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_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 <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"

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 <dolphin/gx.h>
+#include <gx.h>
 #include "f_pc/f_pc_base.h"
 
 class cBgS_GndChk;

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,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,

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

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

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_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,7 +1,7 @@
 #ifndef D_KANKYO_D_KANKYO_RAIN_H
 #define D_KANKYO_D_KANKYO_RAIN_H
 
-#include <dolphin/mtx.h>
+#include <mtx.h>
 
 struct cXyz;
 

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_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 <dolphin/types.h>
+#include <types.h>
 
 class CPaneMgr;
 struct CSTControl;

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

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 <dolphin/types.h>
+#include <types.h>
 #include <cstring>
 #include "d/d_menu_fmap.h"
 #include "d/d_map.h"

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

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

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

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

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

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 <dolphin/types.h>
+#include <types.h>
 #include "d/d_msg_scrn_base.h"
 
 class dMsgScrnArrow_c;

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 <dolphin/types.h>
+#include <types.h>
 #include "d/d_msg_scrn_base.h"
 
 class dMsgScrnArrow_c;

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; 

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 <types.h>
 #include <global.h>
 
 // Room scenes use a bit to specify an ID is from a room particle pack, not the common particle pack

include/d/d_path.h

@@ -1,8 +1,8 @@
 #ifndef D_D_PATH_H
 #define D_D_PATH_H
 
-#include <dolphin/types.h>
-#include <dolphin/mtx.h>
+#include <types.h>
+#include <mtx.h>
 
 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);

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

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

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

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;

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;

include/d/d_save.h

@@ -3,7 +3,7 @@
 
 #include <cstring>
 #include "SSystem/SComponent/c_xyz.h"
-#include <dolphin/os.h>
+#include <os.h>
 #include "global.h"
 #include "f_pc/f_pc_name.h"
 #include "JSystem/JUtility/JUTAssert.h"

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;

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