d_a_am 100%, no match

include/JAZelAudio/JAIZelBasic.h

@@ -4,6 +4,7 @@
 #include "dolphin/types.h"
 #include "JAZelAudio/JAZelAudio_SE.h"
 #include "JAZelAudio/JAZelAudio_BGM.h"
+#include "dolphin/mtx/mtx.h"
 
 class Vec;
 class JAISound;
@@ -80,7 +81,7 @@ public:
     void talkOut();
     void menuIn();
     void menuOut();
-    void getCameraInfo(Vec*, f32*[][][][], u32);
+    void getCameraInfo(Vec*, Mtx, u32);
     void getCameraMapInfo(u32);
     void setCameraPolygonPos(Vec*);
     void setCameraGroupInfo(u8);

include/JSystem/J3DGraphAnimator/J3DAnimation.h

@@ -645,9 +645,9 @@ public:
     }
     void setFrame(f32 frame) { mFrame = frame; }
     void setLoop(s16 loop) { mLoop = loop; }
-    bool checkState(u8 state) const { return mState & state; }
+    BOOL checkState(u8 state) const { return mState & state; }
 
-private:
+public:
     /* 0x04 */ u8 mAttribute;
     /* 0x05 */ u8 mState;
     /* 0x06 */ s16 mStart;

include/SSystem/SComponent/c_cc_d.h

@@ -364,9 +364,9 @@ public:
     virtual ~cCcD_ObjCommonBase() {}
     void ct();
     void SetSPrm(u32 sprm) { mSPrm = sprm; }
-    s32 getSPrm() const { return mSPrm; }
-    void setRPrm(s32 rprm) { mRPrm = rprm; }
-    s32 getRPrm() const { return mRPrm; }
+    u32 getSPrm() const { return mSPrm; }
+    void SetRPrm(u32 rprm) { mRPrm = rprm; }
+    u32 getRPrm() const { return mRPrm; }
     cCcD_Obj* GetHitObj() { return mHitObj; }
     void ClrObj() { mHitObj = NULL; }
     u32 MskSPrm(u32 mask) const { return mSPrm & mask; }
@@ -397,6 +397,7 @@ public:
     void SetType(u32 type) { mType = type; }
     void SetAtp(int atp) { mAtp = atp; }
     void ClrSet() { OffSPrmBit(1); }
+    void OnHitBit() { SetRPrm(1); }
     void OffHitBit() { ClrRPrm(1); }
     u32 ChkHit() { return MskRPrm(1); }
 
@@ -495,6 +496,7 @@ public:
     void SetTgType(u32 type) { mObjTg.SetType(type); }
     void OnTgSPrmBit(u32 flag) { mObjTg.OnSPrmBit(flag); }
     void OffAtSetBit() { mObjAt.ClrSet(); }
+    void OnAtHitBit() { mObjAt.OnHitBit(); }
     void OffAtHitBit() { mObjAt.OffHitBit(); }
     void OnTgSetBit() { mObjTg.OnSPrmBit(1); }
     void OffTgSetBit() { mObjTg.ClrSet(); }

include/d/actor/d_a_bomb.h

@@ -26,8 +26,8 @@ public:
         
     };
     
-    void getBombRestTime();
-    void getBombCheck_Flag();
+    s16 getBombRestTime();
+    s16 getBombCheck_Flag();
     void setBombCheck_Flag();
     void setBombFire_ON();
     void setBombNoHit();

include/d/actor/d_a_bomb2.h

@@ -43,8 +43,8 @@ namespace daBomb2 {
         
         void remove_fuse_effect();
         void set_time(int);
-        void get_time() const;
-        void chk_eat() const;
+        s32 get_time() const;
+        bool chk_eat() const;
         void set_eat();
         void set_no_hit();
         void chk_explode();

include/d/actor/d_a_player.h

@@ -70,7 +70,7 @@ public:
     /* 0x290 */ u8 mAttackState;
     /* 0x291 */ u8 field_0x291;
     /* 0x292 */ u8 field_0x292[0x294 - 0x292];
-    /* 0x294 */ s16 field_0x294;
+    /* 0x294 */ s16 mDamageWaitTimer;
     /* 0x296 */ s16 mQuakeTimer;
     /* 0x298 */ int field_0x298;
     /* 0x29C */ u32 field_0x29c;
@@ -91,10 +91,11 @@ public:
     /* 0x300 */ f32 field_0x300;
     /* 0x304 */ daPy_demo_c mDemo;
 
+    u8 getCutType() const { return mAttackState; }
+    s16 getDamageWaitTimer() const { return mDamageWaitTimer; }
     s16 getBodyAngleX() { return mBodyAngle.x; }
     s16 getBodyAngleY() { return mBodyAngle.y; }
     void changeDemoMoveAngle(s16 angle) { mDemo.setMoveAngle(angle); }
-    u8 getCutType() const { return mAttackState; }
 
     void onPlayerNoDraw() { field_0x29c |= 0x8000000; }
     void offPlayerNoDraw() { field_0x29c &= ~0x8000000; }

include/d/d_cc_uty.h

@@ -0,0 +1,29 @@
+#ifndef D_CC_UTY_H
+#define D_CC_UTY_H
+
+#include "SSystem/SComponent/c_cc_d.h"
+#include "f_op/f_op_actor.h"
+
+struct CcAtInfo {
+    /* 0x00 */ cCcD_Obj* mpObj;
+    /* 0x04 */ fopAc_ac_c* mpActor;
+    /* 0x08 */ u8 mDamage;
+    /* 0x09 */ u8 mbDead;
+    /* 0x0A */ u8 mResultingAttackType;
+    /* 0x0B */ u8 m0B[0x0E - 0x0B];
+    /* 0x0E */ s16 m0E;
+    /* 0x10 */ u8 m10[0x12 - 0x10];
+    /* 0x12 */ u16 mPlCutBit;
+    /* 0x14 */ cXyz* pParticlePos;
+    /* 0x18 */ s32 mHitSoundId;
+};
+
+void cc_pl_cut_bit_get();
+void at_se_get(cCcD_Obj*);
+void 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*);
+
+#endif /* D_CC_UTY_H */

include/d/d_com_inf_game.h

@@ -720,6 +720,10 @@ inline void dComIfGs_initDan(s8 i_stageNo) {
     g_dComIfG_gameInfo.save.initDan(i_stageNo);
 }
 
+inline void dComIfGs_onActor(int i_no, int i_roomNo) {
+    g_dComIfG_gameInfo.save.onActor(i_no, i_roomNo);
+}
+
 inline BOOL dComIfGs_isActor(int i_no, int i_roomNo) {
     return g_dComIfG_gameInfo.save.isActor(i_no, i_roomNo);
 }

include/f_op/f_op_actor.h

@@ -228,7 +228,7 @@ public:
     /* 0x285 */ s8 mHealth;
     /* 0x288 */ s32 mItemTableIdx;
     /* 0x28C */ u8 mItemStealNum;
-    /* 0x28D */ u8 mItemStealLeft;
+    /* 0x28D */ s8 mItemStealLeft;
 
     fopAc_ac_c();
     ~fopAc_ac_c();

include/f_op/f_op_actor_mng.h

@@ -545,6 +545,10 @@ inline void fopAcM_seStart(fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
     mDoAud_seStart(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
 }
 
+inline void fopAcM_monsSeStart(fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
+    mDoAud_monsSeStart(sfxID, &actor->mEyePos, fopAcM_GetID(actor), 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
+}
+
 extern "C" {
 void fopAcM_initManager__Fv(void);
 void fopAcM_CreateAppend__Fv(void);

include/m_Do/m_Do_audio.h

@@ -74,6 +74,14 @@ inline void mDoAud_seDeleteObject(Vec* i_sePos) {
     mDoAud_zelAudio_c::getInterface()->seDeleteObject(i_sePos);
 }
 
+inline void mDoAud_monsSeStart(u32 param_0, Vec* param_1, u32 param_2, u32 param_3, s8 i_reverb) {
+    mDoAud_zelAudio_c::getInterface()->monsSeStart(param_0, param_1, param_2, param_3, i_reverb);
+}
+
+inline void mDoAud_onEnemyDamage() {
+    mDoAud_zelAudio_c::getInterface()->onEnemyDamage();
+}
+
 inline void mDoAud_bgmMuteMtDragon() {
     mDoAud_zelAudio_c::getInterface()->bgmMuteMtDragon();
 }

include/m_Do/m_Do_ext.h

@@ -32,7 +32,7 @@ public:
     void setFrame(f32 frame) { mFrameCtrl->setFrame(frame); }
     void setPlayMode(int i_mode) { mFrameCtrl->setAttribute(i_mode); }
     void setLoopFrame(f32 i_frame) { mFrameCtrl->setLoop(i_frame); }
-    bool isStop() {
+    BOOL isStop() {
         bool stopped = true;
         if (!mFrameCtrl->checkState(1) && mFrameCtrl->getRate() != 0.0f) {
             stopped = false;
@@ -284,14 +284,16 @@ public:
     J3DModel* getModel() { return mpModel; }
     void setFrame(f32 frame) { mFrameCtrl.setFrame(frame); }
     f32 getFrame() { return mFrameCtrl.getFrame(); }
-    bool isStop() const { //regswap somewhere here
+    BOOL isStop() { //regswap somewhere here
         bool stopped = true;
         if (!mFrameCtrl.checkState(1) && mFrameCtrl.getRate() != 0.0f) {
             stopped = false;
         }
-
         return stopped;
     }
+    BOOL checkFrame(f32 frame) {
+        return mFrameCtrl.checkPass(frame);
+    }
 
     void update();
     void updateDL();