Set up REL templates (#60)

* Fix .data sections misidentified as .rodata by dtk

dtk can't always reliably identify REL sections in its initial analysis.
This is a manual fix - the list of RELs to fix was found by looking
at supposed .rodata splits that contained an fBase vtable, since vtables
should be in .data. This fix is required for scripted creation of REL actors
based on rel .data

* More consistent d/t header paths

* Data fixups for parsing

* Tmp actor file setup

* Fixes

* Set up almost all REL templates

* formatting

* Fix formatting

include/d/a/obj/d_a_obj_B300_sand.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_B300_SAND_H
+#define D_A_OBJ_B300_SAND_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOB300Sand_c : public dAcObjBase_c {
+public:
+    dAcOB300Sand_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOB300Sand_c() {}
+
+    STATE_FUNC_DECLARE(dAcOB300Sand_c, Wait);
+    STATE_FUNC_DECLARE(dAcOB300Sand_c, Clear);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOB300Sand_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_D300.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_D300_H
+#define D_A_OBJ_D300_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOD300_c : public dAcObjBase_c {
+public:
+    dAcOD300_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOD300_c() {}
+
+    STATE_FUNC_DECLARE(dAcOD300_c, Wait);
+    STATE_FUNC_DECLARE(dAcOD300_c, Appear);
+    STATE_FUNC_DECLARE(dAcOD300_c, End);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOD300_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_D3_dummy.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_D3_DUMMY_H
+#define D_A_OBJ_D3_DUMMY_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOD3Dummy_c : public dAcObjBase_c {
+public:
+    dAcOD3Dummy_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOD3Dummy_c() {}
+
+    STATE_FUNC_DECLARE(dAcOD3Dummy_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOD3Dummy_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_F302_light.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_F302_LIGHT_H
+#define D_A_OBJ_F302_LIGHT_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOF302Light_c : public dAcObjBase_c {
+public:
+    dAcOF302Light_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOF302Light_c() {}
+
+    STATE_FUNC_DECLARE(dAcOF302Light_c, Wait);
+    STATE_FUNC_DECLARE(dAcOF302Light_c, SwitchOn);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOF302Light_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_F400_gate_leaf.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_F400_GATE_LEAF_H
+#define D_A_OBJ_F400_GATE_LEAF_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOF400GateLeaf_c : public dAcObjBase_c {
+public:
+    dAcOF400GateLeaf_c() {}
+    virtual ~dAcOF400GateLeaf_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_F400_gate_seal.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_F400_GATE_SEAL_H
+#define D_A_OBJ_F400_GATE_SEAL_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOF400GateSeal_c : public dAcObjBase_c {
+public:
+    dAcOF400GateSeal_c() {}
+    virtual ~dAcOF400GateSeal_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_amber.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_AMBER_H
+#define D_A_OBJ_AMBER_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOAmber_c : public dAcObjBase_c {
+public:
+    dAcOAmber_c() {}
+    virtual ~dAcOAmber_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_ancient_jewels.h

@@ -0,0 +1,25 @@
+#ifndef D_A_OBJ_ANCIENT_JEWELS_H
+#define D_A_OBJ_ANCIENT_JEWELS_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOAncientJewels_c : public dAcObjBase_c {
+public:
+    dAcOAncientJewels_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOAncientJewels_c() {}
+
+    STATE_FUNC_DECLARE(dAcOAncientJewels_c, Wait);
+    STATE_FUNC_DECLARE(dAcOAncientJewels_c, WaitDrop);
+    STATE_FUNC_DECLARE(dAcOAncientJewels_c, Drop);
+    STATE_FUNC_DECLARE(dAcOAncientJewels_c, Buried);
+    STATE_FUNC_DECLARE(dAcOAncientJewels_c, WhipCarry);
+    STATE_FUNC_DECLARE(dAcOAncientJewels_c, GetItem);
+    STATE_FUNC_DECLARE(dAcOAncientJewels_c, UnderLog);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOAncientJewels_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_arrow_switch.h

@@ -0,0 +1,22 @@
+#ifndef D_A_OBJ_ARROW_SWITCH_H
+#define D_A_OBJ_ARROW_SWITCH_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOarrowSwitch_c : public dAcObjBase_c {
+public:
+    dAcOarrowSwitch_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOarrowSwitch_c() {}
+
+    STATE_FUNC_DECLARE(dAcOarrowSwitch_c, Off);
+    STATE_FUNC_DECLARE(dAcOarrowSwitch_c, On);
+    STATE_FUNC_DECLARE(dAcOarrowSwitch_c, FixedOn);
+    STATE_FUNC_DECLARE(dAcOarrowSwitch_c, OpenEye);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOarrowSwitch_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_asura_pillar.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_ASURA_PILLAR_H
+#define D_A_OBJ_ASURA_PILLAR_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcAsuraPillar_c : public dAcObjBase_c {
+public:
+    dAcAsuraPillar_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcAsuraPillar_c() {}
+
+    STATE_FUNC_DECLARE(dAcAsuraPillar_c, Damage);
+    STATE_FUNC_DECLARE(dAcAsuraPillar_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcAsuraPillar_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_asura_sword.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_ASURA_SWORD_H
+#define D_A_OBJ_ASURA_SWORD_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcAsuraSword_c : public dAcObjBase_c {
+public:
+    dAcAsuraSword_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcAsuraSword_c() {}
+
+    STATE_FUNC_DECLARE(dAcAsuraSword_c, Carried);
+    STATE_FUNC_DECLARE(dAcAsuraSword_c, Stop);
+    STATE_FUNC_DECLARE(dAcAsuraSword_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcAsuraSword_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_ballista.h

@@ -0,0 +1,26 @@
+#ifndef D_A_OBJ_BALLISTA_H
+#define D_A_OBJ_BALLISTA_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBallista_c : public dAcObjBase_c {
+public:
+    dAcOBallista_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBallista_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBallista_c, Wait);
+    STATE_FUNC_DECLARE(dAcOBallista_c, Grab);
+    STATE_FUNC_DECLARE(dAcOBallista_c, Shot);
+    STATE_FUNC_DECLARE(dAcOBallista_c, ShotEnd);
+    STATE_FUNC_DECLARE(dAcOBallista_c, Cancel);
+    STATE_FUNC_DECLARE(dAcOBallista_c, DemoShot);
+    STATE_FUNC_DECLARE(dAcOBallista_c, DemoShot2);
+    STATE_FUNC_DECLARE(dAcOBallista_c, DemoShot3);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBallista_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_ballista_f3.h

@@ -0,0 +1,24 @@
+#ifndef D_A_OBJ_BALLISTA_F3_H
+#define D_A_OBJ_BALLISTA_F3_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBallistaF3_c : public dAcObjBase_c {
+public:
+    dAcOBallistaF3_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBallistaF3_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBallistaF3_c, Wait);
+    STATE_FUNC_DECLARE(dAcOBallistaF3_c, Shot);
+    STATE_FUNC_DECLARE(dAcOBallistaF3_c, Shot2);
+    STATE_FUNC_DECLARE(dAcOBallistaF3_c, ShotEnd);
+    STATE_FUNC_DECLARE(dAcOBallistaF3_c, FallStone);
+    STATE_FUNC_DECLARE(dAcOBallistaF3_c, EndDemo);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBallistaF3_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_ballista_handle.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_BALLISTA_HANDLE_H
+#define D_A_OBJ_BALLISTA_HANDLE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBallistaHandle_c : public dAcObjBase_c {
+public:
+    dAcOBallistaHandle_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBallistaHandle_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBallistaHandle_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBallistaHandle_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bamboo.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_BAMBOO_H
+#define D_A_OBJ_BAMBOO_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcObamboo_c : public dAcObjBase_c {
+public:
+    dAcObamboo_c();
+    virtual ~dAcObamboo_c();
+
+    STATE_FUNC_DECLARE(dAcObamboo_c, Wait);
+    STATE_FUNC_DECLARE(dAcObamboo_c, Fall);
+    STATE_FUNC_DECLARE(dAcObamboo_c, CutMark);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcObamboo_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_barrel.h

@@ -0,0 +1,28 @@
+#ifndef D_A_OBJ_BARREL_H
+#define D_A_OBJ_BARREL_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBarrel_c : public dAcObjBase_c {
+public:
+    dAcOBarrel_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBarrel_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBarrel_c, Wait);
+    STATE_FUNC_DECLARE(dAcOBarrel_c, Grab);
+    STATE_FUNC_DECLARE(dAcOBarrel_c, GrabUp);
+    STATE_FUNC_DECLARE(dAcOBarrel_c, GrabPut);
+    STATE_FUNC_DECLARE(dAcOBarrel_c, Slope);
+    STATE_FUNC_DECLARE(dAcOBarrel_c, Water);
+    STATE_FUNC_DECLARE(dAcOBarrel_c, Water2);
+    STATE_FUNC_DECLARE(dAcOBarrel_c, Explode);
+    STATE_FUNC_DECLARE(dAcOBarrel_c, KrakenBorn);
+    STATE_FUNC_DECLARE(dAcOBarrel_c, Rebirth);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBarrel_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bb_bridge.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_BB_BRIDGE_H
+#define D_A_OBJ_BB_BRIDGE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcObbBridge_c : public dAcObjBase_c {
+public:
+    dAcObbBridge_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcObbBridge_c() {}
+
+    STATE_FUNC_DECLARE(dAcObbBridge_c, Wait);
+    STATE_FUNC_DECLARE(dAcObbBridge_c, BrokenDemo);
+    STATE_FUNC_DECLARE(dAcObbBridge_c, Broken);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcObbBridge_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bb_broken_parts.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_BB_BROKEN_PARTS_H
+#define D_A_OBJ_BB_BROKEN_PARTS_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcObbBrokenParts_c : public dAcObjBase_c {
+public:
+    dAcObbBrokenParts_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcObbBrokenParts_c() {}
+
+    STATE_FUNC_DECLARE(dAcObbBrokenParts_c, Wait);
+    STATE_FUNC_DECLARE(dAcObbBrokenParts_c, Break);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcObbBrokenParts_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bb_objects.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_BB_OBJECTS_H
+#define D_A_OBJ_BB_OBJECTS_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcObbObjects_c : public dAcObjBase_c {
+public:
+    dAcObbObjects_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcObbObjects_c() {}
+
+    STATE_FUNC_DECLARE(dAcObbObjects_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcObbObjects_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bblargebomb.h

@@ -0,0 +1,24 @@
+#ifndef D_A_OBJ_BBLARGEBOMB_H
+#define D_A_OBJ_BBLARGEBOMB_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBblargebomb_c : public dAcObjBase_c {
+public:
+    dAcOBblargebomb_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBblargebomb_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBblargebomb_c, Wait);
+    STATE_FUNC_DECLARE(dAcOBblargebomb_c, Explode);
+    STATE_FUNC_DECLARE(dAcOBblargebomb_c, Carry);
+    STATE_FUNC_DECLARE(dAcOBblargebomb_c, WindCarry);
+    STATE_FUNC_DECLARE(dAcOBblargebomb_c, Birth);
+    STATE_FUNC_DECLARE(dAcOBblargebomb_c, Controled);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBblargebomb_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bbstone.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_BBSTONE_H
+#define D_A_OBJ_BBSTONE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBBStone : public dAcObjBase_c {
+public:
+    dAcOBBStone() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBBStone() {}
+
+    STATE_FUNC_DECLARE(dAcOBBStone, Wait);
+    STATE_FUNC_DECLARE(dAcOBBStone, FirstWait);
+    STATE_FUNC_DECLARE(dAcOBBStone, FirstDemo);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBBStone);
+};
+
+#endif

include/d/a/obj/d_a_obj_bell.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_BELL_H
+#define D_A_OBJ_BELL_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcObell_c : public dAcObjBase_c {
+public:
+    dAcObell_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcObell_c() {}
+
+    STATE_FUNC_DECLARE(dAcObell_c, Wait);
+    STATE_FUNC_DECLARE(dAcObell_c, WaitRupee);
+    STATE_FUNC_DECLARE(dAcObell_c, After);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcObell_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_belt_cvr.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_BELT_CVR_H
+#define D_A_OBJ_BELT_CVR_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcObeltCvr_c : public dAcObjBase_c {
+public:
+    dAcObeltCvr_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcObeltCvr_c() {}
+
+    STATE_FUNC_DECLARE(dAcObeltCvr_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcObeltCvr_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_belt_obstacle.h

@@ -0,0 +1,23 @@
+#ifndef D_A_OBJ_BELT_OBSTACLE_H
+#define D_A_OBJ_BELT_OBSTACLE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcObeltObstacle_c : public dAcObjBase_c {
+public:
+    dAcObeltObstacle_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcObeltObstacle_c() {}
+
+    STATE_FUNC_DECLARE(dAcObeltObstacle_c, Wait);
+    STATE_FUNC_DECLARE(dAcObeltObstacle_c, Init);
+    STATE_FUNC_DECLARE(dAcObeltObstacle_c, BeltMove);
+    STATE_FUNC_DECLARE(dAcObeltObstacle_c, TeniN);
+    STATE_FUNC_DECLARE(dAcObeltObstacle_c, TeniNonly);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcObeltObstacle_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bg.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_BG_H
+#define D_A_OBJ_BG_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcObg_c : public dAcObjBase_c {
+public:
+    dAcObg_c() {}
+    virtual ~dAcObg_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_bigbomb_flower.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_BIGBOMB_FLOWER_H
+#define D_A_OBJ_BIGBOMB_FLOWER_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBBombFlower_c : public dAcObjBase_c {
+public:
+    dAcOBBombFlower_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBBombFlower_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBBombFlower_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBBombFlower_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bird_sp.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_BIRD_SP_H
+#define D_A_OBJ_BIRD_SP_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcObjBirdSp_c : public dAcObjBase_c {
+public:
+    dAcObjBirdSp_c() {}
+    virtual ~dAcObjBirdSp_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_bird_statue.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_BIRD_STATUE_H
+#define D_A_OBJ_BIRD_STATUE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOBirdStatue_c : public dAcObjBase_c {
+public:
+    dAcOBirdStatue_c() {}
+    virtual ~dAcOBirdStatue_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_blade.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_BLADE_H
+#define D_A_OBJ_BLADE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOblade_c : public dAcObjBase_c {
+public:
+    dAcOblade_c() {}
+    virtual ~dAcOblade_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_blast_rock.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_BLAST_ROCK_H
+#define D_A_OBJ_BLAST_ROCK_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBlastRock_c : public dAcObjBase_c {
+public:
+    dAcOBlastRock_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBlastRock_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBlastRock_c, Wait);
+    STATE_FUNC_DECLARE(dAcOBlastRock_c, Piece);
+    STATE_FUNC_DECLARE(dAcOBlastRock_c, Broken);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBlastRock_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_block_rope.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_BLOCK_ROPE_H
+#define D_A_OBJ_BLOCK_ROPE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOblockRope_c : public dAcObjBase_c {
+public:
+    dAcOblockRope_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOblockRope_c() {}
+
+    STATE_FUNC_DECLARE(dAcOblockRope_c, Wait);
+    STATE_FUNC_DECLARE(dAcOblockRope_c, Delete);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOblockRope_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_block_underground.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_BLOCK_UNDERGROUND_H
+#define D_A_OBJ_BLOCK_UNDERGROUND_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOBlockUnderground : public dAcObjBase_c {
+public:
+    dAcOBlockUnderground();
+    virtual ~dAcOBlockUnderground();
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_blow_coal.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_BLOW_COAL_H
+#define D_A_OBJ_BLOW_COAL_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOblowCoal_c : public dAcObjBase_c {
+public:
+    dAcOblowCoal_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOblowCoal_c() {}
+
+    STATE_FUNC_DECLARE(dAcOblowCoal_c, Wait);
+    STATE_FUNC_DECLARE(dAcOblowCoal_c, Dead);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOblowCoal_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_boat.h

@@ -0,0 +1,24 @@
+#ifndef D_A_OBJ_BOAT_H
+#define D_A_OBJ_BOAT_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBoat_c : public dAcObjBase_c {
+public:
+    dAcOBoat_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBoat_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBoat_c, Wait);
+    STATE_FUNC_DECLARE(dAcOBoat_c, Fall);
+    STATE_FUNC_DECLARE(dAcOBoat_c, FallEnd);
+    STATE_FUNC_DECLARE(dAcOBoat_c, FallStop);
+    STATE_FUNC_DECLARE(dAcOBoat_c, Up);
+    STATE_FUNC_DECLARE(dAcOBoat_c, UpEnd);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBoat_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_boxcage_F300.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_BOXCAGE_F300_H
+#define D_A_OBJ_BOXCAGE_F300_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBoxCageF300_c : public dAcObjBase_c {
+public:
+    dAcOBoxCageF300_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBoxCageF300_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBoxCageF300_c, Wait);
+    STATE_FUNC_DECLARE(dAcOBoxCageF300_c, Move);
+    STATE_FUNC_DECLARE(dAcOBoxCageF300_c, End);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBoxCageF300_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bridge_bone.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_BRIDGE_BONE_H
+#define D_A_OBJ_BRIDGE_BONE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBridgeBone_c : public dAcObjBase_c {
+public:
+    dAcOBridgeBone_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBridgeBone_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBridgeBone_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBridgeBone_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bridge_building.h

@@ -0,0 +1,23 @@
+#ifndef D_A_OBJ_BRIDGE_BUILDING_H
+#define D_A_OBJ_BRIDGE_BUILDING_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcObridgeBuilding_c : public dAcObjBase_c {
+public:
+    dAcObridgeBuilding_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcObridgeBuilding_c() {}
+
+    STATE_FUNC_DECLARE(dAcObridgeBuilding_c, Wait);
+    STATE_FUNC_DECLARE(dAcObridgeBuilding_c, PreMove);
+    STATE_FUNC_DECLARE(dAcObridgeBuilding_c, Move);
+    STATE_FUNC_DECLARE(dAcObridgeBuilding_c, Shake);
+    STATE_FUNC_DECLARE(dAcObridgeBuilding_c, Across);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcObridgeBuilding_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bridge_fall.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_BRIDGE_FALL_H
+#define D_A_OBJ_BRIDGE_FALL_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBridgeFall_c : public dAcObjBase_c {
+public:
+    dAcOBridgeFall_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBridgeFall_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBridgeFall_c, Wait);
+    STATE_FUNC_DECLARE(dAcOBridgeFall_c, Fall);
+    STATE_FUNC_DECLARE(dAcOBridgeFall_c, Shake);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBridgeFall_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bridge_step.h

@@ -0,0 +1,22 @@
+#ifndef D_A_OBJ_BRIDGE_STEP_H
+#define D_A_OBJ_BRIDGE_STEP_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBridgeStep_c : public dAcObjBase_c {
+public:
+    dAcOBridgeStep_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBridgeStep_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBridgeStep_c, Wait);
+    STATE_FUNC_DECLARE(dAcOBridgeStep_c, SwitchPushed);
+    STATE_FUNC_DECLARE(dAcOBridgeStep_c, BridgeUp);
+    STATE_FUNC_DECLARE(dAcOBridgeStep_c, BridgeUpAll);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBridgeStep_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bridge_stretch.h

@@ -0,0 +1,22 @@
+#ifndef D_A_OBJ_BRIDGE_STRETCH_H
+#define D_A_OBJ_BRIDGE_STRETCH_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcObridgeStretch_c : public dAcObjBase_c {
+public:
+    dAcObridgeStretch_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcObridgeStretch_c() {}
+
+    STATE_FUNC_DECLARE(dAcObridgeStretch_c, Wait);
+    STATE_FUNC_DECLARE(dAcObridgeStretch_c, Move);
+    STATE_FUNC_DECLARE(dAcObridgeStretch_c, Shake);
+    STATE_FUNC_DECLARE(dAcObridgeStretch_c, Stretch);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcObridgeStretch_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bridge_time.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_BRIDGE_TIME_H
+#define D_A_OBJ_BRIDGE_TIME_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOBridgeTime_c : public dAcObjBase_c {
+public:
+    dAcOBridgeTime_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOBridgeTime_c() {}
+
+    STATE_FUNC_DECLARE(dAcOBridgeTime_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOBridgeTime_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_bstone.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_BSTONE_H
+#define D_A_OBJ_BSTONE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcObstonec : public dAcObjBase_c {
+public:
+    dAcObstonec() {}
+    virtual ~dAcObstonec() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_bubble.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_BUBBLE_H
+#define D_A_OBJ_BUBBLE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcObubble_c : public dAcObjBase_c {
+public:
+    dAcObubble_c() {}
+    virtual ~dAcObubble_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_building.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_BUILDING_H
+#define D_A_OBJ_BUILDING_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOBuilding_c : public dAcObjBase_c {
+public:
+    dAcOBuilding_c() {}
+    virtual ~dAcOBuilding_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_bulb_switch.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_BULB_SWITCH_H
+#define D_A_OBJ_BULB_SWITCH_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcObulbSwitch_c : public dAcObjBase_c {
+public:
+    dAcObulbSwitch_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcObulbSwitch_c() {}
+
+    STATE_FUNC_DECLARE(dAcObulbSwitch_c, Close);
+    STATE_FUNC_DECLARE(dAcObulbSwitch_c, Open);
+    STATE_FUNC_DECLARE(dAcObulbSwitch_c, Move);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcObulbSwitch_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_cannon.h

@@ -0,0 +1,24 @@
+#ifndef D_A_OBJ_CANNON_H
+#define D_A_OBJ_CANNON_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOcannon_c : public dAcObjBase_c {
+public:
+    dAcOcannon_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOcannon_c() {}
+
+    STATE_FUNC_DECLARE(dAcOcannon_c, Wait);
+    STATE_FUNC_DECLARE(dAcOcannon_c, PreCharge);
+    STATE_FUNC_DECLARE(dAcOcannon_c, Move);
+    STATE_FUNC_DECLARE(dAcOcannon_c, AfterCharge);
+    STATE_FUNC_DECLARE(dAcOcannon_c, Shot);
+    STATE_FUNC_DECLARE(dAcOcannon_c, After);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOcannon_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_cannon_cover.h

@@ -0,0 +1,23 @@
+#ifndef D_A_OBJ_CANNON_COVER_H
+#define D_A_OBJ_CANNON_COVER_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOcannonCover_c : public dAcObjBase_c {
+public:
+    dAcOcannonCover_c();
+    virtual ~dAcOcannonCover_c();
+
+    STATE_FUNC_DECLARE(dAcOcannonCover_c, Wait);
+    STATE_FUNC_DECLARE(dAcOcannonCover_c, Open);
+    STATE_FUNC_DECLARE(dAcOcannonCover_c, Shake);
+    STATE_FUNC_DECLARE(dAcOcannonCover_c, Close);
+    STATE_FUNC_DECLARE(dAcOcannonCover_c, Play);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOcannonCover_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_carry_stone.h

@@ -0,0 +1,27 @@
+#ifndef D_A_OBJ_CARRY_STONE_H
+#define D_A_OBJ_CARRY_STONE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOcarryStone_c : public dAcObjBase_c {
+public:
+    dAcOcarryStone_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOcarryStone_c() {}
+
+    STATE_FUNC_DECLARE(dAcOcarryStone_c, Wait);
+    STATE_FUNC_DECLARE(dAcOcarryStone_c, GrabCarry);
+    STATE_FUNC_DECLARE(dAcOcarryStone_c, Water);
+    STATE_FUNC_DECLARE(dAcOcarryStone_c, Slope);
+    STATE_FUNC_DECLARE(dAcOcarryStone_c, SlopeWait);
+    STATE_FUNC_DECLARE(dAcOcarryStone_c, MoveVacuum);
+    STATE_FUNC_DECLARE(dAcOcarryStone_c, ShakeWind);
+    STATE_FUNC_DECLARE(dAcOcarryStone_c, MoveMoleGlove);
+    STATE_FUNC_DECLARE(dAcOcarryStone_c, EggEnterSwitch);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOcarryStone_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_chair.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_CHAIR_H
+#define D_A_OBJ_CHAIR_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOChair_c : public dAcObjBase_c {
+public:
+    dAcOChair_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOChair_c() {}
+
+    STATE_FUNC_DECLARE(dAcOChair_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOChair_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_chandelier.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_CHANDELIER_H
+#define D_A_OBJ_CHANDELIER_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOChandelier_c : public dAcObjBase_c {
+public:
+    dAcOChandelier_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOChandelier_c() {}
+
+    STATE_FUNC_DECLARE(dAcOChandelier_c, Wait);
+    STATE_FUNC_DECLARE(dAcOChandelier_c, Fall);
+    STATE_FUNC_DECLARE(dAcOChandelier_c, End);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOChandelier_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_chest.h

@@ -0,0 +1,22 @@
+#ifndef D_A_OBJ_CHEST_H
+#define D_A_OBJ_CHEST_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOChest_c : public dAcObjBase_c {
+public:
+    dAcOChest_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOChest_c() {}
+
+    STATE_FUNC_DECLARE(dAcOChest_c, Wait);
+    STATE_FUNC_DECLARE(dAcOChest_c, OpenEvent);
+    STATE_FUNC_DECLARE(dAcOChest_c, FailEvent);
+    STATE_FUNC_DECLARE(dAcOChest_c, OrderOpenEventAfter);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOChest_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_city.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_CITY_H
+#define D_A_OBJ_CITY_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOcity_c : public dAcObjBase_c {
+public:
+    dAcOcity_c() {}
+    virtual ~dAcOcity_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_city_water.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_CITY_WATER_H
+#define D_A_OBJ_CITY_WATER_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOcityWater_c : public dAcObjBase_c {
+public:
+    dAcOcityWater_c() {}
+    virtual ~dAcOcityWater_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_claw_shot_tg.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_CLAW_SHOT_TG_H
+#define D_A_OBJ_CLAW_SHOT_TG_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOclawShotTg_c : public dAcObjBase_c {
+public:
+    dAcOclawShotTg_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOclawShotTg_c() {}
+
+    STATE_FUNC_DECLARE(dAcOclawShotTg_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOclawShotTg_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_clearness_wall.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_CLEARNESS_WALL_H
+#define D_A_OBJ_CLEARNESS_WALL_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOclearnessWall_c : public dAcObjBase_c {
+public:
+    dAcOclearnessWall_c() {}
+    virtual ~dAcOclearnessWall_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_clef.h

@@ -0,0 +1,25 @@
+#ifndef D_A_OBJ_CLEF_H
+#define D_A_OBJ_CLEF_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOClef_c : public dAcObjBase_c {
+public:
+    dAcOClef_c();
+    virtual ~dAcOClef_c();
+
+    STATE_FUNC_DECLARE(dAcOClef_c, WaitPhantom);
+    STATE_FUNC_DECLARE(dAcOClef_c, Wait);
+    STATE_FUNC_DECLARE(dAcOClef_c, WaitPathMove);
+    STATE_FUNC_DECLARE(dAcOClef_c, MoveTowardPath);
+    STATE_FUNC_DECLARE(dAcOClef_c, PathMove);
+    STATE_FUNC_DECLARE(dAcOClef_c, Gravitate);
+    STATE_FUNC_DECLARE(dAcOClef_c, Die);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOClef_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_cloud_dive.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_CLOUD_DIVE_H
+#define D_A_OBJ_CLOUD_DIVE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOcloudDive_c : public dAcObjBase_c {
+public:
+    dAcOcloudDive_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOcloudDive_c() {}
+
+    STATE_FUNC_DECLARE(dAcOcloudDive_c, Wait);
+    STATE_FUNC_DECLARE(dAcOcloudDive_c, Dead);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOcloudDive_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_col.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_COL_H
+#define D_A_OBJ_COL_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOCol_c : public dAcObjBase_c {
+public:
+    dAcOCol_c() {}
+    virtual ~dAcOCol_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_control_panel.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_CONTROL_PANEL_H
+#define D_A_OBJ_CONTROL_PANEL_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOCtrlPnl_c : public dAcObjBase_c {
+public:
+    dAcOCtrlPnl_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOCtrlPnl_c() {}
+
+    STATE_FUNC_DECLARE(dAcOCtrlPnl_c, Wait);
+    STATE_FUNC_DECLARE(dAcOCtrlPnl_c, Control);
+    STATE_FUNC_DECLARE(dAcOCtrlPnl_c, EndEvent);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOCtrlPnl_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_cumul_cloud.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_CUMUL_CLOUD_H
+#define D_A_OBJ_CUMUL_CLOUD_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOcumulCloud_c : public dAcObjBase_c {
+public:
+    dAcOcumulCloud_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOcumulCloud_c() {}
+
+    STATE_FUNC_DECLARE(dAcOcumulCloud_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOcumulCloud_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_daynight.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_DAYNIGHT_H
+#define D_A_OBJ_DAYNIGHT_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcODayNight_c : public dAcObjBase_c {
+public:
+    dAcODayNight_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcODayNight_c() {}
+
+    STATE_FUNC_DECLARE(dAcODayNight_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcODayNight_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_decoA.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_DECOA_H
+#define D_A_OBJ_DECOA_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcODecoA_c : public dAcObjBase_c {
+public:
+    dAcODecoA_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcODecoA_c() {}
+
+    STATE_FUNC_DECLARE(dAcODecoA_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcODecoA_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_decoB.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_DECOB_H
+#define D_A_OBJ_DECOB_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcODecoB_c : public dAcObjBase_c {
+public:
+    dAcODecoB_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcODecoB_c() {}
+
+    STATE_FUNC_DECLARE(dAcODecoB_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcODecoB_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_desert.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_DESERT_H
+#define D_A_OBJ_DESERT_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcODesert : public dAcObjBase_c {
+public:
+    dAcODesert();
+    virtual ~dAcODesert();
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_desert_ago.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_DESERT_AGO_H
+#define D_A_OBJ_DESERT_AGO_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcODesertAgo_c : public dAcObjBase_c {
+public:
+    dAcODesertAgo_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcODesertAgo_c() {}
+
+    STATE_FUNC_DECLARE(dAcODesertAgo_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcODesertAgo_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_desert_debris.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_DESERT_DEBRIS_H
+#define D_A_OBJ_DESERT_DEBRIS_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOdesertDebris_c : public dAcObjBase_c {
+public:
+    dAcOdesertDebris_c() {}
+    virtual ~dAcOdesertDebris_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_desert_meter.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_DESERT_METER_H
+#define D_A_OBJ_DESERT_METER_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcODesertMeter_c : public dAcObjBase_c {
+public:
+    dAcODesertMeter_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcODesertMeter_c() {}
+
+    STATE_FUNC_DECLARE(dAcODesertMeter_c, Wait);
+    STATE_FUNC_DECLARE(dAcODesertMeter_c, OnSwitch);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcODesertMeter_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_display_only_nbs.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_DISPLAY_ONLY_NBS_H
+#define D_A_OBJ_DISPLAY_ONLY_NBS_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOdisplayOnlyNbs_c : public dAcObjBase_c {
+public:
+    dAcOdisplayOnlyNbs_c() {}
+    virtual ~dAcOdisplayOnlyNbs_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_distant_ship.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_DISTANT_SHIP_H
+#define D_A_OBJ_DISTANT_SHIP_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOdistantShip_c : public dAcObjBase_c {
+public:
+    dAcOdistantShip_c() {}
+    virtual ~dAcOdistantShip_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_diviner_crystal.h

@@ -0,0 +1,17 @@
+#ifndef D_A_OBJ_DIVINER_CRYSTAL_H
+#define D_A_OBJ_DIVINER_CRYSTAL_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcODivinerCrystal_c : public dAcObjBase_c {
+public:
+    dAcODivinerCrystal_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcODivinerCrystal_c() {}
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcODivinerCrystal_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_door.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_DOOR_H
+#define D_A_OBJ_DOOR_H
+
+#include <d/a/obj/d_a_obj_door_base.h>
+
+class dAcOdoor_c : public dAcObjDoor_c {
+public:
+    dAcOdoor_c() {}
+    virtual ~dAcOdoor_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_door_base.h

@@ -0,0 +1,11 @@
+#ifndef D_A_OBJ_DOOR_BASE_H
+#define D_A_OBJ_DOOR_BASE_H
+
+#include "d/a/obj/d_a_obj_base.h"
+
+// Ghidra: ActorDoorBase
+//   size:
+// non-official name
+class dAcObjDoor_c : public dAcObjBase_c {};
+
+#endif

include/d/a/obj/d_a_obj_door_boss.h

@@ -0,0 +1,33 @@
+#ifndef D_A_OBJ_DOOR_BOSS_H
+#define D_A_OBJ_DOOR_BOSS_H
+
+#include <d/a/obj/d_a_obj_door_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOdoorBoss_c : public dAcObjDoor_c {
+public:
+    dAcOdoorBoss_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOdoorBoss_c() {}
+
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, UnlockWait);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, CorrectKey);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, KeyInsertInitialInterval);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, PutKeyIntoLock);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, KeyInsert);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, KeyInsertAfterglow);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, Wait);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, Shine);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, Unlock);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, OpenWait);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, Open);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, WaitClose);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, Close);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, Idle);
+    STATE_FUNC_DECLARE(dAcOdoorBoss_c, BeforeTimeShift);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOdoorBoss_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_door_bossD101.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_DOOR_BOSSD101_H
+#define D_A_OBJ_DOOR_BOSSD101_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcODoorBossD101_c : public dAcObjBase_c {
+public:
+    dAcODoorBossD101_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcODoorBossD101_c() {}
+
+    STATE_FUNC_DECLARE(dAcODoorBossD101_c, Wait);
+    STATE_FUNC_DECLARE(dAcODoorBossD101_c, End);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcODoorBossD101_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_door_dungeon.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_DOOR_DUNGEON_H
+#define D_A_OBJ_DOOR_DUNGEON_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcObjDoorDungeon_c : public dAcObjBase_c {
+public:
+    dAcObjDoorDungeon_c() {}
+    virtual ~dAcObjDoorDungeon_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_door_dungeonD200.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_DOOR_DUNGEOND200_H
+#define D_A_OBJ_DOOR_DUNGEOND200_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcObjDoorDungeonD200_c : public dAcObjBase_c {
+public:
+    dAcObjDoorDungeonD200_c() {}
+    virtual ~dAcObjDoorDungeonD200_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_dormitory_gate.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_DORMITORY_GATE_H
+#define D_A_OBJ_DORMITORY_GATE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcODormitoryGate_c : public dAcObjBase_c {
+public:
+    dAcODormitoryGate_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcODormitoryGate_c() {}
+
+    STATE_FUNC_DECLARE(dAcODormitoryGate_c, Wait);
+    STATE_FUNC_DECLARE(dAcODormitoryGate_c, End);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcODormitoryGate_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_down_lava.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_DOWN_LAVA_H
+#define D_A_OBJ_DOWN_LAVA_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOdownLava_c : public dAcObjBase_c {
+public:
+    dAcOdownLava_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOdownLava_c() {}
+
+    STATE_FUNC_DECLARE(dAcOdownLava_c, Wait);
+    STATE_FUNC_DECLARE(dAcOdownLava_c, Move);
+    STATE_FUNC_DECLARE(dAcOdownLava_c, After);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOdownLava_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_drum.h

@@ -0,0 +1,25 @@
+#ifndef D_A_OBJ_DRUM_H
+#define D_A_OBJ_DRUM_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOdrum_c : public dAcObjBase_c {
+public:
+    dAcOdrum_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOdrum_c() {}
+
+    STATE_FUNC_DECLARE(dAcOdrum_c, Wait);
+    STATE_FUNC_DECLARE(dAcOdrum_c, Move);
+    STATE_FUNC_DECLARE(dAcOdrum_c, MoveEnd);
+    STATE_FUNC_DECLARE(dAcOdrum_c, Fall);
+    STATE_FUNC_DECLARE(dAcOdrum_c, Init);
+    STATE_FUNC_DECLARE(dAcOdrum_c, BeltMove);
+    STATE_FUNC_DECLARE(dAcOdrum_c, TeniN);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOdrum_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_dungeon_ship.h

@@ -0,0 +1,23 @@
+#ifndef D_A_OBJ_DUNGEON_SHIP_H
+#define D_A_OBJ_DUNGEON_SHIP_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcODungeonShip_c : public dAcObjBase_c {
+public:
+    dAcODungeonShip_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcODungeonShip_c() {}
+
+    STATE_FUNC_DECLARE(dAcODungeonShip_c, Wait);
+    STATE_FUNC_DECLARE(dAcODungeonShip_c, Transparency);
+    STATE_FUNC_DECLARE(dAcODungeonShip_c, AppearEvent);
+    STATE_FUNC_DECLARE(dAcODungeonShip_c, Appear);
+    STATE_FUNC_DECLARE(dAcODungeonShip_c, End);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcODungeonShip_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_electric_light.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_ELECTRIC_LIGHT_H
+#define D_A_OBJ_ELECTRIC_LIGHT_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOelectricLight_c : public dAcObjBase_c {
+public:
+    dAcOelectricLight_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOelectricLight_c() {}
+
+    STATE_FUNC_DECLARE(dAcOelectricLight_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOelectricLight_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_evil_field.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_EVIL_FIELD_H
+#define D_A_OBJ_EVIL_FIELD_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOevilField_c : public dAcObjBase_c {
+public:
+    dAcOevilField_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOevilField_c() {}
+
+    STATE_FUNC_DECLARE(dAcOevilField_c, Wait);
+    STATE_FUNC_DECLARE(dAcOevilField_c, UpDown);
+    STATE_FUNC_DECLARE(dAcOevilField_c, Stop);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOevilField_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_farmland.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_FARMLAND_H
+#define D_A_OBJ_FARMLAND_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOFarmLand_c : public dAcObjBase_c {
+public:
+    dAcOFarmLand_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOFarmLand_c() {}
+
+    STATE_FUNC_DECLARE(dAcOFarmLand_c, Wait);
+    STATE_FUNC_DECLARE(dAcOFarmLand_c, DummyEvent);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOFarmLand_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_fence.h

@@ -0,0 +1,27 @@
+#ifndef D_A_OBJ_FENCE_H
+#define D_A_OBJ_FENCE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOFence_c : public dAcObjBase_c {
+public:
+    dAcOFence_c();
+    virtual ~dAcOFence_c();
+
+    STATE_FUNC_DECLARE(dAcOFence_c, WaitOpen);
+    STATE_FUNC_DECLARE(dAcOFence_c, Open);
+    STATE_FUNC_DECLARE(dAcOFence_c, OpenPocoAPoco);
+    STATE_FUNC_DECLARE(dAcOFence_c, SuccessPocoAPoco);
+    STATE_FUNC_DECLARE(dAcOFence_c, StopOpenPocoAPoco);
+    STATE_FUNC_DECLARE(dAcOFence_c, StopOpenAfterglowPocoAPoco);
+    STATE_FUNC_DECLARE(dAcOFence_c, WaitClose);
+    STATE_FUNC_DECLARE(dAcOFence_c, Close);
+    STATE_FUNC_DECLARE(dAcOFence_c, RequestConfineEvent);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOFence_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_fence_boko.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_FENCE_BOKO_H
+#define D_A_OBJ_FENCE_BOKO_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOfenceBoko_c : public dAcObjBase_c {
+public:
+    dAcOfenceBoko_c() {}
+    virtual ~dAcOfenceBoko_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_fence_boko2.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_FENCE_BOKO2_H
+#define D_A_OBJ_FENCE_BOKO2_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOfenceBoko2_c : public dAcObjBase_c {
+public:
+    dAcOfenceBoko2_c() {}
+    virtual ~dAcOfenceBoko2_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_fence_iron.h

@@ -0,0 +1,26 @@
+#ifndef D_A_OBJ_FENCE_IRON_H
+#define D_A_OBJ_FENCE_IRON_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOfenceIron_c : public dAcObjBase_c {
+public:
+    dAcOfenceIron_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOfenceIron_c() {}
+
+    STATE_FUNC_DECLARE(dAcOfenceIron_c, Close);
+    STATE_FUNC_DECLARE(dAcOfenceIron_c, PreMoveUp);
+    STATE_FUNC_DECLARE(dAcOfenceIron_c, MoveUp);
+    STATE_FUNC_DECLARE(dAcOfenceIron_c, AfterMoveUp);
+    STATE_FUNC_DECLARE(dAcOfenceIron_c, Open);
+    STATE_FUNC_DECLARE(dAcOfenceIron_c, PreMoveDown);
+    STATE_FUNC_DECLARE(dAcOfenceIron_c, MoveDown);
+    STATE_FUNC_DECLARE(dAcOfenceIron_c, AfterMoveDown);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOfenceIron_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_fence_konsai.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_FENCE_KONSAI_H
+#define D_A_OBJ_FENCE_KONSAI_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOfenceKonsai_c : public dAcObjBase_c {
+public:
+    dAcOfenceKonsai_c() {}
+    virtual ~dAcOfenceKonsai_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_fire.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_FIRE_H
+#define D_A_OBJ_FIRE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOfire_c : public dAcObjBase_c {
+public:
+    dAcOfire_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOfire_c() {}
+
+    STATE_FUNC_DECLARE(dAcOfire_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOfire_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_fire_obstacle.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_FIRE_OBSTACLE_H
+#define D_A_OBJ_FIRE_OBSTACLE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOfireObstacle_c : public dAcObjBase_c {
+public:
+    dAcOfireObstacle_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOfireObstacle_c() {}
+
+    STATE_FUNC_DECLARE(dAcOfireObstacle_c, Wait);
+    STATE_FUNC_DECLARE(dAcOfireObstacle_c, Vanish);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOfireObstacle_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_fire_pillar.h

@@ -0,0 +1,22 @@
+#ifndef D_A_OBJ_FIRE_PILLAR_H
+#define D_A_OBJ_FIRE_PILLAR_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOfirePillar_c : public dAcObjBase_c {
+public:
+    dAcOfirePillar_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOfirePillar_c() {}
+
+    STATE_FUNC_DECLARE(dAcOfirePillar_c, Wait);
+    STATE_FUNC_DECLARE(dAcOfirePillar_c, WaterWait);
+    STATE_FUNC_DECLARE(dAcOfirePillar_c, Vacuum);
+    STATE_FUNC_DECLARE(dAcOfirePillar_c, Small);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOfirePillar_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_firewall.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_FIREWALL_H
+#define D_A_OBJ_FIREWALL_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOFireWall_c : public dAcObjBase_c {
+public:
+    dAcOFireWall_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOFireWall_c() {}
+
+    STATE_FUNC_DECLARE(dAcOFireWall_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOFireWall_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_flag.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_FLAG_H
+#define D_A_OBJ_FLAG_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOFlag_c : public dAcObjBase_c {
+public:
+    dAcOFlag_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOFlag_c() {}
+
+    STATE_FUNC_DECLARE(dAcOFlag_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOFlag_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_flower_ancient.h

@@ -0,0 +1,22 @@
+#ifndef D_A_OBJ_FLOWER_ANCIENT_H
+#define D_A_OBJ_FLOWER_ANCIENT_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOFlowerAncient_c : public dAcObjBase_c {
+public:
+    dAcOFlowerAncient_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOFlowerAncient_c() {}
+
+    STATE_FUNC_DECLARE(dAcOFlowerAncient_c, Wait);
+    STATE_FUNC_DECLARE(dAcOFlowerAncient_c, TimeSlip);
+    STATE_FUNC_DECLARE(dAcOFlowerAncient_c, Break);
+    STATE_FUNC_DECLARE(dAcOFlowerAncient_c, WhipCarry);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOFlowerAncient_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_flying_clawshot_target.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_FLYING_CLAWSHOT_TARGET_H
+#define D_A_OBJ_FLYING_CLAWSHOT_TARGET_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOFlyingClawshotTarget_c : public dAcObjBase_c {
+public:
+    dAcOFlyingClawshotTarget_c() {}
+    virtual ~dAcOFlyingClawshotTarget_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_fortune_ring.h

@@ -0,0 +1,20 @@
+#ifndef D_A_OBJ_FORTUNE_RING_H
+#define D_A_OBJ_FORTUNE_RING_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOfortuneRing_c : public dAcObjBase_c {
+public:
+    dAcOfortuneRing_c();
+    virtual ~dAcOfortuneRing_c();
+
+    STATE_FUNC_DECLARE(dAcOfortuneRing_c, Wait);
+    STATE_FUNC_DECLARE(dAcOfortuneRing_c, Play);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOfortuneRing_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_fruit.h

@@ -0,0 +1,25 @@
+#ifndef D_A_OBJ_FRUIT_H
+#define D_A_OBJ_FRUIT_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOFruit_c : public dAcObjBase_c {
+public:
+    dAcOFruit_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOFruit_c() {}
+
+    STATE_FUNC_DECLARE(dAcOFruit_c, NormalWait);
+    STATE_FUNC_DECLARE(dAcOFruit_c, StickWait);
+    STATE_FUNC_DECLARE(dAcOFruit_c, GrabCarry);
+    STATE_FUNC_DECLARE(dAcOFruit_c, SwordCarry);
+    STATE_FUNC_DECLARE(dAcOFruit_c, BoomerangCarry);
+    STATE_FUNC_DECLARE(dAcOFruit_c, WhipCarry);
+    STATE_FUNC_DECLARE(dAcOFruit_c, Dead);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOFruit_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_fruitB.h

@@ -0,0 +1,21 @@
+#ifndef D_A_OBJ_FRUITB_H
+#define D_A_OBJ_FRUITB_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOFruitB_c : public dAcObjBase_c {
+public:
+    dAcOFruitB_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOFruitB_c() {}
+
+    STATE_FUNC_DECLARE(dAcOFruitB_c, Stick);
+    STATE_FUNC_DECLARE(dAcOFruitB_c, Wait);
+    STATE_FUNC_DECLARE(dAcOFruitB_c, DummyEvent);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOFruitB_c);
+};
+
+#endif

include/d/a/obj/d_a_obj_fruit_guts_leaf.h

@@ -0,0 +1,14 @@
+#ifndef D_A_OBJ_FRUIT_GUTS_LEAF_H
+#define D_A_OBJ_FRUIT_GUTS_LEAF_H
+
+#include <d/a/obj/d_a_obj_base.h>
+
+class dAcOFruitGutsLeaf_c : public dAcObjBase_c {
+public:
+    dAcOFruitGutsLeaf_c() {}
+    virtual ~dAcOFruitGutsLeaf_c() {}
+
+private:
+};
+
+#endif

include/d/a/obj/d_a_obj_fruit_tree.h

@@ -0,0 +1,19 @@
+#ifndef D_A_OBJ_FRUIT_TREE_H
+#define D_A_OBJ_FRUIT_TREE_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOFruitTree_c : public dAcObjBase_c {
+public:
+    dAcOFruitTree_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOFruitTree_c() {}
+
+    STATE_FUNC_DECLARE(dAcOFruitTree_c, Wait);
+
+private:
+    /* 0x??? */ STATE_MGR_DECLARE(dAcOFruitTree_c);
+};
+
+#endif