mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Prakxo
2024-08-31 22:38:21 +02:00
parent 22fcaad9c2
commit 4dfdb142d9
6 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_player.h
+17 -1
View File
@@ -583,7 +583,7 @@ enum {
(mPlayer_ITEM_IS_UMBRELLA(kind) || mPlayer_ITEM_IS_BALLOON(kind) || mPlayer_ITEM_IS_WINDMILL(kind) || \
mPlayer_ITEM_IS_FAN(kind))
#define mPlayer_ITEM_KIND_VALID(kind) ((kind) >= 0 && kind < mPlayer_ITEM_KIND_NUM)
#define mPlayer_ITEM_KIND_VALID(kind) (mPlayer_ITEM_KIND_CHECK(kind, 0, mPlayer_ITEM_KIND_NUM))
enum {
mPlayer_ITEM_DATA_AXE, // model
@@ -1719,6 +1719,19 @@ typedef struct player_main_putaway_uki_s {
f32 unk0;
} mPlayer_main_putaway_uki_c;
typedef struct player_main_balloon_s {
int balloon_shape_type;
} mPlayer_main_balloon_c;
typedef struct player_main_turn_dash_s {
s16 target_angle_y;
} mPlayer_main_turn_dash_c;
typedef struct player_main_fall_s {
f32 morph_speed;
int flags;
} mPlayer_main_turn_fall_c;
typedef union {
mPlayer_main_intro_c intro;
mPlayer_main_return_demo_c return_demo;
@@ -1762,6 +1775,9 @@ typedef union {
mPlayer_main_demo_getoff_boat_standup_c demo_getoff_boat_standup;
mPlayer_main_uki_c uki;
mPlayer_main_putaway_uki_c putaway_uki;
mPlayer_main_balloon_c balloon;
mPlayer_main_turn_dash_c turn_dash;
mPlayer_main_turn_fall_c fall;
u8 force_size[72]; // TEMP
} mPlayer_main_data;
src/m_player.c
+1 -1
View File
@@ -33,7 +33,7 @@ static int Player_actor_Movement_Base_Braking_common(ACTOR* actorx, f32 brake_am
static int Player_actor_Movement_Base_Braking(ACTOR* actorx);
static void Player_actor_Movement_Base_Stop(ACTOR* actorx, int use_position_speed_y);
static int Player_actor_CulcAnimation_Base2(ACTOR* actorx, f32* last_anim0_current_frame_p);
static int Player_actor_Check_AnimationFrame_PerfectEquel(ACTOR* actorx, f32 frame);
static int Player_actor_Check_AnimationFrame_PerfectEquel(ACTOR* actorx, GAME* game, f32 frame);
static int Player_actor_Check_AnimationFrame(cKF_FrameControl_c* fc_p, f32 target_frame);
static void Player_actor_set_eye_pattern(ACTOR* actorx, int idx);
static void Player_actor_set_eye_pattern_normal(ACTOR* actorx);
src/m_player_common.c_inc
+1 -1
View File
@@ -2299,7 +2299,7 @@ static void Player_actor_putin_furniture(GAME* game, int slot, mActor_name_t ite
}
}
static int Player_actor_Check_AnimationFrame_PerfectEquel(ACTOR* actorx, f32 frame) {
static int Player_actor_Check_AnimationFrame_PerfectEquel(ACTOR* actorx, GAME* game, f32 frame) {
PLAYER_ACTOR* player = (PLAYER_ACTOR*)actorx;
cKF_SkeletonInfo_R_c* kf0_p = &player->keyframe0;
cKF_FrameControl_c* fc_p = &kf0_p->frame_control;
src/m_player_main_putin_item.c_inc
+1 -1
View File
@@ -89,7 +89,7 @@ static void Player_actor_SetItemScale_Putin_item(ACTOR* actorx) {
}
static void Player_actor_SearchAnimation_Putin_item(ACTOR* actorx, GAME* game, f32 frame) {
if (Player_actor_Check_AnimationFrame_PerfectEquel(actorx, frame) == FALSE) {
if (Player_actor_Check_AnimationFrame_PerfectEquel(actorx, game, frame) == FALSE) {
Player_actor_Set_FootMark_Base1(actorx, game, FALSE, FALSE);
}
}
src/m_player_main_takeout_item.c_inc
+1 -1
View File
@@ -63,7 +63,7 @@ static void Player_actor_ObjCheck_Takeout_item(ACTOR* actorx, GAME* game) {
}
static void Player_actor_SearchAnimation_Takeout_item(ACTOR* actorx, GAME* game, f32 frame) {
if (Player_actor_Check_AnimationFrame_PerfectEquel(actorx, frame) == FALSE) {
if (Player_actor_Check_AnimationFrame_PerfectEquel(actorx, game, frame) == FALSE) {
Player_actor_Set_FootMark_Base1(actorx, game, FALSE, FALSE);
}
}
src/m_player_main_wait.c_inc
+10 -10
View File
@@ -16,7 +16,7 @@ static int Player_actor_request_main_wait_all(GAME* game, f32 morph_speed, f32 _
}
static void Player_actor_request_main_wait_from_submenu(ACTOR* actor, GAME* game) {
Player_actor_request_main_wait_all(game, -5.0f, 0.0f, 0, 31);
Player_actor_request_main_wait_all(game, -5.0f, 0.0f, 0, mPlayer_REQUEST_PRIORITY_31);
}
static void Player_actor_setup_main_Wait(ACTOR* actor, GAME* game) {
@@ -76,29 +76,29 @@ static void Player_actor_BGcheck_Wait(ACTOR* actor) {
static void Player_actor_request_proc_index_fromWait(ACTOR* actor, GAME* game) {
if (!actor->bg_collision_check.result.on_ground) {
Player_actor_request_main_fall_all(game, -5.0f, 1, 1);
Player_actor_request_main_fall_all(game, -5.0f, 1, mPlayer_REQUEST_PRIORITY_1);
}
Player_actor_CheckAndRequest_main_axe_all(game, 4);
Player_actor_CheckAndRequest_main_axe_all(game, mPlayer_REQUEST_PRIORITY_4);
if (Player_actor_CheckController_forNet(game) != 0) {
Player_actor_request_main_ready_net(game, 4);
Player_actor_request_main_ready_net(game, mPlayer_REQUEST_PRIORITY_4);
}
if (Player_actor_CheckController_forRod(game) != 0) {
Player_actor_request_main_ready_rod(game, 4);
Player_actor_request_main_ready_rod(game, mPlayer_REQUEST_PRIORITY_4);
}
Player_actor_CheckAndRequest_main_scoop_all(game, 4);
Player_actor_CheckAndRequest_main_umbrella_all(game, 4);
Player_actor_CheckAndRequest_main_fan_all(game, 1, 1, 4);
Player_actor_CheckAndRequest_main_scoop_all(game, mPlayer_REQUEST_PRIORITY_4);
Player_actor_CheckAndRequest_main_umbrella_all(game, mPlayer_REQUEST_PRIORITY_4);
Player_actor_CheckAndRequest_main_fan_all(game, 1, 1, mPlayer_REQUEST_PRIORITY_4);
Player_actor_CheckAndRequest_main_shake_tree_all(game);
if ((Player_actor_GetController_move_percentX()) || (Player_actor_GetController_move_percentY())) {
Player_actor_request_main_walk_all(game, NULL, -5.0f, 4, 1);
Player_actor_request_main_walk_all(game, NULL, -5.0f, 4, mPlayer_REQUEST_PRIORITY_1);
}
Player_actor_CheckAndRequest_main_pickup_all(game);
Player_actor_CheckAndRequest_main_radio_exercise_all(game, 0);
Player_actor_CheckAndRequest_main_radio_exercise_all(game, mPlayer_REQUEST_PRIORITY_0);
}
static void Player_actor_main_Wait(ACTOR* actor, GAME* game) {