Implement & link ac_uki, player refactors

include/ac_uki.h

@@ -3,6 +3,7 @@
 
 #include "types.h"
 #include "m_actor.h"
+#include "libultra/ultratypes.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -16,12 +17,12 @@ enum {
     aUKI_STATUS_FLOAT,
     aUKI_STATUS_VIB,
     aUKI_STATUS_COMEBACK,
-    aUKI_STATUS_7,
+    aUKI_STATUS_CATCH,
 
     aUKI_STATUS_NUM
 };
 
-typedef void (*aUKI_SET_VALUE_PROC)(ACTOR* actorx, xyz_t pos, xyz_t pos_speed, int param_4, int command);
+typedef void (*aUKI_SET_VALUE_PROC)(ACTOR* actorx, xyz_t pos, xyz_t pos_speed, int angle_speed_y, int command);
 typedef mActor_name_t (*aUKI_GET_FISH_TYPE)(ACTOR* actorx);
 
 /* sizeof(UKI_ACTOR) == 0x2B8 */

include/audio_defs.h

@@ -83,6 +83,8 @@ typedef enum audio_sound_effects {
 
     NA_SE_ROD_STROKE = 0x109,
     NA_SE_ROD_BACK,
+    NA_SE_10B,
+    NA_SE_10C,
 
     NA_SE_HANABI0 = HANABI(0x10F),
     NA_SE_HANABI1 = HANABI(0x110),

include/m_actor.h

@@ -86,7 +86,7 @@ typedef enum bank_id {
     ACTOR_OBJ_BANK_KEITAI,
     ACTOR_OBJ_BANK_46,
     ACTOR_OBJ_BANK_47,
-    ACTOR_OBJ_BANK_48,
+    ACTOR_OBJ_BANK_UKI,
     ACTOR_OBJ_BANK_49,
     ACTOR_OBJ_BANK_50,
     ACTOR_OBJ_BANK_51,

include/m_name_table.h

@@ -2551,6 +2551,7 @@ extern int mNT_check_unknown(mActor_name_t item_no);
 #define ETC_SNOWMAN_BALL_A (ETC_START + 13)
 #define ETC_SNOWMAN_BALL_B (ETC_START + 14)
 #define ETC_TRAIN_WINDOW (ETC_START + 17)
+#define ETC_UKI (ETC_START + 18)
 
 #define MISC_ACTOR_START 0x9000
 #define MISC_ACTOR_SAMPLE MISC_ACTOR_START

include/m_player.h

@@ -2070,7 +2070,7 @@ typedef struct controller_data_s {
     s8 btn_a;
     s8 trigger_btn_b;
     s8 btn_b;
-    mActor_name_t equiped_item;
+    mActor_name_t equipped_item;
 } mPlayer_Controller_Data_c;
 
 typedef struct player_eye_pattern_s {

include/types.h

@@ -91,6 +91,8 @@ typedef u32 unknown;
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 
+#define FLOOR(n, f) (((n) / (f)) * (f))
+
 #define F32_IS_ZERO(v) (fabsf(v) < 0.008f)
 
 /* ARGB8 color format (32 bits) to RGB5A3 color format (16 bits) */