diff --git a/src/m_player_main_close_furniture.c_inc b/src/m_player_main_close_furniture.c_inc index fe4d617d..7cc5d649 100644 --- a/src/m_player_main_close_furniture.c_inc +++ b/src/m_player_main_close_furniture.c_inc @@ -1,4 +1,4 @@ -static int Player_actor_request_main_wait_open_furniture(GAME* game, int priority) { +static int Player_actor_request_main_close_furniture(GAME* game, int priority) { if (mPlib_get_player_actor_main_index(game) == mPlayer_INDEX_WAIT_OPEN_FURNITURE && Player_actor_check_request_main_able(game, mPlayer_INDEX_CLOSE_FURNITURE, priority)) { PLAYER_ACTOR* player = GET_PLAYER_ACTOR_GAME(game); @@ -84,7 +84,7 @@ static void Player_actor_request_proc_index_fromClose_furniture(ACTOR* actor, GA } } -static void Player_actor_main_Open_furniture(ACTOR* actor, GAME* game) { +static void Player_actor_main_Close_furniture(ACTOR* actor, GAME* game) { f32 frame_calc; int arg = Player_actor_CulcAnimation_Close_furniture(actor, &frame_calc); diff --git a/src/m_player_main_invade.c_inc b/src/m_player_main_invade.c_inc index 41a5750d..9227dbff 100644 --- a/src/m_player_main_invade.c_inc +++ b/src/m_player_main_invade.c_inc @@ -1,4 +1,4 @@ -static int Player_actor_request_main_door(GAME* game, int priority) { +static int Player_actor_request_main_invade(GAME* game, int priority) { if (Player_actor_check_request_main_able(game, mPlayer_INDEX_INVADE, priority)) { Player_actor_request_main_index(game, mPlayer_INDEX_INVADE, priority); @@ -8,7 +8,7 @@ static int Player_actor_request_main_door(GAME* game, int priority) { return FALSE; } -static int Player_actor_request_main_door_all(GAME* game, int priority) { +static int Player_actor_request_main_invade_all(GAME* game, int priority) { return Player_actor_request_main_invade(game, priority) != 0; } diff --git a/src/m_player_main_wait_open_furniture.c_inc b/src/m_player_main_wait_open_furniture.c_inc index e74d5979..4baf5dc9 100644 --- a/src/m_player_main_wait_open_furniture.c_inc +++ b/src/m_player_main_wait_open_furniture.c_inc @@ -22,7 +22,7 @@ static int Player_actor_request_main_wait_open_furniture(GAME* game, int priorit return FALSE; } -static void Player_actor_setup_main_Open_furniture(ACTOR* actor, GAME* game) { +static void Player_actor_setup_main_Wait_open_furniture(ACTOR* actor, GAME* game) { PLAYER_ACTOR* player = (PLAYER_ACTOR*)actor; cKF_SkeletonInfo_R_c* keyf; mPlayer_request_wait_open_furniture_c* req_open = &player->requested_main_index_data.wait_open_furniture; @@ -50,7 +50,7 @@ static void Player_actor_Movement_Wait_open_furniture(ACTOR* actor) { static int Player_actor_CulcAnimation_Wait_open_furniture(ACTOR* actor) { f32 frame_calc; - + return Player_actor_CulcAnimation_Base2(actor, &frame_calc); }