4 files changed, 38 insertions, 30 deletions

diff --git a/include/d/actor/d_a_door10.h b/include/d/actor/d_a_door10.h
index f34e32a3..e974f1eb 100644
--- a/include/d/actor/d_a_door10.h
+++ b/include/d/actor/d_a_door10.h
@@ -7,41 +7,42 @@
 
 class daDoor10_c : public dDoor_info_c {
 public:
-    void checkFlag(unsigned short) {}
+    bool checkFlag(unsigned short flag) { return m356 & flag; }
     inline BOOL execute();
-    void offFlag(unsigned short) {}
-    void onFlag(unsigned short) {}
-    void setAction(unsigned char) {}
+    void offFlag(unsigned short flag) { m356 &= ~flag; }
+    void onFlag(unsigned short flag) { m356 |= flag; }
+    void setAction(u8 action) { m354 = action; }
 
-    void chkMakeKey();
+    s32 chkMakeKey();
     void setKey();
-    void chkMakeStop();
-    void chkStopF();
-    void chkStopB();
+    BOOL chkMakeStop();
+    s32 chkStopF();
+    s32 chkStopB();
     void setStop();
-    void chkStopOpen();
+    BOOL chkStopOpen();
     void setStopDemo();
-    void chkStopClose();
-    void getBdlName();
-    void getDzbName();
-    void getSize2X();
-    void CreateHeap();
+    BOOL chkStopClose();
+    const char* getBdlName();
+    const char* getDzbName();
+    f32 getSize2X();
+    BOOL CreateHeap();
     void setEventPrm();
     void openInit();
-    void openProc();
+    BOOL openProc();
     void openEnd();
     void closeInit();
-    void closeProc();
+    BOOL closeProc();
     void closeEnd();
     void calcMtx();
-    void CreateInit();
+    BOOL CreateInit();
     cPhs_State create();
     void demoProc();
     BOOL draw();
 
+    static const char M_arcname[];
+
 public:
     /* 0x2D0 */ dDoor_smoke_c m2D0;
-    /* 0x306 */ u8 m306[0x308 - 0x306];
     /* 0x308 */ dDoor_key2_c mKeyLock;
     /* 0x32C */ dDoor_stop_c mStopBars;
     /* 0x338 */ dDoor_hkyo_c mHkyo;
@@ -50,8 +51,9 @@ public:
     /* 0x354 */ u8 m354;
     /* 0x355 */ u8 m355[0x356 - 0x355];
     /* 0x356 */ u16 m356;
-    /* 0x358 */ u8 m358[0x364 - 0x358];
+    /* 0x358 */ f32 m358;
+    /* 0x35C */ request_of_phase_process_class mPhase;
     /* 0x364 */ int m364;
-};
+}; // size = 0x368
 
 #endif /* D_A_DOOR10_H */
diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h
index 69ee9177..822a7c99 100644
--- a/include/d/d_bg_w.h
+++ b/include/d/d_bg_w.h
@@ -102,7 +102,7 @@ public:
     void RwgCaptPoly(int, dBgS_CaptPoly&) {}
     void SetGrpRoomInf(int) {}
     void SetOldShapeAngleY(s16) {}
-    void SetRoomId(u16) {}
+    void SetRoomId(u16 roomNo) { mRoomNo = roomNo; }
     void SphChk(dBgS_SphChk*, void*) {}
     void SplGrpChk(dBgS_SplGrpChk*) {}
     void WallCorrect(dBgS_Acch*) {}
diff --git a/include/d/d_door.h b/include/d/d_door.h
index a6bcceda..6d32aade 100644
--- a/include/d/d_door.h
+++ b/include/d/d_door.h
@@ -25,8 +25,8 @@ public:
     s32 frontCheckOld();
     s32 frontCheck();
     s32 drawCheck_local();
-    u8 drawCheck(int);
-    u8 checkExecute();
+    s32 drawCheck(int);
+    s32 checkExecute();
     void startDemoProc();
     void makeEventId(int);
     void initProc(int);
@@ -48,10 +48,10 @@ public:
     /* 0x294 */ cXyz mAngleVec;
     /* 0x2A0 */ u8 mFrontCheck;
     /* 0x2A1 */ u8 m2A1;
-    /* 0x2A2 */ u16 mEventIdx[12];
+    /* 0x2A2 */ s16 mEventIdx[12];
     /* 0x2BA */ u8 mToolId[12];
-    /* 0x2C6 */ u8 field_0x2c6;
-    /* 0x2C7 */ u8 field_0x2c7;
+    /* 0x2C6 */ u8 m2C6;
+    /* 0x2C7 */ u8 m2C7;
     /* 0x2C8 */ int mStaffId;
     /* 0x2CC */ s8 mRoomNo;
     /* 0x2CD */ u8 m2CD[0x2D0 - 0x2CD];
@@ -98,6 +98,9 @@ public:
 
 class dDoor_stop_c {
 public:
+    dDoor_stop_c() {}
+    ~dDoor_stop_c() {}
+
     void calcMtx(dDoor_info_c*);
     void closeInit(dDoor_info_c*);
     s32 closeProc(dDoor_info_c*);
@@ -128,9 +131,12 @@ public:
 
 class dDoor_hkyo_c {
 public:
-    void chkUse() {}
-    void offUse() {}
-    void onUse(u8) {}
+    dDoor_hkyo_c() {}
+    ~dDoor_hkyo_c() {}
+
+    bool chkUse() { return m11 != 0; }
+    void offUse() { m11 = 0; }
+    void onUse(u8 arg0) { m11 = arg0; }
 
     cPhs_State resLoad();
     void resDelete();
diff --git a/include/d/d_event_manager.h b/include/d/d_event_manager.h
index 679f3bfd..6c1fb054 100644
--- a/include/d/d_event_manager.h
+++ b/include/d/d_event_manager.h
@@ -66,7 +66,7 @@ public:
     dEvDtFlag_c& getFlags() { return mFlag; }
 
     int setStartDemo(int eventInfoIdx) { return mException.setStartDemo(eventInfoIdx); }
-    void cancelStartDemo() { /* TODO */ }
+    void cancelStartDemo() { mException.init(); }
     void setCameraPlay(int v) { mCameraPlay = v; }
     int cameraPlay() { return mCameraPlay; }