more nonmatching

3 files changed, 33 insertions, 7 deletions

diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h
index 52d9896d30..3559a31f4d 100644
--- a/include/d/event/d_event.h
+++ b/include/d/event/d_event.h
@@ -66,7 +66,7 @@ public:
     void sceneChange(int);
     u32 getPId(void*);
     void* convPId(unsigned int);
-    void getStbDemoData(char*);
+    void* getStbDemoData(char*);
     static dStage_MapEvent_dt_c* searchMapEventData(u8, s32);
     static dStage_MapEvent_dt_c* searchMapEventData(u8);
     s16 runningEventID(s16);
@@ -86,6 +86,7 @@ public:
     u8 getMode() const { return mMode; }
     u16 checkHind(u16 flag) { return flag & mHindFlag; }
     u8 checkCompulsory() { return mCompulsory; }
+    void setCullRate(f32 f) { mCullRate = f; }
 
     bool i_isOrderOK() { return field_0xe5 == 0 || field_0xe5 == 2; }
     void* getPt1() { return convPId(mPt1); }
diff --git a/include/d/event/d_event_data.h b/include/d/event/d_event_data.h
index feed849256..d78576e14b 100644
--- a/include/d/event/d_event_data.h
+++ b/include/d/event/d_event_data.h
@@ -50,11 +50,13 @@ public:
 
 class dEvDtCut_c {
 public:
-    void startCheck();
+    int startCheck();
 
     int getDataTop() { return mDataTop; }
     int getFlagId() { return mFlagId; }
     char* getName() { return mName; }
+    int getNext() { return mNext; }
+    int getStartFlag(int idx) { return mFlags[idx]; }
 
 private:
     /* 0x00 */ char mName[32];
@@ -90,6 +92,29 @@ public:
         int* mMsgSubstanceP;
     };
 
+    struct MessageData {
+        s16 unk;
+    };
+
+    struct SoundData {
+        s16 unk;
+        s16 timer;
+    };
+
+    struct TimerKeeperData {
+        s32 timer;
+    };
+
+    struct DirectorData {
+        s16 unk;
+        s16 unk2;
+    };
+
+    struct EffectData {
+        u8 pad[8];
+        s32 unk;
+    };
+
     void specialProc_WaitStart(int);
     void specialProc_WaitProc(int);
     void specialProc();
@@ -124,11 +149,11 @@ public:
     /* 0x3C */ s32 field_0x3c;
     /* 0x40 */ bool field_0x40;
     /* 0x41 */ bool field_0x41;
-    /* 0x42 */ s16 field_0x42;
-    /* 0x44 */ s16 mSoundWait;
-    /* 0x46 */ u8 field_0x46[10];
+    /* 0x42 */ u8 mData[0x50 - 0x42];
 };  // Size: 0x50
 
+STATIC_ASSERT(sizeof(dEvDtStaff_c) == 0x50);
+
 class dEvDtEvent_c {
 public:
     int finishCheck();
@@ -175,7 +200,7 @@ public:
     int init();
     int init(char*, int);
     void advanceCut(dEvDtEvent_c*);
-    void advanceCutLocal(dEvDtStaff_c*);
+    BOOL advanceCutLocal(dEvDtStaff_c*);
 
     event_binary_data_header* getHeaderP() { return mHeaderP; }
     dEvDtStaff_c* getStaffP(int i) { return &mStaffP[i]; }
diff --git a/include/d/event/d_event_manager.h b/include/d/event/d_event_manager.h
index fc4dffb85b..116876a27c 100644
--- a/include/d/event/d_event_manager.h
+++ b/include/d/event/d_event_manager.h
@@ -48,7 +48,7 @@ public:
     int startCheckOld(char const*);
     int endCheck(s16);
     int endCheckOld(char const*);
-    s32 getMyStaffId(char const*, fopAc_ac_c*, int);
+    int getMyStaffId(char const*, fopAc_ac_c*, int);
     int getIsAddvance(int);
     int getMyActIdx(int, char const* const*, int, int, int);
     char* getMyNowCutName(int);