switch to dtk setup (#2203)

* switch to dtk setup

* some cleanup / fixes

* cleanup d_a_alink literals

* Restore doxygen, update CI & README.md (#1)

* Fix build image ref (#2)

---------

Co-authored-by: Luke Street <luke@street.dev>

include/JSystem/JAudio2/JASTrack.h

@@ -116,13 +116,9 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
     static JASOscillator::Point const sAdsTable[4];
     static JASOscillator::Data const sEnvOsc;
     static JASOscillator::Data const sPitchEnvOsc;
-#ifdef NONMATCHING
+
     static JASDefaultBankTable sDefaultBankTable;
     static TList sTrackList;
-#else
-    static u8 sDefaultBankTable[1036];
-    static u8 sTrackList[16];
-#endif
 
     JASSeqCtrl* getSeqCtrl() { return &mSeqCtrl; }
     u16 getPort(u32 param_0) { return mTrackPort.get(param_0); }

include/JSystem/JAudio2/JASWSParser.h

@@ -1,7 +1,7 @@
 #ifndef JASWSPARSER_H
 #define JASWSPARSER_H
 
-#include "dolphin/types.h"
+#include "JSystem/JSupport/JSupport.h"
 
 class JKRHeap;
 class JASWaveBank;

include/JSystem/JGeometry.h

@@ -164,6 +164,10 @@ struct TVec3<f32> : public Vec {
         return *this;
     }
 
+    inline TVec3<f32> operator+(const TVec3<f32>& b) {
+        return *this += b;
+    }
+
     // inline TVec3<f32> operator+(const TVec3<f32>& b) {
     //     TVec3<f32> res(*(Vec*)this);
     //     res += b;
@@ -452,6 +456,16 @@ struct TUtil {
 template<>
 struct TUtil<f32> {
     static inline f32 PI() { return 3.1415927f; }
+
+    static inline f32 clamp(f32 v, f32 min, f32 max) {
+        if (v < min) {
+            return min;
+        }
+        if (v > max) {
+            return max;
+        }
+        return v;
+    }
 };
 
 template<>

include/JSystem/JStudio/JStudio_JStage/control.h

@@ -82,9 +82,7 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T
     };
 
     struct TVVOutput_ANIMATION_FRAME_ 
-    #ifdef NONMATCHING
     : public JStudio::TVariableValue::TOutput
-    #endif
     {
         TVVOutput_ANIMATION_FRAME_() {
             mValueIndex = -1;
@@ -101,7 +99,7 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T
             mGetter = param_4;
             mMaxGetter = param_5;
         }
-        #ifdef NONMATCHING
+
         /* 8028B064 */ virtual void operator()(f32, JStudio::TAdaptor*) const;
         /* 8028B138 */ virtual ~TVVOutput_ANIMATION_FRAME_();
         
@@ -113,12 +111,6 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T
             f32 val = (param_1->*mGetter)();
             param_2->adaptor_setVariableValue_immediate(mValueIndex, val);
         }
-        #else
-        /* 8028B064 */ void operator()(f32, JStudio::TAdaptor*) const;
-        /* 8028B138 */ ~TVVOutput_ANIMATION_FRAME_();
-
-        void* vtable;
-        #endif
 
         bool isEnd_() { return mValueIndex == -1; }
 
@@ -165,13 +157,8 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T
 
     JStage::TActor* get_pJSG_() { return (JStage::TActor*) pJSGObject_; }
 
-    #ifdef NONMATCHING
     static TVVOutputObject saoVVOutput_[2];
     static TVVOutput_ANIMATION_FRAME_  saoVVOutput_ANIMATION_FRAME_[3];
-    #else
-    static u8 saoVVOutput_[64];
-    static u8 saoVVOutput_ANIMATION_FRAME_[144 + 4 /* padding */];
-    #endif
 
     /* 0x130 */ u32 field_0x130;
     /* 0x134 */ u32 field_0x134;

include/JSystem/JSupport/JSupport.h

@@ -1,6 +1,8 @@
 #ifndef JSUPPORT_H
 #define JSUPPORT_H
 
+#include <dolphin.h>
+
 /**
 * @ingroup jsystem-jsupport
 * 

include/REL/executor.h

@@ -0,0 +1,26 @@
+#ifndef REL_EXECUTOR_H
+#define REL_EXECUTOR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void _prolog();
+extern void _epilog();
+extern void _unresolved();
+
+typedef void (*VoidFunc)(void);
+extern const VoidFunc _ctors[];
+extern const VoidFunc _dtors[];
+
+extern void ModuleProlog(void);
+extern void ModuleEpilog(void);
+extern void ModuleUnresolved(void);
+extern void ModuleConstructorsX(const VoidFunc* ctors);
+extern void ModuleDestructorsX(const VoidFunc* dtors);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* REL_EXECUTOR_H */

include/Z2AudioLib/Z2Creature.h

@@ -83,6 +83,8 @@ public:
     u8 getLinkHp() const { return mLinkHp; }
     u8 getMovingTime() { return mMovingTime; }
     u8 isWolfSmellOpen() const { return mWolfEyeOpen; }
+    void setUsingIronBall(bool i_using) { mUsingIronBall = i_using; }
+    void setMarkState(u8 i_state) { mMarkState = i_state; }
 
     static Z2CreatureLink* mLinkPtr;
 

include/d/a/d_a_horse_static.h

@@ -1,24 +0,0 @@
-#ifndef D_A_D_A_HORSE_STATIC_H
-#define D_A_D_A_HORSE_STATIC_H
-
-#include "f_op/f_op_actor.h"
-
-class daTagHstop_c : public fopAc_ac_c {
-public:
-    static daTagHstop_c* getTop() { return m_top; }
-
-    daTagHstop_c* getNext() { return mpNext; }
-    bool getActiveFlg() const { return mActive; }
-
-    /* 0x568 */ daTagHstop_c* mpNext;
-    /* 0x56C */ daTagHstop_c* field_0x56c;
-    /* 0x570 */ u8 field_0x570;
-    /* 0x571 */ bool mActive;
-    /* 0x572 */ u8 field_0x572;
-    /* 0x573 */ u8 field_0x573;
-    /* 0x574 */ int field_0x574;
-
-    static daTagHstop_c* m_top;
-};
-
-#endif /* D_A_D_A_HORSE_STATIC_H */

include/d/actor/d_a_alink.h

@@ -5,16 +5,16 @@
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "Z2AudioLib/Z2WolfHowlMgr.h"
-#include "d/a/d_a_player.h"
+#include "d/actor/d_a_player.h"
 #include "d/d_eye_hl.h"
 #include "d/d_jnt_col.h"
-#include "d/meter/d_meter2_info.h"
-#include "d/msg/d_msg_flow.h"
-#include "d/particle/d_particle_copoly.h"
-#include "d/save/d_save.h"
+#include "d/d_meter2_info.h"
+#include "d/d_msg_flow.h"
+#include "d/d_particle_copoly.h"
+#include "d/d_save.h"
 #include "f_op/f_op_actor_mng.h"
-#include "rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h"
-#include "rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h"
+#include "d/actor/d_a_kytag05.h"
+#include "d/actor/d_a_tag_mmsg.h"
 
 class J2DAnmColorKey;
 class J2DAnmTransformKey;
@@ -62,7 +62,7 @@ private:
 class daAlink_sight_c : public daPy_sightPacket_c {
 public:
     daAlink_sight_c() {}
-    /* 80126650 */ bool create();
+    /* 80126650 */ BOOL create();
     /* 80126710 */ void onLockFlg();
 
     /* 801266C0 */ virtual void draw();
@@ -188,17 +188,27 @@ struct daAlink_WlAnmData {
 class daAlinkHIO_wolf_c {
 public:
     /* 80140B98 */ ~daAlinkHIO_wolf_c();
+
+    /* 0x0 */ u8 unk_0x0;
 };
 
 class daAlinkHIO_cut_c {
 public:
     /* 80140BD4 */ ~daAlinkHIO_cut_c();
+
+    /* 0x0 */ u8 unk_0x0;
 };
 
 class daAlinkHIO_c {
 public:
     /* 80140B88 */ daAlinkHIO_c();
-    /* 80140C10 */ ~daAlinkHIO_c();
+    /* 80140C10 */ virtual ~daAlinkHIO_c();
+
+    /* 0x04 */ u8 field_0x4[0xC - 0x4];
+    /* 0x0C */ daAlinkHIO_cut_c mCut;
+    /* 0x0D */ u8 field_0xD[0x4B - 0xD];
+    /* 0x4B */ daAlinkHIO_wolf_c mWolf;
+    /* 0x4C */ u8 field_0x4C[0x6C - 0x4C];
 };
 
 class daAlink_c;
@@ -1392,7 +1402,7 @@ public:
     /* 800AFCF0 */ void playFaceTextureAnime();
     /* 800B0098 */ s16 getGroundAngle(cBgS_PolyInfo*, s16);
     /* 800B0150 */ s16 getRoofAngle(cBgS_PolyInfo*, s16);
-    /* 800B01FC */ void getWallEdgePos(cXyz const&, cM3dGPla*, cM3dGPla*, cXyz*, int);
+    /* 800B01FC */ BOOL getWallEdgePos(cXyz const&, cM3dGPla*, cM3dGPla*, cXyz*, int);
     /* 800B02BC */ void setFrontWallType();
     /* 800B1488 */ BOOL checkWaterPolygonUnder();
     /* 800B14B4 */ void setWaterY();
@@ -1515,7 +1525,7 @@ public:
     /* 800BDF60 */ int startRestartRoom(u32, int, int, int);
     /* 800BE26C */ BOOL checkCoachGuardGame();
     /* 800BE2C0 */ void checkRoofRestart();
-    /* 800BE3E4 */ bool checkRestartRoom();
+    /* 800BE3E4 */ BOOL checkRestartRoom();
     /* 800BE9D4 */ s16 getSceneExitMoveAngle();
     /* 800BEAF8 */ int checkSceneChange(int i_exitID);
     /* 800BF0B8 */ void voiceStartLevel(u32);
@@ -1553,8 +1563,8 @@ public:
     /* 800C04B4 */ static bool checkRoomSpecial();
     /* 800C0520 */ static bool checkRoom();
     /* 800C0594 */ static bool checkNotBattleStage();
-    /* 800C05DC */ bool checkNotHeavyBootsStage();
-    /* 800C0630 */ bool checkNotAutoJumpStage();
+    /* 800C05DC */ static bool checkNotHeavyBootsStage();
+    /* 800C0630 */ static bool checkNotAutoJumpStage();
     /* 800C0678 */ static bool checkCastleTownUseItem(u16);
     /* 800C077C */ int changeItemTriggerKeepProc(u8, int);
     /* 800C0A9C */ int checkNewItemChange(u8);
@@ -1662,8 +1672,12 @@ public:
     /* 800CF100 */ int procCoPeepSubjectivityInit();
     /* 800CF1B8 */ int procCoPeepSubjectivity();
     /* 800CF380 */ daAlink_c();
-    /* 800D0110 */ BOOL checkWolfEnemyThrowAnime() const;
-    /* 800D014C */ void setMidnaTalkStatus(u8);
+    /* 800D0110 */ BOOL checkWolfEnemyThrowAnime() const {
+        return checkUpperAnime(0x2BD) || checkUpperAnime(0x2BE);
+    }
+    /* 800D014C */ void setMidnaTalkStatus(u8 status) {
+        dComIfGp_setZStatus(status, 0);
+    }
     /* 800D0164 */ void set3DStatus(u8, u8);
     /* 800D2684 */ void checkCutTurnCharge();
     /* 800D0E08 */ void checkLightSwordMtrl();
@@ -1942,7 +1956,7 @@ public:
     /* 800E3C6C */ BOOL checkGrabAnime() const;
     /* 800E3C9C */ BOOL checkGrabAnimeAndThrow() const;
     /* 800E3CF4 */ BOOL checkGrabCarryActor();
-    /* 800E3D1C */ void checkGrabSlowMoveActor();
+    /* 800E3D1C */ BOOL checkGrabSlowMoveActor();
     /* 800E3D6C */ BOOL checkGrabHeavyActor();
     /* 800E3D94 */ BOOL checkGrabSideActor();
     /* 800E3DBC */ void setGrabUpperAnime(f32);
@@ -1952,7 +1966,7 @@ public:
     /* 800E4DEC */ void setGrabUpperSpeedRate();
     /* 800E4FA8 */ void setCarryArmAngle(f32, f32);
     /* 800E5150 */ BOOL checkGrabNotThrow();
-    /* 800E5170 */ void checkNextActionGrab();
+    /* 800E5170 */ BOOL checkNextActionGrab();
     /* 800E53AC */ void initGrabNextMode();
     /* 800E53F8 */ void setGrabItemThrow();
     /* 800E57AC */ BOOL checkUpperGrabItemThrow(f32);
@@ -1976,7 +1990,7 @@ public:
     /* 800E6FE0 */ int procGrabStand();
     /* 800E70C0 */ BOOL checkInsectActorName(fopAc_ac_c*);
     /* 800E70FC */ int procInsectCatchInit();
-    /* 800E71D4 */ bool procInsectCatch();
+    /* 800E71D4 */ int procInsectCatch();
     /* 800E7254 */ int procPickUpInit();
     /* 800E7460 */ int procPickUp();
     /* 800E75EC */ int procPickPutInit(int);
@@ -2282,7 +2296,7 @@ public:
     /* 800FE010 */ f32 getClimbMoveUpDownAnmSpeed();
     /* 800FE034 */ f32 getClimbMoveSideAnmSpeed();
     /* 800FE058 */ BOOL checkClimbCode(cBgS_PolyInfo&);
-    /* 800FE114 */ void setClimbInit();
+    /* 800FE114 */ BOOL setClimbInit();
     /* 800FE174 */ void setClimbShapeOffset();
     /* 800FE3C4 */ int getClimbDirectionFromAngle();
     /* 800FE438 */ void changeClimbMoveProc(int);
@@ -2708,7 +2722,7 @@ public:
     /* 80127CAC */ void offWolfEyeUp();
     /* 80127CF0 */ BOOL wolfSenseTrigger();
     /* 80127D14 */ void setWolfSenceStatus(u8);
-    /* 80127D2C */ void wolfClawTrigger();
+    /* 80127D2C */ BOOL wolfClawTrigger();
     /* 80127D50 */ void setWolfDigStatus(u8);
     /* 80127D68 */ BOOL checkWolfShapeReverse() const;
     /* 80127DC4 */ BOOL checkWolfSideStep() const;
@@ -3199,7 +3213,7 @@ public:
     BOOL arrowChangeTrigger() { return itemActionTrigger(); }
     bool peepSubjectCancelTrigger() { return itemTriggerCheck(0x8); }
     int getStartMode() { return (fopAcM_GetParam(this) >> 0xC) & 0x1F; }
-    inline bool checkInputOnR() const;
+    bool checkInputOnR() const { return field_0x33ac > 0.05f; }
     static int getSightBti() { return 0x5B; }
     bool checkBoomerangChargeEndWait() const {
         return mEquipItem != 0x102 && checkBoomerangAnime();
@@ -3330,6 +3344,8 @@ public:
         return mItemTrigger & (BTN_A | BTN_B);
     }
 
+    void clearComboReserb() { offNoResetFlg2(FLG2_UNK_2); }
+
     void setDamageColorTime() {
         mDamageColorTime = 32 - (mDamageTimer % 16); 
     }
@@ -3383,6 +3399,8 @@ public:
 
     BOOL checkStartFall() { return getStartMode() == 3; }
 
+    u8 getBStatus() { return dComIfGp_getAStatus(); }
+
     inline bool checkWindSpeedOnXZ() const;
     inline void startRestartRoomFromOut(int, u32, int);
     inline u16 getReadyItem();
@@ -3397,22 +3415,19 @@ public:
     static u8 const m_handRightOutSidePos[12];
     static u8 const m_handLeftInSidePos[12];
     static u8 const m_handRightInSidePos[12];
-    static u8 m_procInitTable[5632];
 
-    #ifdef NONMATCHING
+
+    static daAlink_procInitTable m_procInitTable[];
     static daAlink_procFunc m_demoInitTable[];
-    #else
-    static u8 m_demoInitTable[1140];
-    #endif
 
     static u8 m_fEffParamProc[72];
 
     /* 0x0062C */ request_of_phase_process_class mPhaseReq;
     /* 0x00634 */ char* mArcName;
-    /* 0x00638 */ JKRExpHeap* field_0x0638;
+    /* 0x00638 */ JKRExpHeap* mpArcHeap;
     /* 0x0063C */ request_of_phase_process_class mShieldPhaseReq;
     /* 0x00644 */ char* mShieldArcName;
-    /* 0x00648 */ JKRExpHeap* field_0x0648;
+    /* 0x00648 */ JKRExpHeap* mpShieldArcHeap;
     /* 0x0064C */ J3DModelData* field_0x064C;
     /* 0x00650 */ J3DModel* mpLinkModel;
     /* 0x00654 */ J3DModel* mpLinkFaceModel;
@@ -3475,9 +3490,10 @@ public:
     /* 0x00768 */ J3DModelData* mpHookKusariModelData;
     /* 0x0076C */ Z2SoundObjSimple* mpHookSound;
     /* 0x00770 */ hsChainShape_c* mpHookChain;
-    /* 0x00774 */ u8 field_0x0774[0x77C - 0x774];
+    /* 0x00774 */ void* field_0x0774;
+    /* 0x00778 */ void* field_0x0778;
     /* 0x0077C */ dBgS_ObjLinChk* mpHookshotLinChk;
-    /* 0x00780 */ u8 field_0x780[4];
+    /* 0x00780 */ void* field_0x780;
     /* 0x00784 */ J3DModel* mpLinkBootModels[2];
     /* 0x0078C */ J3DModel* mpWlChainModels[4];
     /* 0x0079C */ J3DModel* mpWlMidnaModel;
@@ -3489,7 +3505,7 @@ public:
     /* 0x007B4 */ J3DAnmTevRegKey* mpDMidnaHandBrk;
     /* 0x007B8 */ J3DAnmTevRegKey* mpDMidnaHairHandBrk;
     /* 0x007BC */ mDoExt_bckAnm* m_sWindowBck;
-    /* 0x007C0 */ u32 mpWarpTexData;
+    /* 0x007C0 */ void* mpWarpTexData;
     /* 0x007C4 */ daPy_actorKeep_c mWolfLockAcKeep[10];
     /* 0x00814 */ dCcD_Stts field_0x814;
     /* 0x00850 */ dCcD_Cyl field_0x850[3];
@@ -3500,7 +3516,7 @@ public:
     /* 0x015F8 */ dCcD_Cps mGuardAtCps;
     /* 0x0173C */ dCcD_Stts field_0x173c;  // related to ball and chain
     /* 0x01778 */ dCcD_Sph field_0x1778;
-    /* 0x018B0 */ dBgS_AcchCir field_0x18B0[3];
+    /* 0x018B0 */ dBgS_AcchCir mAcchCir[3];
     /* 0x01970 */ dBgS_LinkAcch mLinkAcch;
     /* 0x01B48 */ dBgS_LinkLinChk mLinkLinChk;
     /* 0x01BB8 */ dBgS_RopeLinChk mRopeLinChk;
@@ -3580,14 +3596,14 @@ public:
     /* 0x02BA0 */ f32* field_0x2ba0;
     /* 0x02BA4 */ f32 field_0x2ba4;
     /* 0x02BA8 */ f32 mSinkShapeOffset;
-    /* 0x02BAC */ f32 field_0x2bac[3];
+    /* 0x02BAC */ f32 mAcchCirWallH[3];
     /* 0x02BB8 */ Mtx mInvMtx;
     /* 0x02BE8 */ Mtx field_0x2be8;
     /* 0x02C18 */ Mtx mRootMtx;
     /* 0x02C48 */ Mtx mMagneBootMtx;
     /* 0x02C78 */ Mtx mMagneBootInvMtx;
     /* 0x02CA8 */ Z2CreatureLink mZ2Link;
-    /* 0x02D78 */ void* field_0x2d78;
+    /* 0x02D78 */ u8* field_0x2d78;
     /* 0x02D7C */ daPy_frameCtrl_c* field_0x2d7c;
     /* 0x02D80 */ int field_0x2d80;
     /* 0x02D84 */ Z2WolfHowlMgr mZ2WolfHowlMgr;
@@ -3598,7 +3614,7 @@ public:
     /* 0x02F38 */ dPa_hermiteEcallBack_c field_0x2f38;
     /* 0x02F50 */ const Vec* field_0x2f50;
     /* 0x02F54 */ const Vec* field_0x2f54;
-    /* 0x02F58 */ u16* field_0x2f58;
+    /* 0x02F58 */ dPath* field_0x2f58;
     /* 0x02F5C */ LIGHT_INFLUENCE field_0x2f5c;
     /* 0x02F7C */ u8 field_0x2f7c[16];
     /* 0x02F8C */ u8 field_0x2f8c;
@@ -5163,7 +5179,8 @@ public:
 
 class daAlinkHIO_huLight_c1 {
 public:
-    /* 0x00 */ s16 field_0x0;
+    /* 0x00 */ u8 field_0x0;
+    /* 0x00 */ u8 field_0x1;
     /* 0x02 */ s16 field_0x2;
     /* 0x04 */ s16 field_0x4;
     /* 0x06 */ s16 field_0x6;

include/d/actor/d_a_andsw.h

@@ -1,7 +1,7 @@
 #ifndef D_A_ANDSW_H
 #define D_A_ANDSW_H
 
-#include "d/com/d_com_inf_game.h"
+#include "d/d_com_inf_game.h"
 
 /**
  * @ingroup actors-unsorted

include/d/actor/d_a_arrow.h

@@ -1,9 +1,9 @@
 #ifndef D_A_ARROW_H
 #define D_A_ARROW_H
 
-#include "d/a/d_a_player.h"
-#include "d/cc/d_cc_d.h"
-#include "d/particle/d_particle.h"
+#include "d/actor/d_a_player.h"
+#include "d/d_cc_d.h"
+#include "d/d_particle.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

include/d/actor/d_a_b_bq.h

@@ -3,8 +3,8 @@
 
 #include "f_op/f_op_actor_mng.h"
 #include "Z2AudioLib/Z2Creature.h"
-#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_uty.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 
 /**
  * @ingroup actors-enemies
@@ -18,13 +18,12 @@ class b_bq_class : public fopEn_enemy_c {
 public:
     /* 805B9B3C */ b_bq_class();
 
-private:
     /* 0x05AC */ request_of_phase_process_class mPhase;
     /* 0x05B4 */ mDoExt_McaMorfSO* mpMorf;
-    /* 0x05B8 */ mDoExt_brkAnm* field_0x5b8;
-    /* 0x05BC */ mDoExt_btkAnm* field_0x5bc;
-    /* 0x05C0 */ s8 field_0x5c0;
-    /* 0x05C4 */ J3DModel* field_0x5c4;
+    /* 0x05B8 */ mDoExt_brkAnm* mpDeadBrk;
+    /* 0x05BC */ mDoExt_btkAnm* mpTodomeBtk;
+    /* 0x05C0 */ s8 mPlayTodomeBtk;
+    /* 0x05C4 */ J3DModel* mpEyeballModel;
     /* 0x05C8 */ s8 field_0x5c8;
     /* 0x05CC */ cXyz field_0x5cc;
     /* 0x05D8 */ f32 field_0x5d8;
@@ -38,32 +37,31 @@ private:
     /* 0x06CC */ s16 mMode;
     /* 0x06CE */ s16 mAngleToPlayer;
     /* 0x06D0 */ f32 mDistToPlayer;
-    /* 0x06D4 */ s16 field_0x6d4[5];
+    /* 0x06D4 */ s16 mTimers[5];
     /* 0x06DE */ s16 field_0x6de;
-    /* 0x06E0 */ int field_0x6e0;
-    /* 0x06E4 */ int field_0x6e4;
-    /* 0x06E8 */ fopAc_ac_c* mpMBactor;
+    /* 0x06E0 */ unsigned int mTentacleIDs[2];
+    /* 0x06E8 */ unsigned int mMonkeyBombID;
     /* 0x06EC */ u8 field_0x6ec;
-    /* 0x06ED */ u8 field_0x6ed;
-    /* 0x06F0 */ f32 field_0x6f0;
-    /* 0x06F4 */ s16 field_0x6f4;
+    /* 0x06ED */ s8 mColpatType;
+    /* 0x06F0 */ f32 mColpatBlend;
+    /* 0x06F4 */ s16 mHeadRot;
     /* 0x06F6 */ s16 field_0x6f6;
-    /* 0x06F8 */ s8 field_0x6f8;
+    /* 0x06F8 */ s8 mDisableDraw;
     /* 0x06F9 */ u8 field_0x6f9;
     /* 0x06FA */ u8 field_0x6fa;
     /* 0x06FB */ u8 field_0x6fb;
-    /* 0x06FC */ u8 field_0x6fc;
+    /* 0x06FC */ s8 field_0x6fc;
     /* 0x06FE */ s16 field_0x6fe;
-    /* 0x0700 */ dCcD_Stts field_0x700;
-    /* 0x073C */ dCcD_Sph field_0x73c;
-    /* 0x0874 */ dCcD_Stts field_0x874;
-    /* 0x08B0 */ dCcD_Sph field_0x8b0;
-    /* 0x09E8 */ dCcD_Sph field_0x9e8;
-    /* 0x0B20 */ dCcD_Sph field_0xb20[4];
-    /* 0x1000 */ dCcD_Sph field_0x1000;
+    /* 0x0700 */ dCcD_Stts mCcStts;
+    /* 0x073C */ dCcD_Sph mCcSph;
+    /* 0x0874 */ dCcD_Stts mCcCoStts;
+    /* 0x08B0 */ dCcD_Sph mCcCoreSph;
+    /* 0x09E8 */ dCcD_Sph mCcCoreCoSph;
+    /* 0x0B20 */ dCcD_Sph mCcMizuSph[4];
+    /* 0x1000 */ dCcD_Sph mCcBodyCoSph;
     /* 0x1138 */ cXyz field_0x1138;
     /* 0x1144 */ cXyz field_0x1144;
-    /* 0x1150 */ s8 field_0x1150;
+    /* 0x1150 */ s8 mDamageBackCount;
     /* 0x1151 */ u8 field_0x1151;
     /* 0x1154 */ dCcU_AtInfo mAtInfo;
     /* 0x1178 */ f32 field_0x1178;
@@ -78,31 +76,31 @@ private:
     /* 0x11D8 */ f32 field_0x11d8;
     /* 0x11DC */ u8 field_0x11DC[0x11FC - 0x11DC];
     /* 0x11FC */ s8 field_0x11fc;
-    /* 0x1200 */ u32 field_0x1200[4];
-    /* 0x1210 */ u32 field_0x1210[2];
+    /* 0x1200 */ u32 mMizutamaEmtrIDs[4];
+    /* 0x1210 */ u32 mSmokeEmtrIDs[2];
     /* 0x1218 */ u8 field_0x1218[0x1220 - 0x1218];
     /* 0x1220 */ u32 field_0x1220;
     /* 0x1224 */ u32 field_0x1224;
     /* 0x1228 */ u32 field_0x1228[4];
-    /* 0x1238 */ s16 field_0x1238;
-    /* 0x123A */ s16 field_0x123a;
-    /* 0x123C */ u8 field_0x123C[0x1240 - 0x123C];
-    /* 0x1240 */ cXyz field_0x1240;
-    /* 0x124C */ cXyz field_0x124c;
-    /* 0x1258 */ cXyz field_0x1258;
+    /* 0x1238 */ s16 mDemoMode;
+    /* 0x123A */ s16 mDemoModeTimer;
+    /* 0x123C */ u8 field_0x123c;
+    /* 0x1240 */ cXyz mDemoCamEye;
+    /* 0x124C */ cXyz mDemoCamCenter;
+    /* 0x1258 */ cXyz mDemoCamEyeTarget;
     /* 0x1264 */ cXyz field_0x1264;
-    /* 0x1270 */ cXyz field_0x1270;
+    /* 0x1270 */ cXyz mDemoCamCenterTarget;
     /* 0x127C */ cXyz field_0x127c;
     /* 0x1288 */ cXyz field_0x1288;
     /* 0x1294 */ u8 field_0x1294[0x1298 - 0x1294];
     /* 0x1298 */ f32 field_0x1298;
     /* 0x129C */ f32 field_0x129c;
     /* 0x12A0 */ f32 field_0x12a0;
-    /* 0x12A4 */ f32 field_0x12a4;
+    /* 0x12A4 */ f32 mDemoCamFovy;
     /* 0x12A8 */ f32 field_0x12a8;
-    /* 0x12AC */ s16 field_0x12ac;
-    /* 0x12AE */ s16 field_0x12ae;
-    /* 0x12B0 */ cXyz field_0x12b0;
+    /* 0x12AC */ s16 mBlureRate;
+    /* 0x12AE */ s16 mBlureRateTarget;
+    /* 0x12B0 */ cXyz mMizuAtStartPos;
     /* 0x12BC */ cXyz field_0x12bc;
     /* 0x12C8 */ cXyz field_0x12c8[16];
     /* 0x1388 */ int field_0x1388;
@@ -111,12 +109,12 @@ private:
     /* 0x1390 */ s16 field_0x1390;
     /* 0x1392 */ u8 field_0x1392;
     /* 0x1393 */ s8 field_0x1393;
-    /* 0x1394 */ u8 field_0x1394;
-    /* 0x1395 */ u8 field_0x1395;
-    /* 0x1396 */ u8 field_0x1396;
-    /* 0x1397 */ s8 field_0x1397;
-    /* 0x1398 */ f32 field_0x1398;
-    /* 0x139C */ u8 field_0x139c;
+    /* 0x1394 */ s8 field_0x1394;
+    /* 0x1395 */ s8 mSetBossExplode;
+    /* 0x1396 */ s8 field_0x1396;
+    /* 0x1397 */ s8 mSetDeadColor;
+    /* 0x1398 */ f32 mDeadColor;
+    /* 0x139C */ u8 mInitHIO;
 };
 
 STATIC_ASSERT(sizeof(b_bq_class) == 0x13A0);

include/d/actor/d_a_b_dr.h

@@ -3,9 +3,9 @@
 
 #include "f_op/f_op_actor_mng.h"
 #include "Z2AudioLib/Z2Creature.h"
-#include "d/cc/d_cc_d.h"
-#include "d/msg/d_msg_flow.h"
-#include "d/bg/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_msg_flow.h"
+#include "d/d_bg_s_acch.h"
 
 /**
  * @ingroup actors-enemies

include/d/actor/d_a_b_dre.h

@@ -2,7 +2,7 @@
 #define D_A_B_DRE_H
 
 #include "f_op/f_op_actor_mng.h"
-#include "d/bg/d_bg_s_acch.h"
+#include "d/d_bg_s_acch.h"
 #include "Z2AudioLib/Z2Creature.h"
 
 /**

include/d/actor/d_a_b_ds.h

@@ -4,10 +4,10 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "f_op/f_op_actor.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_uty.h"
-#include "d/msg/d_msg_flow.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
+#include "d/d_msg_flow.h"
 #include "m_Do/m_Do_ext.h"
 
 /**

include/d/actor/d_a_b_gnd.h

@@ -1,12 +1,12 @@
 #ifndef D_A_B_GND_H
 #define D_A_B_GND_H
 
-#include "d/msg/d_msg_flow.h"
+#include "d/d_msg_flow.h"
 #include "f_op/f_op_actor_mng.h"
 #include "Z2AudioLib/Z2Creature.h"
-#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_uty.h"
-#include "d/bg/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
+#include "d/d_bg_s_acch.h"
 
 struct g_himo_s {
     /* 80601D40 */ ~g_himo_s();

include/d/actor/d_a_b_go.h

@@ -4,9 +4,9 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "f_op/f_op_actor.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_uty.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 
 #define GORON_CHILD_MAX 31
 #define RES_IS_MODEL 0x13

include/d/actor/d_a_b_gos.h

@@ -3,9 +3,9 @@
 
 #include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_uty.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 #include "f_op/f_op_actor_mng.h"
 
 

include/d/actor/d_a_b_ob.h

@@ -4,9 +4,9 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "f_op/f_op_actor.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_uty.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 
 enum b_ob_action {
     // Phase 1
@@ -87,7 +87,7 @@ public:
     /* 0x4730 */ f32 mSuiBrkFrame;
     /* 0x4734 */ int mAnmID;
     /* 0x4738 */ int mCoreAnm;
-    /* 0x4738 */ u8 mCoreAnmMode;
+    /* 0x473C */ u8 mCoreAnmMode;
     /* 0x4740 */ f32 field_0x4740;
     /* 0x4744 */ s8 field_0x4744;
     /* 0x4745 */ s8 mDrawShadow;

include/d/actor/d_a_b_oh.h

@@ -3,8 +3,8 @@
 
 #include "SSystem/SComponent/c_phase.h"
 #include "f_op/f_op_actor.h"
-#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_uty.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 
 class daB_OH_HIO_c {
 public:

include/d/actor/d_a_b_tn.h

@@ -2,7 +2,7 @@
 #define D_A_B_TN_H
 
 #include "f_op/f_op_actor_mng.h"
-#include "d/cc/d_cc_d.h"
+#include "d/d_cc_d.h"
 
 /**
  * @ingroup actors-enemies

include/d/actor/d_a_b_zant.h

@@ -2,11 +2,11 @@
 #define D_A_B_ZANT_H
 
 #include "f_op/f_op_actor_mng.h"
-#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_uty.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 #include "Z2AudioLib/Z2Creature.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/msg/d_msg_flow.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_msg_flow.h"
 
 /**
  * @ingroup actors-enemies

include/d/actor/d_a_b_zant_sima.h

@@ -1,7 +1,7 @@
 #ifndef D_A_B_ZANT_SIMA_H
 #define D_A_B_ZANT_SIMA_H
 
-#include "d/bg/d_bg_w.h"
+#include "d/d_bg_w.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**

include/d/actor/d_a_balloon_2D.h

@@ -5,7 +5,7 @@
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_drawlist.h"
-#include "d/s/d_s_play.h"
+#include "d/d_s_play.h"
 
 class J2DScreen;
 class CPaneMgr;
@@ -23,11 +23,7 @@ class J2DTextBox;
  */
 class daBalloon2D_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    class c_list 
-    #ifdef NONMATCHING
-    : public dDlst_base_c 
-    #endif
-    {
+    class c_list : public dDlst_base_c {
     public:
         c_list() { mBalloon = NULL; }
         void set(daBalloon2D_c* i_this) { mBalloon = i_this; }

include/d/actor/d_a_bg.h

@@ -2,7 +2,7 @@
 #define D_A_BG_H
 
 #include "f_op/f_op_actor_mng.h"
-#include "d/bg/d_bg_w_kcol.h"
+#include "d/d_bg_w_kcol.h"
 
 class daBg_btkAnm_c {
 public:

include/d/actor/d_a_bg_obj.h

@@ -1,9 +1,9 @@
 #ifndef D_A_BG_OBJ_H
 #define D_A_BG_OBJ_H
 
-#include "d/bg/d_bg_s_movebg_actor.h"
-#include "d/bg/d_bg_w.h"
-#include "d/cc/d_cc_d.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_bg_w.h"
+#include "d/d_cc_d.h"
 #include "f_op/f_op_actor_mng.h"
 
 class daBgObj_c;

include/d/actor/d_a_boomerang.h

@@ -2,7 +2,7 @@
 #define D_A_BOOMERANG_H
 
 #include "JSystem/J2DGraph/J2DScreen.h"
-#include "d/particle/d_particle_copoly.h"
+#include "d/d_particle_copoly.h"
 #include "f_op/f_op_actor_mng.h"
 
 class daBoomerang_sight_c {

include/d/actor/d_a_canoe.h

@@ -2,8 +2,8 @@
 #define D_A_CANOE_H
 
 #include "f_op/f_op_actor_mng.h"
-#include "d/cc/d_cc_d.h"
-#include "d/bg/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_bg_s_acch.h"
 #include "SSystem/SComponent/c_phase.h"
 
 /**

include/d/actor/d_a_cow.h

@@ -99,6 +99,7 @@ public:
     /* 80662D70 */ void getShapeAngle();
 
     void setNaderu() { field_0x568 |= 0x80; }
+    void setNaderuFinish() { field_0x568 |= 0x100; }
 
 private:
     /* 0x568 */ u16 field_0x568;

include/d/actor/d_a_crod.h

@@ -1,8 +1,8 @@
 #ifndef D_A_CROD_H
 #define D_A_CROD_H
 
-#include "d/a/d_a_player.h"
-#include "d/cc/d_cc_d.h"
+#include "d/actor/d_a_player.h"
+#include "d/d_cc_d.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**
@@ -39,6 +39,7 @@ public:
     fopAc_ac_c* getCameraActor() { return mCameraActorKeep.getActor(); }
 
     void setThrow() { fopAcM_SetParam(this, 2); }
+    void offControll() { mControllActorKeep.clearData(); }
 
     static f32 getFlyInitY() { return 40.0f; }
     static f32 getFlyInitZ() { return 50.0f; }

include/d/actor/d_a_cstaF.h

@@ -2,8 +2,8 @@
 #define D_A_CSTAF_H
 
 #include "Z2AudioLib/Z2Creature.h"
-#include "d/bg/d_bg_s_movebg_actor.h"
-#include "d/particle/d_particle_copoly.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_particle_copoly.h"
 
 /**
  * @ingroup actors-unsorted

include/d/actor/d_a_cstatue.h

@@ -2,7 +2,7 @@
 #define D_A_CSTATUE_H
 
 #include "Z2AudioLib/Z2Creature.h"
-#include "d/particle/d_particle_copoly.h"
+#include "d/d_particle_copoly.h"
 #include "f_op/f_op_actor.h"
 
 /**

include/d/actor/d_a_dmidna.h

@@ -1,7 +1,7 @@
 #ifndef D_A_DMIDNA_H
 #define D_A_DMIDNA_H
 
-#include "d/com/d_com_inf_game.h"
+#include "d/d_com_inf_game.h"
 
 /**
  * @ingroup actors-unsorted

include/d/actor/d_a_do.h

@@ -2,9 +2,9 @@
 #define D_A_DO_H
 
 #include "SSystem/SComponent/c_phase.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/cc/d_cc_d.h"
-#include "d/msg/d_msg_flow.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_msg_flow.h"
 #include "f_op/f_op_actor.h"
 
 enum daDo_Anm {

include/d/actor/d_a_door_boss.h

@@ -3,8 +3,8 @@
 
 #include "SSystem/SComponent/c_phase.h"
 #include "f_op/f_op_actor.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/bg/d_bg_w.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_bg_w.h"
 
 /**
  * @ingroup actors-doors

include/d/actor/d_a_door_bossL1.h

@@ -3,8 +3,8 @@
 
 #include "dolphin/types.h"
 #include "f_op/f_op_actor.h"
-#include "d/bg/d_bg_w.h"
-#include "d/bg/d_bg_s_acch.h"
+#include "d/d_bg_w.h"
+#include "d/d_bg_s_acch.h"
 #include "SSystem/SComponent/c_phase.h"
 
 class JPABaseEmitter;

include/d/actor/d_a_door_bossL5.h

@@ -4,8 +4,8 @@
 #include "dolphin/types.h"
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
-#include "d/bg/d_bg_w.h"
-#include "d/bg/d_bg_s_acch.h"
+#include "d/d_bg_w.h"
+#include "d/d_bg_s_acch.h"
 #include "f_pc/f_pc_manager.h"
 #include "f_op/f_op_actor_mng.h"
 

include/d/actor/d_a_door_dbdoor00.h

@@ -1,8 +1,8 @@
 #ifndef D_A_DOOR_DBDOOR00_H
 #define D_A_DOOR_DBDOOR00_H
 
-#include "d/bg/d_bg_w.h"
-#include "d/com/d_com_inf_game.h"
+#include "d/d_bg_w.h"
+#include "d/d_com_inf_game.h"
 
 /**
  * @ingroup actors-doors

include/d/actor/d_a_door_knob00.h

@@ -3,8 +3,8 @@
 
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
-#include "d/bg/d_bg_w.h"
-#include "d/msg/d_msg_flow.h"
+#include "d/d_bg_w.h"
+#include "d/d_msg_flow.h"
 
 /**
  * @ingroup actors-doors

include/d/actor/d_a_door_mbossL1.h

@@ -4,8 +4,8 @@
 #include "dolphin/types.h"
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
-#include "d/bg/d_bg_w.h"
-#include "d/bg/d_bg_s_acch.h"
+#include "d/d_bg_w.h"
+#include "d/d_bg_s_acch.h"
 
 class dDoor_stop2_c {
 public:

include/d/actor/d_a_door_push.h

@@ -1,9 +1,9 @@
 #ifndef D_A_DOOR_PUSH_H
 #define D_A_DOOR_PUSH_H
 
-#include "d/a/d_a_player.h"
-#include "d/bg/d_bg_s_movebg_actor.h"
-#include "d/com/d_com_inf_game.h"
+#include "d/actor/d_a_player.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_com_inf_game.h"
 
 /**
  * @ingroup actors-doors

include/d/actor/d_a_door_shutter.h

@@ -4,9 +4,9 @@
 #include "dolphin/types.h"
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
-#include "d/bg/d_bg_w.h"
-#include "d/msg/d_msg_flow.h"
-#include "d/bg/d_bg_s_acch.h"
+#include "d/d_bg_w.h"
+#include "d/d_msg_flow.h"
+#include "d/d_bg_s_acch.h"
 
 struct daDoor20_c;
 

include/d/actor/d_a_dshutter.h

@@ -1,8 +1,8 @@
 #ifndef D_A_DSHUTTER_H
 #define D_A_DSHUTTER_H
 
-#include "d/bg/d_bg_s_movebg_actor.h"
-#include "d/com/d_com_inf_game.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_com_inf_game.h"
 
 /**
  * @ingroup actors-unsorted

include/d/actor/d_a_e_arrow.h

@@ -1,7 +1,7 @@
 #ifndef D_A_E_ARROW_H
 #define D_A_E_ARROW_H
 
-#include "d/com/d_com_inf_game.h"
+#include "d/d_com_inf_game.h"
 
 enum e_arrow_action {
     ACTION_ARROW_SHOT,

include/d/actor/d_a_e_ba.h

@@ -3,9 +3,9 @@
 
 #include "Z2AudioLib/Z2Creature.h"
 #include "f_op/f_op_actor_mng.h"
-#include "d/cc/d_cc_d.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/cc/d_cc_uty.h"
+#include "d/d_cc_d.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_uty.h"
 #include "d/d_path.h"
 
 /**

include/d/actor/d_a_e_bee.h

@@ -4,7 +4,7 @@
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
-#include "d/cc/d_cc_d.h"
+#include "d/d_cc_d.h"
 
 struct bee_s {
     enum Action {

include/d/actor/d_a_e_db_leaf.h

@@ -1,7 +1,7 @@
 #ifndef D_A_E_DB_LEAF_H
 #define D_A_E_DB_LEAF_H
 
-#include "d/com/d_com_inf_game.h"
+#include "d/d_com_inf_game.h"
 #include "dolphin/types.h"
 
 /**

include/d/actor/d_a_e_fz.h

@@ -12,9 +12,9 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "f_op/f_op_actor.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_uty.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 #include "m_Do/m_Do_hostIO.h"
 
 /**