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

Implement & match 9 player state TUs

Browse Source
This commit is contained in:
Cuyler36
2024-08-29 17:44:43 -04:00
parent 3aa502ac92
commit 84a098cfdc
21 changed files with 1926 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/audio_defs.h
+4 -2
View File
@@ -50,6 +50,7 @@ typedef enum audio_sound_effects {
NA_SE_MONEY1,
NA_SE_MONEY2,
NA_SE_COIN,
NA_SE_TEMOCHI_KAZAGURUMA,
NA_SE_52 = 0x52,
@@ -133,8 +134,9 @@ typedef enum audio_sound_effects {
NA_SE_ROTATE = 0x41A,
NA_SE_41C = 0x41C,
NA_SE_SOFT_CHAIR_SIT = 0x41F,
NA_SE_AXE_HIT,
NA_SE_AXE_CUT,
NA_SE_SOFT_CHAIR_SIT,
NA_SE_HARD_CHAIR_SIT,
NA_SE_BUBU_CHAIR_SIT,
NA_SE_SOFT_CHAIR_STANDUP,
include/m_lib.h
+1 -2
View File
@@ -100,8 +100,7 @@ extern void none_proc2(ACTOR* actor, GAME* game);
extern int _Game_play_isPause(GAME_PLAY* play);
extern f32 check_percent_abs(f32 x, f32 min, f32 max, f32 scale, int shift_by_min);
extern f32 get_percent_forAccelBrake(const f32 now, const f32 start, const f32 end, const f32 accelerateDist,
const f32 brakeDist);
extern f32 get_percent_forAccelBrake(f32 now, f32 start, f32 end, f32 accelerateDist, f32 brakeDist);
extern void Game_play_Projection_Trans(GAME_PLAY* const play, xyz_t* world_pos, xyz_t* screen_pos);
extern f32 get_percent(const int max, const int min, const int x);
include/m_player.h
+71
View File
@@ -1560,6 +1560,68 @@ typedef struct player_main_putin_scoop_s {
int get_gold_scoop_flag; // TODO: check this
} mPlayer_main_putin_scoop_c;
typedef struct player_main_talk_s {
ACTOR* talk_actor_p;
int turn_flag;
int feel_type;
} mPlayer_main_talk_c;
typedef struct player_main_recieve_wait_s {
ACTOR* talk_actor_p;
int turn_flag;
int ret_main_index;
mActor_name_t item;
int surface_flag;
} mPlayer_main_recieve_wait_c;
typedef struct player_main_recieve_stretch_s {
ACTOR* talk_actor_p;
int turn_flag;
int ret_main_index;
mActor_name_t item;
int surface_flag;
} mPlayer_main_recieve_stretch_c;
typedef struct player_main_recieve_s {
ACTOR* talk_actor_p;
int turn_flag;
int ret_main_index;
mActor_name_t item;
int surface_flag;
} mPlayer_main_recieve_c;
typedef struct player_main_recieve_putaway_s {
ACTOR* talk_actor_p;
int turn_flag;
int ret_main_index;
int surface_flag;
} mPlayer_main_recieve_putaway_c;
typedef struct player_main_give_s {
ACTOR* talk_actor_p;
int turn_flag;
int ret_main_index;
mActor_name_t item;
int surface_flag;
} mPlayer_main_give_c;
typedef struct player_main_give_wait_s {
ACTOR* talk_actor_p;
int turn_flag;
int ret_main_index;
int surface_flag;
} mPlayer_main_give_wait_c;
typedef struct player_main_takeout_item_s {
mPlayer_request_takeout_item_c back_request_data;
f32 timer;
} mPlayer_main_takeout_item_c;
typedef struct player_main_putin_item_s {
mPlayer_request_putin_item_c back_request_data;
f32 timer;
} mPlayer_main_putin_item_c;
typedef struct player_main_wash_car_s {
int anime_idx;
int change_anime_idx;
@@ -1655,6 +1717,15 @@ typedef union {
mPlayer_main_putaway_scoop_c putaway_scoop;
mPlayer_main_putin_scoop_c putin_scoop;
mPlayer_main_demo_wade_c demo_wade;
mPlayer_main_talk_c talk;
mPlayer_main_recieve_wait_c recieve_wait;
mPlayer_main_recieve_stretch_c recieve_stretch;
mPlayer_main_recieve_c recieve;
mPlayer_main_recieve_putaway_c recieve_putaway;
mPlayer_main_give_c give;
mPlayer_main_give_wait_c give_wait;
mPlayer_main_takeout_item_c takeout_item;
mPlayer_main_putin_item_c putin_item;
mPlayer_main_wash_car_c wash_car;
mPlayer_main_shake_tree_c shake_tree;
mPlayer_main_stung_bee_c stung_bee;