procTactWait

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();
 }