Implement & link ac_bee

include/ac_bee.h

@@ -3,11 +3,38 @@
 
 #include "types.h"
 #include "m_actor.h"
+#include "c_keyframe.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define aBEE_JOINT_NUM 4
+
+typedef struct bee_actor_s BEE_ACTOR;
+
+struct bee_actor_s {
+    ACTOR actor_class;
+    mActor_proc action_proc;
+    int action;
+    cKF_SkeletonInfo_R_c keyframe;
+    s_xyz work[aBEE_JOINT_NUM];
+    s_xyz morph[aBEE_JOINT_NUM];
+    Mtx mtx[2][aBEE_JOINT_NUM];
+    xyz_t size;
+    f32 speed;
+    f32 start_frame;
+    f32 pos_y;
+    int alpha;
+    s16 bobbing_counter;
+    s16 add_angle;
+    s16 fly_angle[2];
+    s16 base_angle;
+    int catch_delay_frames;
+    ACTOR* insect_actor;
+    int disappear_timer;
+};
+
 extern ACTOR_PROFILE Bee_Profile;
 
 #ifdef __cplusplus
@@ -15,4 +42,3 @@ extern ACTOR_PROFILE Bee_Profile;
 #endif
 
 #endif
-

include/audio_defs.h

@@ -110,6 +110,8 @@ typedef enum audio_sound_effects {
 
     NA_SE_GOKI_MOVE = 0xA8,
 
+    NA_SE_B0 = 0xB0,
+
     NA_SE_KA_BUZZ = 0xCF,
 
     NA_SE_108 = 0x108,

include/m_actor.h

@@ -16,7 +16,7 @@ extern "C" {
 #endif
 
 typedef void (*mActor_proc)(ACTOR*, GAME*);
-#define NONE_ACTOR_PROC ((mActor_proc) & none_proc1)
+#define NONE_ACTOR_PROC ((mActor_proc)&none_proc1)
 
 #define mAc_MAX_ACTORS 200
 
@@ -432,7 +432,7 @@ typedef enum bank_id {
     ACTOR_OBJ_BANK_389,
     ACTOR_OBJ_BANK_390,
     ACTOR_OBJ_BANK_TAMA,
-    ACTOR_OBJ_BANK_392,
+    ACTOR_OBJ_BANK_BEE,
     ACTOR_OBJ_BANK_393,
     ACTOR_OBJ_BANK_ROPE,
     ACTOR_OBJ_BANK_CRACKER,

include/m_lib.h

@@ -17,7 +17,7 @@ extern "C" {
 #define SQ(x) ((x) * (x))
 #define CLAMP_MIN(x, min) ((x) < (min) ? (min) : (x))
 #define CLAMP_MAX(x, max) ((max) < (x) ? (max) : (x))
-#define CLAMP(x, min, max) ((x) < (min) ? (min) : ((x > (max) ? (max) : (x))))
+#define CLAMP(x, min, max) ((x) < (min) ? (min) : (((x) > (max) ? (max) : (x))))
 
 /* Float modulo operator */
 #define MOD_F(a, m) (a - (int)((a) * (1.0f / (m))) * (m))