Merge pull request #276 from elijah-thomas774/d_a_obj_door

d_a_obj_door

18 files changed, 374 insertions, 8 deletions

diff --git a/include/d/a/d_a_base.h b/include/d/a/d_a_base.h
index 97e33e47..45b2336f 100644
--- a/include/d/a/d_a_base.h
+++ b/include/d/a/d_a_base.h
@@ -125,6 +125,9 @@ public:
 public:
     dAcBase_c();
 
+    void setSubtype(u8 sub) {
+        mSubtype = sub;
+    }
     void setPosition(const mVec3_c &r) {
         mPosition = r;
     }
diff --git a/include/d/a/obj/d_a_obj_base.h b/include/d/a/obj/d_a_obj_base.h
index 3deba1ae..039def40 100644
--- a/include/d/a/obj/d_a_obj_base.h
+++ b/include/d/a/obj/d_a_obj_base.h
@@ -181,6 +181,11 @@ public:
         const char *name, u32 roomId, u32 params1, const mVec3_c *pos, const mAng3_c *rot, const mVec3_c *scale,
         u32 params2, u16 id, s8 viewclipId
     );
+    static dAcObjBase_c *create(
+        dAcObjBase_c *, fProfile::PROFILE_NAME_e actorId, u32 params1, const mVec3_c *pos, const mAng3_c *rot,
+        const mVec3_c *scale, u32 params2, u32 roomId
+    );
+
     static dAcObjBase_c *findObject(fProfile::PROFILE_NAME_e actorId, fLiNdBa_c *refList, dAcObjBase_c *parent);
     static dAcObjBase_c *getNextObject(fLiMgBa_c *ref, dAcObjBase_c *parent);
     bool isPlayer();
diff --git a/include/d/a/obj/d_a_obj_door.h b/include/d/a/obj/d_a_obj_door.h
index 6681801e..4992c954 100644
--- a/include/d/a/obj/d_a_obj_door.h
+++ b/include/d/a/obj/d_a_obj_door.h
@@ -1,16 +1,319 @@
 #ifndef D_A_OBJ_DOOR_H
 #define D_A_OBJ_DOOR_H
 
+#include "common.h"
+#include "d/a/d_a_base.h"
+#include "d/a/obj/d_a_obj_base.h"
 #include "d/a/obj/d_a_obj_door_base.h"
+#include "m/m3d/m_anmmdl.h"
+#include "m/m3d/m_smdl.h"
+#include "m/m_mtx.h"
+#include "m/m_vec.h"
+#include "toBeSorted/actor_event.h"
+#include "toBeSorted/d_emitter.h"
+#include "toBeSorted/d_flow_mgr.h"
+
+struct dTimeBits {
+    dTimeBits() : field_0x00(false), field_0x01(false) {}
+    bool field_0x00;
+    bool field_0x01;
+};
+
+class dAcOLock_c;
 
 class dAcOdoor_c : public dAcObjDoor_c {
 public:
-    dAcOdoor_c() {}
+    enum Subtype_e {
+        DOOR_NORMAL,            ///< DoorA00 - Normal Wooden Door
+        DOOR_METAL,             ///< DoorA01 - Metal Door - Academy(bathrooms)
+        DOOR_DOUBLE,            ///< DoorC00 - Normal Double Doors
+        DOOR_DOUBLE_OUTSIDE,    ///< DoorC01 - Outdoor Double Doors - Academy(to outside)
+        DOOR_TEMPLE_SIDE,       ///< DoorB00 - Sealed Temple Side Doors
+        DOOR_SANDSEA_TIMESHIFT, ///< DoorE   - Sandsea Timeshift Door
+        DOOR_BATREAUX,          ///< DoorA02 - Batreaux's Door
+        DOOR_TEMPLE_MAIN,       ///< DoorF   - Sealed Temple Main Door
+        DOOR_SPARRING_HALL,     ///< DoorH   - Sparring Hall Outer Doors
+    };
+
+    enum LockType_e {
+        LOCK_NONE = 0, ///< Door does not have a lock
+        LOCK_KEY = 1,  ///< Door usually is locked
+    };
+
+    enum LockBehavior_e {
+        LOCK_NEVER = 0,     ///< Door is always unlocked
+        LOCK_NOT_SET = 1,   ///< Door is locked when mSceneflag is unset
+        LOCK_NEVER1 = 2,    ///< Door is always unlocked (Kukiel's House)
+        LOCK_TIMESHIFT = 3, ///< Door is locked when mSceneflag is unset (Timeshift)
+        LOCK_SET = 4,       ///< Door is locked when mSceneflag is set
+        LOCK_DAY = 5,       ///< Door is locked during the day
+        LOCK_NIGHT = 6,     ///< Door is locked during the night
+        LOCK_MAX,
+    };
+
+public:
+    dAcOdoor_c()
+        : mEventRelated(*this, nullptr),
+          mEmmiterL(this),
+          mEmmiterR(this),
+          mFlags(0),
+          mExitTimer(0),
+          mbInSandshipBoss(false),
+          field_0x5BA(false) {}
     virtual ~dAcOdoor_c() {}
 
+    virtual int doDelete() override;
+    virtual int draw() override;
+    virtual bool createHeap() override;
+    virtual int actorCreate() override;
+    virtual int actorPostCreate() override;
+    virtual int actorExecute() override;
+    virtual int actorExecuteInEvent() override;
+    virtual void registerInEvent() override;
+    virtual void unkVirtFunc_0x6C() override;
+    virtual void doInteraction(s32 /* InteractionType */) override;
+    virtual bool canOpen() override;
+
+    /** Gets whether the player can open the door */
     bool isLocked();
 
+    /** fn_572_33E0 - I Think this gets the Door open range*/
+    static f32 fn_572_33E0();
+
+    /** Self Explanatory */
+    void startPullEventWithoutCallback(void *zevData);
+
+    /** Self Explanatory */
+    void startPullEventWithCallback(void *zevData);
+
+    /** Self Explanatory */
+    void startPushEventWithoutCallback(void *zevData);
+
+    /** Self Explanatory */
+    void startPushEventWithCallback(void *zevData);
+
+    /** Self Explanatory */
+    void startPullEvent(void *zevData);
+
+    /** Self Explanatory */
+    void startPushEvent(void *zevData);
+
+    /** Self Explanatory */
+    void startOpenEvent(void *zevData);
+
+    /** Self Explanatory */
+    static void doorPullEventCallback(void *);
+
+    /** Self Explanatory */
+    static void doorPushEventCallback(void *);
+
+    /** Self Explanatory */
+    void startDoorPullLockedEvent(void *zevData);
+
+    /** Self Explanatory */
+    void startDoorPushLockedEvent(void *zevData);
+
+    /** Self Explanatory */
+    void startLockedEvent(void *zevData);
+
+    /** Self Explanatory */
+    static void pullLockedEventCallback(void *);
+
+    /** Self Explanatory */
+    static void pushLockedEventCallback(void *);
+
+    /** Self Explanatory */
+    void startUnlockEvent();
+
+    /** Self Explanatory */
+    static void unlockEventCallback(void *);
+
+    /** Self Explanatory */
+    static void openCallbackCommon(void *);
+
+    /** Returns if the door is physically locked with the dAcOLock_c Actor */
+    s32 getLockParameter();
+
+    /** Gets the behavior of being locked when not locked with the dAcOLock_c Actor */
+    s32 getLockBehavior();
+
+    /** Get Scenflag used for locking status */
+    u8 getSceneflag();
+
+    /** Gets whether the door has callbacks enabled */
+    u8 getDoorCallbackType();
+
+    /** getFrontRoomParam */
+    u8 getFrontRoomParam(); // (mRotation.z >> 4) & 0x3F
+
+    /** getBackRoomParam */
+    u8 getBackRoomParam(); // (mRotation.z >> 10) & 0x3F
+
+    /** Gets the Flag set when failed to open - Called from Try Locked Callback */
+    u16 getFailedToOpenFlag();
+
+    /** Interaction Radius -X */
+    static f32 getInteractionMinX();
+
+    /** Interaction Radius +X */
+    static f32 getInteractionMaxX();
+
+    /** Interaction Radius -Z */
+    static f32 getInteractionMinZ();
+
+    /** Interaction Radius +Z */
+    static f32 getInteractionMaxZ();
+
+    /** Interaction Radius -X - Door has Lock */
+    static f32 getInteractionLockMinX();
+
+    /** Interaction Radius +X - Door has Lock */
+    static f32 getInteractionLockMaxX();
+
+    /** Interaction Radius -Z - Door has Lock */
+    static f32 getInteractionLockMinZ();
+
+    /** Interaction Radius +Z - Door has Lock */
+    static f32 getInteractionLockMaxZ();
+
+    /** Sets the RoomID */
+    void setRoomId(s8 roomId);
+
+    /** Set Flag - Usually Time Door related */
+    void setFlag(u32 flags);
+
+    /** Sets the behavior on Event creation  */
+    void setEventCallbackType(u8);
+
+    /** setFrontRoom */
+    void setFrontRoom(s8); // mFrontRoomId = in
+
+    /** setBackRoom */
+    void setBackRoom(s8); // mBackRoomId = in
+
+    /**  Sets status indicating it can be a double door  */
+    void setDoubleDoor();
+
+    /**  Sets status indicating it cant be a double door */
+    void setNotDoubleDoor();
+
+    /** Sets status indicating its a single door / Main door */
+    void setSingleDoor();
+
+    /** Sets status indicating its not a single door / not Main door */
+    void setNotSingleDoor();
+
+    /** setInSandshipBoss */
+    void setInSandshipBoss(); // mbInSandshipBoss = true
+
+    /** isTimeDoorEventActive */
+    bool isTimeDoorEventActive() const;
+
+    /** setTimeDoorEventActive */
+    void setTimeDoorEventActive();
+
+    /** setTimeDoorEventInactive */
+    void setTimeDoorEventInactive();
+
+    /** Sets status indicating it is effected by Timeshift */
+    void setTimeEffected();
+
+    /**  Sets status indicating it is not effected by Timeshift */
+    void setTimeStatic();
+
+    /** Checks to see if the Front room exists(return) and has flags set(b) */
+    bool checkFrontRoom(bool &b) const;
+
+    /** Checks to see if the Back room exists(return) and has flags set(b) */
+    bool checkBackRoom(bool &b) const;
+
+    /** Checks to see if the Front and Back room exists(return) and has flags set(b) */
+    bool checkRooms(bool &b) const;
+
+    /** Transitions the game to the next room */
+    void triggerExit();
+
+    /** TODO(Zeldex) Whats special about this? */
+    bool isLeavingSealedTempleSideDoorPostSkyKeep() const;
+
+    /**  */
+    void transitionPushRoomFlags() const;
+
+    /**  */
+    void transitionPullRoomFlags() const;
+
+    /** Checks a point to determine which side of the door it is on */
+    bool isPositionInFrontOfDoor(const mVec3_c &point) const;
+
+    /** Checks the players postion to see if it is front of the door. This means it will be pulled open */
+    bool checkPullDoor() const;
+
+    /** Checks to see if the door has a flow entry point */
+    bool hasFlowEntryPoint();
+
+    /** Checks to see if the Door is effected by Timeshift */
+    bool isTimeEffected() const;
+
+    /** Sets the Position of the Doorknob based on the Animation */
+    void setDoorKnobPosition();
+
+    /** Checks to see if the Player is within an interactable range */
+    bool isPlayerInteractable() const;
+
+    /** Checks to see if the Player is within an interactable range when door is locked */
+    bool isPlayerInteractableLocked() const;
+
+    /** Plays the talk event for when the door is locked */
+    void playInteractionLocked();
+
+public:
+    s32 getType() const {
+        return mParams & 0x3F;
+    }
+    s32 getField_0x5B4() const {
+        return mFrontRoomId;
+    }
+    s32 getField_0x5B5() const {
+        return mBackRoomId;
+    }
+
+public: // Functions in this section defined in main dol
+    bool isConnectedToOtherDoor() const;
+    dAcRef_c<dAcOdoor_c> &getConnectedDoorRef(); // return mConnectedDoor;
+
+    /** fn_80194C70 : Rotates the input by this->mRotation.y and adds this->mPosition */
+    void stepTowards(mVec3_c &newPosition) const;
+
 private:
+    /* 0x33C */ m3d::smdl_c mMdl0;
+    /* 0x358 */ m3d::smdl_c mMdl1;
+    /* 0x374 */ m3d::mdlAnmChr mAnmChr;
+    /* 0x3DC */ ActorEventRelated mEventRelated;
+    /* 0x42C */ dFlowMgr_c mFlowMgr;
+    /* 0x4E8 */ dEmitter_c mEmmiterL;
+    /* 0x51C */ dEmitter_c mEmmiterR;
+    /* 0x550 */ dTimeBits mTimeBits;
+    /* 0x554 */ dAcRef_c<dAcOdoor_c> mConnectedDoor; ///< When the door is a double door, this is its pair
+    /* 0x560 */ dAcRef_c<dAcOLock_c> mLock;
+    /* 0x56C */ dAcRef_c<dAcObjBase_c> mObjRef; ///< TODO(Zeldex) This is probably the Sandship stage for boss
+
+    /* 0x578 */ mMtx_c mMtx; ///< Currently unknown. I am assuming this is used to move the door on the Sandship stage
+                             ///< while the boat is rocking
+
+    /* 0x5A8 */ u32 mFlags;            ///< 0x2 - Time Effected
+    /* 0x5AC */ u32 mRumbleIdx;        ///< Rumble used for when opening the main sealed temple door
+    /* 0x5B0 */ u8 mExitTimer;         ///< Timer used to advance the Begin Pull/Push events
+    /* 0x5B1 */ u8 mLockBehavior;      ///< see LockBehavior_e
+    /* 0x5B2 */ u8 mSceneflag;         ///< Used for unlocking/locking the door.
+    /* 0x5B3 */ u8 mEventCallbackType; ///< 0 for events without callbacks, 1 for events with a callback
+    /* 0x5B4 */ s8 mFrontRoomId;       ///< Room id of the front side of the door
+    /* 0x5B5 */ s8 mBackRoomId;        ///< Room id of the back side of the door
+    /* 0x5B6 */ s8 mFramesInEvent;     ///< The count of frames in one particular event
+    /* 0x5B7 */ bool mbDoubleDoor;     ///< Set if the type was matched to be a double door variant
+    /* 0x5B8 */ bool mbSingleDoor;     ///< UNUSHED - Set if the type was matched to be a single door
+    /* 0x5B9 */ bool mbInSandshipBoss; ///< Indicates if in the Tentalus fight
+    /* 0x5BA */ bool field_0x5BA;      ///< ???
+    /* 0x5BB */ bool mbKobunDoor;      ///< Used to indicate its Cawlin and Strich's door
 };
 
 #endif
diff --git a/include/d/a/obj/d_a_obj_door_base.h b/include/d/a/obj/d_a_obj_door_base.h
index 5cfc1110..9a64bf34 100644
--- a/include/d/a/obj/d_a_obj_door_base.h
+++ b/include/d/a/obj/d_a_obj_door_base.h
@@ -1,11 +1,28 @@
 #ifndef D_A_OBJ_DOOR_BASE_H
 #define D_A_OBJ_DOOR_BASE_H
 
+#include "d/a/d_a_base.h"
 #include "d/a/obj/d_a_obj_base.h"
+#include "f/f_list_mg.h"
 
 // Ghidra: ActorDoorBase
 //   size:
 // non-official name
-class dAcObjDoor_c : public dAcObjBase_c {};
+class dAcObjDoor_c : public dAcObjBase_c {
+public:
+    dAcObjDoor_c();
+    ~dAcObjDoor_c();
+
+    virtual bool canOpen() = 0;
+    virtual bool hasVisitedRoom();
+    virtual void vt_0x88();
+    virtual void vt_0x8C();
+
+protected:
+    dAcRef_c<dAcObjDoor_c> mDoorRef;
+
+private:
+    static fLiMgBa_c sDoorList;
+};
 
 #endif
diff --git a/include/d/a/obj/d_a_obj_door_boss.h b/include/d/a/obj/d_a_obj_door_boss.h
index 945238a2..b4ef8602 100644
--- a/include/d/a/obj/d_a_obj_door_boss.h
+++ b/include/d/a/obj/d_a_obj_door_boss.h
@@ -10,6 +10,8 @@ public:
     dAcOdoorBoss_c() : mStateMgr(*this, sStateID::null) {}
     virtual ~dAcOdoorBoss_c() {}
 
+    virtual bool canOpen() override;
+
     STATE_FUNC_DECLARE(dAcOdoorBoss_c, UnlockWait);
     STATE_FUNC_DECLARE(dAcOdoorBoss_c, CorrectKey);
     STATE_FUNC_DECLARE(dAcOdoorBoss_c, KeyInsertInitialInterval);
diff --git a/include/d/a/obj/d_a_obj_fence.h b/include/d/a/obj/d_a_obj_fence.h
index 720c41fa..8b7afd5d 100644
--- a/include/d/a/obj/d_a_obj_fence.h
+++ b/include/d/a/obj/d_a_obj_fence.h
@@ -10,6 +10,15 @@ public:
     dAcOFence_c();
     virtual ~dAcOFence_c();
 
+    bool fn_550_11B0() const;
+    void fn_550_1250();
+    void fn_550_12B0();
+    void fn_550_12C0();
+
+    void changeToRequestConfineEvent() {
+        mStateMgr.changeState(StateID_RequestConfineEvent);
+    }
+
     STATE_FUNC_DECLARE(dAcOFence_c, WaitOpen);
     STATE_FUNC_DECLARE(dAcOFence_c, Open);
     STATE_FUNC_DECLARE(dAcOFence_c, OpenPocoAPoco);
@@ -21,7 +30,8 @@ public:
     STATE_FUNC_DECLARE(dAcOFence_c, RequestConfineEvent);
 
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcOFence_c);
+    /* 0x330 */ u8 _0x330[0x368 - 0x330];
+    /* 0x368 */ STATE_MGR_DECLARE(dAcOFence_c);
 };
 
 #endif
diff --git a/include/d/a/obj/d_a_obj_lock.h b/include/d/a/obj/d_a_obj_lock.h
index 4da6ba02..071bf5c5 100644
--- a/include/d/a/obj/d_a_obj_lock.h
+++ b/include/d/a/obj/d_a_obj_lock.h
@@ -12,8 +12,18 @@ public:
 
     STATE_FUNC_DECLARE(dAcOLock_c, Wait);
 
+    bool checkField_0x2091() const {
+        return field_0x2091;
+    }
+    void setField_0x2090() {
+        field_0x2090 = true;
+    }
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcOLock_c);
+    /* 0x???? */ STATE_MGR_DECLARE(dAcOLock_c);
+    /* 0x???? */ u8 _0x36C[0x2090 - 0x36C];
+    /* 0x2090 */ bool field_0x2090;
+    /* 0x2091 */ bool field_0x2091;
 };
 
 #endif
diff --git a/include/d/a/obj/d_a_obj_shutter.h b/include/d/a/obj/d_a_obj_shutter.h
index e2fa570a..d33554c8 100644
--- a/include/d/a/obj/d_a_obj_shutter.h
+++ b/include/d/a/obj/d_a_obj_shutter.h
@@ -10,6 +10,8 @@ public:
     dAcOShutter_c() : mStateMgr(*this, sStateID::null) {}
     virtual ~dAcOShutter_c() {}
 
+    virtual bool canOpen() override;
+
     STATE_FUNC_DECLARE(dAcOShutter_c, Wait);
     STATE_FUNC_DECLARE(dAcOShutter_c, Open);
     STATE_FUNC_DECLARE(dAcOShutter_c, Close);
diff --git a/include/d/a/obj/d_a_obj_shutter_change_scene.h b/include/d/a/obj/d_a_obj_shutter_change_scene.h
index 8479e760..71a8b17f 100644
--- a/include/d/a/obj/d_a_obj_shutter_change_scene.h
+++ b/include/d/a/obj/d_a_obj_shutter_change_scene.h
@@ -10,6 +10,8 @@ public:
     dAcOShutterChangeScene_c() : mStateMgr(*this, sStateID::null) {}
     virtual ~dAcOShutterChangeScene_c() {}
 
+    virtual bool canOpen() override;
+
     STATE_FUNC_DECLARE(dAcOShutterChangeScene_c, WaitOpenShutter);
     STATE_FUNC_DECLARE(dAcOShutterChangeScene_c, WaitOpenShutterForEvent);
     STATE_FUNC_DECLARE(dAcOShutterChangeScene_c, OpenShutter);
diff --git a/include/d/a/obj/d_a_obj_tr_shutter_cs.h b/include/d/a/obj/d_a_obj_tr_shutter_cs.h
index f8b074fe..7f2d150a 100644
--- a/include/d/a/obj/d_a_obj_tr_shutter_cs.h
+++ b/include/d/a/obj/d_a_obj_tr_shutter_cs.h
@@ -10,6 +10,8 @@ public:
     dAcOTrlyShtrChgScn_c() : mStateMgr(*this, sStateID::null) {}
     virtual ~dAcOTrlyShtrChgScn_c() {}
 
+    virtual bool canOpen() override;
+
     STATE_FUNC_DECLARE(dAcOTrlyShtrChgScn_c, Wait);
     STATE_FUNC_DECLARE(dAcOTrlyShtrChgScn_c, OpenEvent);
 
diff --git a/include/d/a/obj/d_a_obj_trolley_shutter.h b/include/d/a/obj/d_a_obj_trolley_shutter.h
index 86ea3dad..f7ed3c3c 100644
--- a/include/d/a/obj/d_a_obj_trolley_shutter.h
+++ b/include/d/a/obj/d_a_obj_trolley_shutter.h
@@ -10,6 +10,8 @@ public:
     dAcOTrolleyShutter_c() : mStateMgr(*this, sStateID::null) {}
     virtual ~dAcOTrolleyShutter_c() {}
 
+    virtual bool canOpen() override;
+
     STATE_FUNC_DECLARE(dAcOTrolleyShutter_c, Wait);
     STATE_FUNC_DECLARE(dAcOTrolleyShutter_c, OpenEvent);
 
diff --git a/include/d/col/bg/d_bg_s_gnd_chk.h b/include/d/col/bg/d_bg_s_gnd_chk.h
index f304c2a3..6b3e2696 100644
--- a/include/d/col/bg/d_bg_s_gnd_chk.h
+++ b/include/d/col/bg/d_bg_s_gnd_chk.h
@@ -27,6 +27,9 @@ public:
     static dBgS_ObjGndChk &GetInstance() {
         return sInstance;
     }
+    static dBgS_ObjGndChk *GetPInstance() {
+        return &sInstance;
+    }
     static f32 GetGroundHeight() {
         return sGroundHeight;
     }
diff --git a/include/d/d_player_act.h b/include/d/d_player_act.h
index cf1c9236..f3eab389 100644
--- a/include/d/d_player_act.h
+++ b/include/d/d_player_act.h
@@ -630,7 +630,7 @@ public:
     bool isAttackingSpinHorizontal() const;
     bool isAttackingSpinVertical() const;
     void setBonkRelatedAnimFlag(bool b);
-    void setPosYRot(const mVec3_c &pos, mAng rot, bool force, UNKWORD, UNKWORD);
+    void setPosYRot(const mVec3_c &pos, mAng rot, bool force = false, UNKWORD = 0, UNKWORD = 0);
     void setTransform(const mMtx_c &mtx, bool force, UNKWORD, UNKWORD);
     bool someTargetedActorCheck() const;
     static mAng fn_8005BA90();
@@ -646,7 +646,6 @@ public:
     static const char *getSwordName(s32);
     static s32 getCurrentlyEquippedShieldType();
 
-
     static const mColor &getEarringsColor();
 
     static mVec3_c sPos1;
diff --git a/include/d/d_room.h b/include/d/d_room.h
index 287ae7c1..225b0bf1 100644
--- a/include/d/d_room.h
+++ b/include/d/d_room.h
@@ -111,6 +111,9 @@ public:
     bool checkFlag(u32 flag) {
         return mFlags & flag;
     }
+    void setFlag(u8 flag) {
+        mFlags |= flag;
+    }
 
     void drawOnMapIfVisible(mMtx_c *mtx, int param);
     void getBounds(mVec3_c *min, mVec3_c *max) const;
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index b0de4c98..3c3d2a93 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -116,8 +116,10 @@ public:
     int draw() override;
     void deleteReady() override;
 
+    void fn_801B3C60(int roomId);
     void drawMap(mMtx_c *mtx, int);
     dRoom_c *getRoom(s32 idx);
+    void updateRoomFlags(int, int);
     void setRoom(int roomid, dRoom_c *room);
     void handleRoomChange(int roomid);
 
diff --git a/include/d/d_stage_mgr.h b/include/d/d_stage_mgr.h
index 68d47f3f..f7a00405 100644
--- a/include/d/d_stage_mgr.h
+++ b/include/d/d_stage_mgr.h
@@ -106,7 +106,6 @@ public:
     static dStageMgr_c *GetInstance() {
         return sInstance;
     }
-
     EGG::CpuTexture *getField_0x8898() {
         return field_0x8898;
     }
@@ -225,7 +224,7 @@ private:
     // ...
     u8 ___[438];
     /* 0x8898 */ EGG::CpuTexture *field_0x8898;
-    
+
     u8 _0x889C[4];
 
     /* 0x88A0 */ u32 field_0x88A0;
diff --git a/include/toBeSorted/actor_event.h b/include/toBeSorted/actor_event.h
index 03fd30d6..cbd68422 100644
--- a/include/toBeSorted/actor_event.h
+++ b/include/toBeSorted/actor_event.h
@@ -18,6 +18,7 @@ public:
     bool isAdvance();
     int getSomeEventRelatedNumber();
 
+    int getSingleShortData(int *result, u32 code, u32);
     int getSingleIntData(int *result, u32 code, u32);
     int getSingleFloatData(f32 *result, u32 code, u32);
     int getSingleVecData(mVec3_c *result, u32 code, u32);
diff --git a/include/toBeSorted/event_manager.h b/include/toBeSorted/event_manager.h
index 1b89074f..3f3946ab 100644
--- a/include/toBeSorted/event_manager.h
+++ b/include/toBeSorted/event_manager.h
@@ -11,6 +11,7 @@ class dAcObjBase_c;
 
 class EventManager {
 public:
+    static bool setEvent(dAcBase_c *actor, Event *, dAcBase_c *);
     static bool isInEvent(dAcBase_c *actor, const char *eventName);
     static bool finishEvent(dAcBase_c *actor, const char *eventName);
     static void changeOwnEvent(dAcBase_c *actor1, dAcBase_c *actor2, Event *event, UNKWORD);