mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-10 04:46:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match m_player_item_common.c_inc

Browse Source
This commit is contained in:
Prakxo
2024-08-19 23:32:49 +02:00
parent be6a3f71ab
commit 6a6fa3a8ba
4 changed files with 764 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ac_uki.h
+12
View File
@@ -10,6 +10,18 @@ extern "C" {
extern ACTOR_PROFILE Uki_Profile;
typedef struct actor_uki_s {
ACTOR actor_class;
u8 pad[0xA4];
xyz_t right_hand_pos;
xyz_t position_speed;
int angle_speed_y;
int command;
u8 pad2[0x10];
xyz_t rod_top_position;
xyz_t left_hand_pos;
} UKI_ACTOR;
#ifdef __cplusplus
}
#endif
include/m_player.h
+27
View File
@@ -469,6 +469,23 @@ enum {
mPlayer_ITEM_KIND_NUM /* Are there more? */
};
#define mPlayer_ITEM_KIND_CHECK(kind, min, max) ((kind) >= (min) && (kind) < ((max) + 1))
#define mPlayer_ITEM_IS_AXE(kind) mPlayer_ITEM_KIND_CHECK(kind, mPlayer_ITEM_KIND_AXE, mPlayer_ITEM_KIND_GOLD_AXE)
#define mPlayer_ITEM_IS_NET(kind) mPlayer_ITEM_KIND_CHECK(kind, mPlayer_ITEM_KIND_NET, mPlayer_ITEM_KIND_GOLD_NET)
#define mPlayer_ITEM_IS_ROD(kind) mPlayer_ITEM_KIND_CHECK(kind, mPlayer_ITEM_KIND_ROD, mPlayer_ITEM_KIND_GOLD_ROD)
#define mPlayer_ITEM_IS_SHOVEL(kind) \
mPlayer_ITEM_KIND_CHECK(kind, mPlayer_ITEM_KIND_SHOVEL, mPlayer_ITEM_KIND_GOLD_SHOVEL)
#define mPlayer_ITEM_IS_UMBRELLA(kind) \
mPlayer_ITEM_KIND_CHECK(kind, mPlayer_ITEM_KIND_UMBRELLA00, mPlayer_ITEM_KIND_ORG_UMBRELLA07)
#define mPlayer_ITEM_IS_BALLOON(kind) \
mPlayer_ITEM_KIND_CHECK(kind, mPlayer_ITEM_KIND_RED_BALLOON, mPlayer_ITEM_KIND_BUNNY_O_BALLOON)
#define mPlayer_ITEM_IS_WINDMILL(kind) \
mPlayer_ITEM_KIND_CHECK(kind, mPlayer_ITEM_KIND_YELLOW_PINWHEEL, mPlayer_ITEM_KIND_FANCY_PINWHEEL)
#define mPlayer_ITEM_IS_FAN(kind) \
mPlayer_ITEM_KIND_CHECK(kind, mPlayer_ITEM_KIND_BLUEBELL_FAN, mPlayer_ITEM_KIND_LEAF_FAN)
#define mPlayer_ITEM_KIND_VALID(kind) ((kind) >= 0 && kind < mPlayer_ITEM_KIND_NUM)
enum {
mPlayer_ITEM_DATA_AXE, // model
mPlayer_ITEM_DATA_AXE_B, // model
@@ -1355,6 +1372,16 @@ typedef struct {
mPlayer_request_main_data request_main_data;
} mPlayer_change_data_from_submenu_c;
typedef struct controller_data_s {
MCON mcon;
s8 on;
s8 now;
s8 unk3A;
s8 unk3B;
mActor_name_t equiped_item;
} mPlayer_Controller_Data_c;
/* sizeof(struct player_actor_s) == 0x13A8 */
struct player_actor_s {
/* 0x0000 */ ACTOR actor_class;
include/m_player_lib.h
+2
View File
@@ -12,6 +12,7 @@ extern "C" {
extern void mPlib_Object_Exchange_keep_Player_dt(GAME_PLAY*);
extern PLAYER_ACTOR* get_player_actor_withoutCheck(GAME_PLAY* play);
extern mPlayer_Controller_Data_c* mPlib_Get_controller_data_for_title_demo_p();
extern void mPlib_SetData1_controller_data_for_title_demo(f32 stick_x, f32 stick_y, int btn_a, int btn_b);
extern void mPlib_SetData2_controller_data_for_title_demo(mActor_name_t tool);
extern void mPlib_Clear_controller_data_for_title_demo();
@@ -54,6 +55,7 @@ extern int mPlib_Check_tree_shaken_little(const xyz_t* pos);
extern int mPlib_request_main_recieve_wait_type1(GAME* game, mActor_name_t item, int counter_flag);
extern int mPlib_able_player_warp_forEvent();
extern int mPlib_Get_unable_wade();
extern s8 mPlib_Get_ItemNoToItemKind(mActor_name_t);
extern void mPlib_Set_boat_angleZ(s16 angleZ);
extern int mPlib_Get_end_player_demo_walk();
extern int mPlib_request_main_demo_geton_boat_type1(f32 goal_x, f32 goal_z, s16 angleY);