updateInEvent

include/d/a/obj/d_a_obj_door.h

@@ -36,7 +36,7 @@ public:
     };
 
 public:
-    dAcOdoor_c() : mEventRelated(*this, nullptr), mEmmiter0(this), mEmmiter1(this) {}
+    dAcOdoor_c() : mEventRelated(*this, nullptr), mEmmiterL(this), mEmmiterR(this) {}
     virtual ~dAcOdoor_c() {}
 
     virtual int doDelete() override;
@@ -160,7 +160,7 @@ public:
     void fn_572_4050(u32 flags); // field_0x5A8 = flags
 
     /** fn_572_4060 */
-    void fn_572_4060(u8); // field_0x5B3 = in
+    void fn_572_4060(s8); // field_0x5B3 = in
 
     /** fn_572_4070 */
     void fn_572_4070(s8); // field_0x5B4 = in
@@ -250,27 +250,45 @@ public:
     void playInteractionLocked() const;
 
 public:
-    // defined in main dol
+    s32 getType() const {
+        return getFromParams(0, 0x3F);
+    }
+    s32 getField_0x5B4() const {
+        return field_0x5B4;
+    }
+    s32 getField_0x5B5() const {
+        return field_0x5B5;
+    }
+
+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 mEmmiter0;
-    /* 0x51C */ dEmitter_c mEmmiter1;
+    /* 0x4E8 */ dEmitter_c mEmmiterL;
+    /* 0x51C */ dEmitter_c mEmmiterR;
     /* 0x550 */ dTimeBits mTimeBits;
     /* 0x554 */ dAcRef_c<dAcOdoor_c> mConnectedDoor;
     /* 0x560 */ dAcRef_c<dAcOLock_c> mLock;
     /* 0x56C */ dAcRef_c<dAcObjBase_c> mObjRef;
     /* 0x578 */ mMtx_c mMtx;
-    /* 0x5A8 */ u8 _0x584[0x5B1 - 0x5A8];
+    /* 0x5A8 */ u8 _0x5A8[0x5AC - 0x5A8];
+    /* 0x5AC */ u32 mRumbleIdx; ///<
+    /* 0x5B0 */ u8 field_0x5B0; ///< some timer to trigger exit
     /* 0x5B1 */ u8 field_0x5B1; ///<
     /* 0x5B2 */ u8 mSceneflag;  ///< Used for unlocking the door
-    /* 0x5B3 */ u8 _0x5B3[0x5B7 - 0x5B3];
+    /* 0x5B3 */ u8 field_0x5B3; ///<
+    /* 0x5B4 */ s8 field_0x5B4;
+    /* 0x5B5 */ s8 field_0x5B5;
+    /* 0x5B6 */ s8 field_0x5B6;
     /* 0x5B7 */ bool field_0x5B7;
     /* 0x5B8 */ u8 _0x5B8[0x5BB - 0x5B8];
     /* 0x5BB */ bool field_0x5BB;

include/d/a/obj/d_a_obj_fence.h

@@ -10,6 +10,13 @@ public:
     dAcOFence_c();
     virtual ~dAcOFence_c();
 
+    bool fn_550_11B0() const;
+    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 +28,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

include/d/a/obj/d_a_obj_lock.h

@@ -12,8 +12,17 @@ public:
 
     STATE_FUNC_DECLARE(dAcOLock_c, Wait);
 
+    bool checkField_0x2090() const {
+        return field_0x2090;
+    }
+    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;
 };
 
 #endif

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

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;

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;

include/d/d_stage.h

@@ -116,6 +116,7 @@ public:
     int draw() override;
     void deleteReady() override;
 
+    void fn_801B3C60(int roomId);
     void drawMap(mMtx_c *mtx, int);
     dRoom_c *getRoom(s32 idx);
     void setRoom(int roomid, dRoom_c *room);

include/f/f_base.h

@@ -89,7 +89,7 @@ public:
         mGroupType = m_tmpCtData.group_type;
     }
 
-    u32 getFromParams(u8 shift, u32 mask) {
+    u32 getFromParams(u8 shift, u32 mask) const {
         return (mParams >> shift) & mask;
     }
 

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