more nonmatching

10 files changed, 58 insertions, 15 deletions

diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 64b84b96de..5d19bbbc74 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -181,7 +181,7 @@ public:
     enum daPy_FLG0 {
         FLG0_UNK_40000000 = 0x40000000,
         EQUIP_HEAVY_BOOTS = 0x2000000,
-        FLG0_UNK_8000000 = 0x8000000,
+        PLAYER_NO_DRAW = 0x8000000,
         FLG0_UNK_1000000 = 0x1000000,
         UNDER_WATER_MOVEMENT = 0x800000,
         FLG0_UNK_80000 = 0x80000,
@@ -552,6 +552,8 @@ public:
     BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(EQUIP_HEAVY_BOOTS); }
     BOOL i_checkMagneBootsOn() const { return i_checkNoResetFlg0(MAGNE_BOOTS_ON); }
     bool i_checkMidnaRide() const { return i_checkNoResetFlg0(MIDNA_RIDE); }
+    void i_onPlayerNoDraw() { i_onNoResetFlg0(PLAYER_NO_DRAW); }
+    void i_offPlayerNoDraw() { i_offNoResetFlg0(PLAYER_NO_DRAW); }
 
     inline static u32 getLastSceneMode();
     inline static bool checkWoodSwordEquip();
diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index 9a905f66a2..022784b66c 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -617,6 +617,7 @@ public:
     dComIfG_inf_c() { this->ct(); }
     ~dComIfG_inf_c() {}
     void ct();
+    dComIfG_play_c& getPlay() { return play; }
 
     /* 0x00000 */ dSv_info_c info;
     /* 0x00F38 */ dComIfG_play_c play;
@@ -656,6 +657,8 @@ int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resNa
 int dComIfG_changeOpeningScene(scene_class* scene, s16 procName);
 int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* arc_name);
 BOOL dComIfGs_isStageSwitch(int i_stageNo, int i_no);
+void dComIfGs_onStageSwitch(int i_stageNo, int i_no);
+void dComIfGs_offStageSwitch(int i_stageNo, int i_no);
 
 inline void dComIfG_setBrightness(u8 brightness) {
     g_dComIfG_gameInfo.mFadeBrightness = brightness;
diff --git a/include/d/d_demo.h b/include/d/d_demo.h
index 0ff56ba4fe..842508ea5c 100644
--- a/include/d/d_demo.h
+++ b/include/d/d_demo.h
@@ -1,14 +1,15 @@
 #ifndef D_D_DEMO_H
 #define D_D_DEMO_H
 
+#include "JSystem/JStudio/JStudio/stb.h"
 #include "dolphin/types.h"
 
 class cXyz;
 struct dDemo_c {
     /* 80039678 */ void create();
     /* 80039910 */ void remove();
-    /* 80039B6C */ void start(u8 const*, cXyz*, f32);
-    /* 80039CF8 */ void end();
+    /* 80039B6C */ static void start(u8 const*, cXyz*, f32);
+    /* 80039CF8 */ static void end();
     /* 80039D4C */ void branch();
     /* 80039DA4 */ void update();
     /* 80039EDC */ void setBranchType(u16);
@@ -16,10 +17,12 @@ struct dDemo_c {
     /* 80039F04 */ void reset();
 
     static u32 getFrameNoMsg() { return m_frameNoMsg; }
+    static s32 getMode() { return m_mode; }
+    static JStudio::stb::TControl* getControl() { return m_control; }
 
     static u16 m_branchId[1 + 3 /* padding */];
     static u8 m_system[4];
-    static u8 m_control[4];
+    static JStudio::stb::TControl* m_control;
     static u8 m_stage[4];
     static u8 m_audio[4];
     static u8 m_particle[4];
@@ -32,7 +35,7 @@ struct dDemo_c {
     static u8 m_translation[4];
     static f32 m_rotationY;
     static u32 m_frameNoMsg;
-    static u8 m_mode[4];
+    static s32 m_mode;
     static u8 m_status[4];
     static u8 m_branchType[2 + 2 /* padding */];
     static u8 m_branchData[4];
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index eb4bf4efd6..f175a6a3bc 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -219,7 +219,7 @@ public:
     /* 80056794 */ int set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
     /* 800567C4 */ void draw(dDlst_base_c**, dDlst_base_c**);
     /* 8005681C */ void wipeIn(f32, _GXColor&);
-    /* 800568D8 */ void wipeIn(f32);
+    /* 800568D8 */ static void wipeIn(f32);
     /* 80056900 */ void calcWipe();
 
     void set2DOpa(dDlst_base_c* dlst) { set(field_0x1b4, field_0x1b8, dlst); }
@@ -258,6 +258,7 @@ public:
     }
 
     static void offWipe() { data_80450ED0 = 0; }
+    static f32 getWipeRate() { return mWipeRate; }
 
     static u8 mWipeDlst[72];
     static u8 mWipeColor[4];
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 7dabe6c936..db454c2d19 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -249,7 +249,9 @@ struct dStage_MapEvent_dt_c {
     u8 field_0x8;
     u8 field_0x9;
     u8 field_0xA[0xD - 0xA];
-    char mName[10];
+    char mName[6];
+    u16 field_0x14;
+    u8 field_0x16;
     u8 field_0x17;
     u8 field_0x18;
     u8 field_0x19[0x1B - 0x19];
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);
diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h
index 58b0912dbb..741538ae21 100644
--- a/include/d/msg/d_msg_object.h
+++ b/include/d/msg/d_msg_object.h
@@ -109,7 +109,7 @@ public:
     /* 80237F10 */ void setTalkActorLocal(fopAc_ac_c*);
     /* 8023800C */ static void readMessageGroup(mDoDvdThd_mountXArchive_c**);
     /* 8023803C */ static void changeFlowGroup(s32);
-    /* 8023806C */ void demoMessageGroup();
+    /* 8023806C */ static void demoMessageGroup();
     /* 80238098 */ void endFlowGroup();
     /* 802380C4 */ void changeGroup(s16);
     /* 802380F4 */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*,
@@ -248,6 +248,9 @@ u16 dMsgObject_getOffering();
 inline dMsgObject_c* dMsgObject_getMsgObjectClass() {
     return dComIfGp_getMsgObjectClass();
 }
+inline void dMsgObject_demoMessageGroup() {
+    dMsgObject_c::demoMessageGroup();
+}
 
 inline bool dMsgObject_isTalkNowCheck() {
     return dMsgObject_getMsgObjectClass()->getStatus() != 1 ? true : false;
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index 57222b1de9..23c6566e11 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -47,12 +47,15 @@ public:
     static void setFadeColor(JUtility::TColor& color) { mFader->setColor(color); }
     static void endFrame() { JFWDisplay::getManager()->endFrame(); }
     static void offFade() { data_80450BE6 = 0; }
+    static u8 isFade() { return data_80450BE6; }
     static void offBlure() { struct_80450BE4 = 0; }
     static void offAutoForcus() { data_80450BE7 = 0; }
     static void setTickRate(u32 rate) { JFWDisplay::getManager()->setTickRate(rate); }
     static void waitBlanking(int wait) { JFWDisplay::getManager()->waitBlanking(wait); }
     static f32 getWidthF() { return 608.0f; }
     static f32 getHeightF() { return 448.0f; }
+    static void setFadeRate(f32 rate) { mFadeRate = rate; }
+    static f32 getFadeRate() { return mFadeRate; }
 
     static GXTexObj mFrameBufferTexObj;
     static GXTexObj mZbufferTexObj;