procTactWait

include/JAZelAudio/JAIZelInst.h

@@ -15,7 +15,7 @@ public:
     void setBeat(s32);
     void setVolume(f32);
     void metronomePlay(s32, s32);
-    void judge(s32, s32);
+    s32 judge(s32, s32);
     void ambientPlay();
     void armSoundPlay(s32);
     f32 getMelodyPattern(s32, s32, s32*);
@@ -24,9 +24,8 @@ public:
     void melodyPlay(s32);
     void melodyStop();
 
-    // one of these inlines returns field_0x30, not sure which
-    void getBeat() {}
-    void getBeatFrames() {}
+    u8 getBeat() { return mMelodyNum; }
+    f32 getBeatFrames() { return field_0x30; }
 
 public:
     /* 0x00 */ int field_0x0;

include/d/actor/d_a_player.h

@@ -148,7 +148,7 @@ public:
         daPyRFlg0_UNK80000              = 0x00080000,
         daPyRFlg0_POISON_CURSE          = 0x00100000,
         daPyRFlg0_GRAB_PUT_START        = 0x00400000,
-        daPyRFlg0_TACT_USE              = 0x01000000,
+        daPyRFlg0_TACT_INPUT              = 0x01000000,
         daPyRFlg0_FAIRY_USE             = 0x02000000,
         daPyRFlg0_UNK8000000            = 0x08000000,
         daPyRFlg0_UNK10000000           = 0x10000000,
@@ -445,7 +445,7 @@ public:
     void onPoisonCurse() { onResetFlg0(daPyRFlg0_POISON_CURSE); }
     bool getGrabPutStart() const { return checkResetFlg0(daPyRFlg0_GRAB_PUT_START); }
     bool checkFairyUse() const { return checkResetFlg0(daPyRFlg0_FAIRY_USE); }
-    bool checkTactUse() const { return checkResetFlg0(daPyRFlg0_TACT_USE); }
+    bool checkTactInput() const { return checkResetFlg0(daPyRFlg0_TACT_INPUT); }
     bool checkArrowShoot() const { return checkResetFlg0(daPyRFlg0_ARROW_SHOOT); }
     
     bool checkGrabWear() const { return field_0x2b0 < 0.0f; }
@@ -465,7 +465,6 @@ public:
     void checkSwordMiniGame() const {}
     void checkSoupPowerUp() const {}
     void checkSubjectAccept() const {}
-    void checkTactInput() const {}
     void checkUseArrowEffect() const {}
     void getRopeJumpLand() const {}
     void checkRopeForceEnd() const {}

include/d/actor/d_a_player_main.h

@@ -95,6 +95,9 @@ public:
     }
     
     void onAlphaOutFlg() { mAlphaOutFlg = TRUE; }
+    JPABaseEmitter* getEmitter() { return mpEmitter; }
+    
+    void deleteCallBack() {}
     
     /* 0x4 */ BOOL mAlphaOutFlg;
     /* 0x8 */ JPABaseEmitter* mpEmitter;
@@ -2098,7 +2101,7 @@ public:
     /* 0x3618 */ u32 mModeFlg;
     /* 0x361C */ u32 mMtrlSndId;
     /* 0x3620 */ u32 m3620;
-    /* 0x3624 */ int m3624;
+    /* 0x3624 */ u32 m3624;
     /* 0x3628 */ int m3628;
     /* 0x362C */ uint mTactZevPartnerPID;
     /* 0x3630 */ u32 m3630;

include/d/d_com_inf_game.h

@@ -2456,7 +2456,7 @@ inline bool dComIfGp_2dShowCheck() {
     return g_dComIfG_gameInfo.play.show2dCheck();
 }
 
-inline u8 dComIfGp_setMelodyNum() {
+inline u8 dComIfGp_getMelodyNum() {
     return g_dComIfG_gameInfo.play.getMelodyNum();
 }
 

include/m_Do/m_Do_audio.h

@@ -48,6 +48,7 @@ void mDoAud_setSceneName(const char*, s32, s32);
 void mDoAud_Execute();
 BOOL mDoAud_isUsedHeapForStreamBuffer();
 int mDoAud_load1stDynamicWave();
+int mDoAud_getTactDirection(int stick, int ret);
 
 extern JKRSolidHeap* g_mDoAud_audioHeap;
 
@@ -214,7 +215,7 @@ inline void mDoAud_tact_reset() {
     mDoAud_zelAudio_c::getTact().reset();
 }
 
-inline void mDoAud_tact_getBeat() {
+inline u8 mDoAud_tact_getBeat() {
     return mDoAud_zelAudio_c::getTact().getBeat();
 }
 
@@ -222,7 +223,7 @@ inline void mDoAud_tact_setBeat(s32 beat) {
     mDoAud_zelAudio_c::getTact().setBeat(beat);
 }
 
-inline void mDoAud_tact_getBeatFrames() {
+inline f32 mDoAud_tact_getBeatFrames() {
     return mDoAud_zelAudio_c::getTact().getBeatFrames();
 }
 
@@ -250,11 +251,20 @@ inline void mDoAud_tact_stopArmSwing() {
     mDoAud_zelAudio_c::getTact().stopArmSwing();
 }
 
-inline void mDoAud_tact_armSoundPlay(s32) {}
-inline void mDoAud_tact_judge(s32, s32) {}
+inline s32 mDoAud_tact_judge(s32 param_1, s32 param_2) {
+    return mDoAud_zelAudio_c::getTact().judge(param_1, param_2);
+}
+
+inline void mDoAud_tact_armSoundPlay(s32 param_1) {
+    return mDoAud_zelAudio_c::getTact().armSoundPlay(param_1);
+}
+
+inline void mDoAud_tact_metronomePlay(s32 param_1, s32 param_2) {
+    return mDoAud_zelAudio_c::getTact().metronomePlay(param_1, param_2);
+}
+
 inline void mDoAud_tact_melodyPlay(s32) {}
 inline void mDoAud_tact_melodyStop() {}
-inline void mDoAud_tact_metronomePlay(s32, s32) {}
 
 inline BOOL mDoAud_checkCbPracticePlay() {
     return mDoAud_zelAudio_c::getInterface()->checkCbPracticePlay();