d_cc_uty OK

include/d/actor/d_a_mt.h

@@ -3,9 +3,12 @@
 
 #include "f_op/f_op_actor.h"
 
-class mt_class : public fopAc_ac_c {
+class mt_class : public fopEn_enemy_c {
 public:
     /* Place member variables here */
+    /* 0x02AC */ u8 m2AC[0x0454 - 0x02AC];
+    /* 0x0454 */ u8 m454;
+    /* 0x0455 */ u8 m455[0x1CC0 - 0x0455];
 };
 
 class daMt_HIO_c {

include/d/actor/d_a_player.h

@@ -337,7 +337,7 @@ public:
     };
     
     /* 0x290 */ u8 mCutType;
-    /* 0x291 */ u8 field_0x291;
+    /* 0x291 */ u8 mCutCount;
     /* 0x292 */ u8 field_0x292[0x294 - 0x292];
     /* 0x294 */ s16 mDamageWaitTimer;
     /* 0x296 */ s16 mQuakeTimer;
@@ -361,6 +361,7 @@ public:
 
     f32 getSpeedF() const { return speedF; }
     u8 getCutType() const { return mCutType; }
+    u8 getCutCount() const { return mCutCount; }
     s16 getDamageWaitTimer() const { return mDamageWaitTimer; }
     f32 getHeight() const { return mHeight; }
     s16 getBodyAngleX() const { return mBodyAngle.x; }
@@ -371,7 +372,6 @@ public:
     cXyz getLeftHandPos() const { return mLeftHandPos; }
     cXyz getRightHandPos() const { return mRightHandPos; }
     cXyz getRopePos() const { return mRopePos; }
-    void getCutCount() const {} // field_0x291?
     void getYPos() const {}
     
     void changeDemoMode(u32) {}

include/d/actor/d_a_tsubo.h

@@ -7,26 +7,38 @@
 #include "d/d_bg_s_acch.h"
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
 #include "d/d_particle.h"
+#include "d/d_a_obj.h"
 #include "SSystem/SComponent/c_angle.h"
 #include "SSystem/SComponent/c_phase.h"
 
 namespace daTsubo {
     class Act_c : public fopAc_ac_c {
     public:
+        enum Prm_e {
+            PRM_TYPE_W = 0x04,
+            PRM_TYPE_S = 0x18,
+        };
+        
+        enum Type {
+            TYPE_WATER_JUG = 0x2,
+            TYPE_KUTANI = 0xE,
+        };
+        
+        int prm_get_type() const { return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S); }
+        bool prm_chk_type_kutani() const { return prm_get_type() == TYPE_KUTANI; }
+        
         void attrSpine() {}
         void data() const {}
         void data_spec_boko(int) {}
         void is_switch() const {}
         void pos_init() {}
         void prmZ_get_swSave() const {}
-        void prm_chk_type_kutani() const {}
         void prm_get_cull() const {}
         void prm_get_itemNo() const {}
         void prm_get_itemSave() const {}
         void prm_get_moveBg() const {}
         void prm_get_spec() const {}
         void prm_get_stick() const {}
-        void prm_get_type() const {}
         void prm_make_acorn(bool, int, int) {}
         void prm_make_skull() {}
         void prm_make_yw1() {}

include/d/d_cc_d.h

@@ -29,7 +29,17 @@ enum dCcG_Co_SPrm {
     G_CO_SPRM_TG_LASSO = 0x02,
 };
 
-enum dCcD_hitSe {};
+enum dCcD_hitSe {
+    /* 0x01 */ dCcD_SE_UNK1 = 1,
+    /* 0x02 */ dCcD_SE_UNK2 = 2,
+    /* 0x04 */ dCcD_SE_UNK4 = 4,
+    /* 0x05 */ dCcD_SE_UNK5 = 5,
+    /* 0x06 */ dCcD_SE_UNK6 = 6,
+    /* 0x07 */ dCcD_SE_ARROW = 7,
+    /* 0x08 */ dCcD_SE_HOOKSHOT = 8,
+    /* 0x23 */ dCcD_SE_UNK23 = 0x23,
+    /* 0x25 */ dCcD_SE_UNK25 = 0x25,
+};
 
 enum CcG_At_HitMark {
     /* 0xD */ G_AT_MARK_NORMAL_HIT = dPa_name::ID_COMMON_NORMAL_HIT,

include/d/d_cc_uty.h

@@ -23,12 +23,12 @@ public:
     /* 0x18 */ s32 mHitSoundId;
 };
 
-void cc_pl_cut_bit_get();
-void at_se_get(cCcD_Obj*);
-void at_se_getC(cCcD_Obj*);
+int cc_pl_cut_bit_get();
+u32 at_se_get(cCcD_Obj*);
+u32 at_se_getC(cCcD_Obj*);
 void def_se_set(fopAc_ac_c*, cCcD_Obj*, unsigned long);
 void def_se_set_p(fopAc_ac_c*, cXyz*, cCcD_Obj*, unsigned long);
-void at_power_check(CcAtInfo*);
-void cc_at_check(fopAc_ac_c*, CcAtInfo*);
+fopAc_ac_c* at_power_check(CcAtInfo*);
+fopAc_ac_c* cc_at_check(fopAc_ac_c*, CcAtInfo*);
 
 #endif /* D_CC_UTY_H */

include/d/d_s_play.h

@@ -6,6 +6,7 @@
 #include "m_Do/m_Do_hostIO.h"
 
 class mDoDvdThd_toMainRam_c;
+
 class dScnPly_ply_c : public scene_class {
 public:
     s8 calcPauseTimer();
@@ -15,6 +16,9 @@ public:
     static bool isPause() { return pauseTimer != 0; }
     static void setPauseTimer(s8 time) { nextPauseTimer = time; }
 
+    static void onDebugPause() {}
+    static void offDebugPause() {}
+
     static s8 pauseTimer;
     static s8 nextPauseTimer;
 

include/f_op/f_op_actor.h

@@ -23,25 +23,25 @@ struct actor_method_class2 {
 enum fopAc_Status_e {
     // Note: The lowest 5 bits of the status field (& 0x1F) act as an index controlling the map icon type.
     fopAcStts_SHOWMAP_e     = 0x00000020,
-    fopAcStts_UNK40_e       = 0x00000040,
+    fopAcStts_UNK40_e       = 0x00000040, // Related to talking to the Killer Bees?
     fopAcStts_NOCULLEXEC_e  = 0x00000080,
     fopAcStts_CULL_e        = 0x00000100,
     fopAcStts_FREEZE_e      = 0x00000400,
     fopAcStts_UNK800_e      = 0x00000800,
-    fopAcStts_UNK1000_e     = 0x00001000,
+    fopAcStts_UNK1000_e     = 0x00001000, // Door related
     fopAcStts_CARRY_e       = 0x00002000,
     fopAcStts_UNK4000_e     = 0x00004000,
     fopAcStts_FORCEMOVE_e   = 0x00008000,
     fopAcStts_NOPAUSE_e     = 0x00020000,
     fopAcStts_UNK40000_e    = 0x00040000,
-    fopAcStts_UNK80000_e    = 0x00080000,
+    fopAcStts_UNK80000_e    = 0x00080000, // Hookshot related
     fopAcStts_HOOK_CARRY_e  = 0x00100000,
-    fopAcStts_UNK200000_e   = 0x00200000,
+    fopAcStts_UNK200000_e   = 0x00200000, // Hookshot related
     fopAcStts_NODRAW_e      = 0x01000000,
     fopAcStts_UNK2000000_e  = 0x02000000,
     fopAcStts_BOSS_e        = 0x04000000,
     fopAcStts_UNK8000000_e  = 0x08000000,
-    fopAcStts_UNK10000000_e = 0x10000000,
+    fopAcStts_UNK10000000_e = 0x10000000, // Hookshot related
 };
 
 enum fopAc_Condition_e {
@@ -281,8 +281,8 @@ public:
     /* 0x284 */ s8 mMaxHealth;
     /* 0x285 */ s8 mHealth;
     /* 0x288 */ s32 mItemTableIdx;
-    /* 0x28C */ u8 mItemStealNum;
-    /* 0x28D */ s8 mItemStealLeft;
+    /* 0x28C */ u8 mStealItemBitNo; // For limited items (Blue Chu Jelly), this is the first itemBitNo to set.
+    /* 0x28D */ s8 mStealItemLeft;
 
     fopAc_ac_c();
     ~fopAc_ac_c();

include/f_op/f_op_actor_mng.h

@@ -534,6 +534,8 @@ void* fopAcM_fastCreateItem(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_an
                             cXyz* p_scale, f32 p_speedF, f32 p_speedY, f32 param_8,
                             int param_9 = -1, createFunc p_createFunc = NULL);
 
+void* fopAcM_createStealItem(cXyz* p_pos, int i_tblNo, int i_roomNo, csXyz* p_angle, int i_itemBitNo);
+
 BOOL stealItem_CB(void* actor);
 
 fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo);

include/m_Do/m_Do_audio.h

@@ -165,6 +165,10 @@ inline void mDoAud_bgmMuteMtDragon() {
     mDoAud_zelAudio_c::getInterface()->bgmMuteMtDragon();
 }
 
+inline void mDoAud_bgmHitSound(s32 param_0) {
+    mDoAud_zelAudio_c::getInterface()->bgmHitSound(param_0);
+}
+
 inline void mDoAud_stSkyCloisters() {
     mDoAud_zelAudio_c::getInterface()->stSkyCloisters();
 }