Execute to 90%

include/d/actor/d_a_player.h

@@ -110,7 +110,7 @@ public:
     virtual void checkCutCharge() const;
     virtual void getBokoFlamePos(cXyz*);
     virtual void checkTactWait() const;
-    virtual void setTactZev(unsigned int, int, char*);
+    virtual void setTactZev(unsigned int, int, const char*);
     virtual void onDekuSpReturnFlg(u8);
     virtual void checkComboCutTurn() const;
     virtual f32 getBaseAnimeFrameRate() = 0;

include/d/d_com_inf_game.h

@@ -837,6 +837,10 @@ inline fopAc_ac_c* dComIfGp_getPlayer(int idx) {
     return g_dComIfG_gameInfo.play.getPlayer(idx);
 }
 
+inline fopAc_ac_c* dComIfGp_getCb1Player() {
+    return g_dComIfG_gameInfo.play.getPlayerPtr(1);
+}
+
 inline roomRead_class* dComIfGp_getStageRoom() {
     return g_dComIfG_gameInfo.play.getStage().getRoom();
 }
@@ -1195,6 +1199,10 @@ inline fopAc_ac_c* dComIfGp_event_getTalkPartner() {
     return g_dComIfG_gameInfo.play.getEvent().convPId(t);
 }
 
+inline void dComIfGp_event_setTalkPartner(void* i_actor) {
+    g_dComIfG_gameInfo.play.getEvent().setPtT(i_actor);
+}
+
 inline fopAc_ac_c* dComIfGp_event_getItemPartner() {
     u32 i = g_dComIfG_gameInfo.play.getEvent().mPtItem;
     return g_dComIfG_gameInfo.play.getEvent().convPId(i);
@@ -1246,6 +1254,10 @@ inline char* dComIfGp_evmng_getMyStringP(int staffIdx, const char* name) {
     return reinterpret_cast<char*>(dComIfGp_getEventManager().getMySubstanceP(staffIdx, name, 4)); //type 4 is string
 }
 
+inline BOOL dComIfGp_evmng_startCheck(s16 eventID) {
+    return dComIfGp_getEventManager().startCheck(eventID);
+}
+
 inline BOOL dComIfGp_evmng_endCheck(s16 eventID) {
     return dComIfGp_getEventManager().endCheck(eventID);
 }

include/d/d_event.h

@@ -69,7 +69,7 @@ public:
     void remove();
     void getStageEventDt();
     void nextStageEventDt(void*);
-    void getPId(void*);
+    int getPId(void*);
     fopAc_ac_c * convPId(unsigned int);
     void getTactFreeMStick(int);
     void getTactFreeCStick(int);
@@ -78,6 +78,7 @@ public:
     u8 getTalkXYBtn() { return mTalkButton; }
     bool chkTalkXY() { return mTalkButton == 1 || mTalkButton == 2 || mTalkButton == 3; }
     void setPtI_Id(u32 id) { mPtItem = id; }
+    void setPtT(void* i_actor) { mPtTalk = getPId(i_actor); }
     u8 getPreItemNo() { return mItemNo; }
 
     u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
@@ -116,4 +117,4 @@ public:
     /* 0xEE */ u8 mTactFreeCStick[4];
 };  // Size = 0xF4
 
-#endif /* D_EVENT_D_EVENT_H */
+#endif /* D_EVENT_D_EVENT_H */

include/d/d_event_manager.h

@@ -37,7 +37,7 @@ public:
     void getEventData(s16);
     s16 getEventIdx(const char*, u8);
     void order(s16);
-    void startCheck(s16);
+    bool startCheck(s16);
     BOOL startCheckOld(const char*);
     BOOL endCheck(s16);
     BOOL endCheckOld(const char*);
@@ -76,4 +76,4 @@ inline int dEvmng_strcmp(const char* s1, const char* s2) {
     return strcmp(s1, s2);
 }
 
-#endif /* D_EVENT_D_EVENT_MANAGER_H */
+#endif /* D_EVENT_D_EVENT_MANAGER_H */

include/m_Do/m_Do_audio.h

@@ -55,6 +55,10 @@ inline void mDoAud_load2ndDynamicWave() {
     mDoAud_zelAudio_c::getInterface()->load2ndDynamicWave();
 }
 
+inline void mDoAud_taktModeMuteOff() {
+    mDoAud_zelAudio_c::getInterface()->taktModeMuteOff();
+}
+
 inline void mDoAud_resetProcess() {
     if (mDoAud_zelAudio_c::isResetFlag()) {
         mDoAud_zelAudio_c::getInterface()->resetProcess();